From 1c1e655682fa7f768b1a1dbfc4a12ff398e34666 Mon Sep 17 00:00:00 2001 From: circl Date: Mon, 5 Apr 2021 14:12:30 +0200 Subject: [PATCH 1/2] num2hex now uses toString(16) --- assembler.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/assembler.js b/assembler.js index 875b46b..d99892e 100644 --- a/assembler.js +++ b/assembler.js @@ -2478,10 +2478,8 @@ function SimulatorWidget(node) { } function num2hex(nr) { - var str = "0123456789abcdef"; - var hi = ((nr & 0xf0) >> 4); - var lo = (nr & 15); - return str.substring(hi, hi + 1) + str.substring(lo, lo + 1); + var nrHex = (nr & 0xff).toString(16); + return ((nrHex.length == 2) ? "" : "0") + nrHex; } // message() - Prints text in the message window From 0d129a54e87c3ef7076db4428108530425b6871d Mon Sep 17 00:00:00 2001 From: circl Date: Mon, 5 Apr 2021 14:18:58 +0200 Subject: [PATCH 2/2] addr2hex now uses toString(16) --- assembler.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assembler.js b/assembler.js index d99892e..f5ac410 100644 --- a/assembler.js +++ b/assembler.js @@ -2474,7 +2474,8 @@ function SimulatorWidget(node) { function addr2hex(addr) { - return num2hex((addr >> 8) & 0xff) + num2hex(addr & 0xff); + var addrHex = (addr & 0xffff).toString(16); + return "0".repeat(4 - addrHex.length) + addrHex; } function num2hex(nr) {