From c6821060858a8393414852ac695a3c70f3fad856 Mon Sep 17 00:00:00 2001 From: yann300 Date: Thu, 25 Aug 2016 21:58:32 +0200 Subject: [PATCH] bugfix --- src/helpers/ui.js | 4 ++-- test-browser/vmdebugger.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/helpers/ui.js b/src/helpers/ui.js index f2e50a166b..acdf14f5d5 100644 --- a/src/helpers/ui.js +++ b/src/helpers/ui.js @@ -13,7 +13,7 @@ module.exports = { for (var k = 0; k < mem.length; k += (width * 2)) { var memory = mem.substr(k, width * 2) var content = this.tryConvertAsciiFormat(memory) - ret += '0x' + k.toString(16) + ' ' + content.raw + ' ' + content.ascii + '\n' + ret += '0x' + (k / 2).toString(16) + '\t\t' + content.raw + '\t' + content.ascii + '\n' } return ret }, @@ -28,7 +28,7 @@ module.exports = { ascii = '?' } ret.ascii += ascii - ret.raw += ' ' + raw + ret.raw += raw } return ret }, diff --git a/test-browser/vmdebugger.js b/test-browser/vmdebugger.js index 0a6bfdee50..507bac135b 100644 --- a/test-browser/vmdebugger.js +++ b/test-browser/vmdebugger.js @@ -67,9 +67,9 @@ function panels (browser) { .assertCallData('0x60fe47b10000000000000000000000000000000000000000000000000000000000000038') .assertCallStack('0x0d3a18d64dfe4f927832ab58d6451cecc4e517c5') .assertStackValue(1, '0x60') - .assertMemoryValue(6, '0xc0 60 60 60 40 52 60 40 51 60 20 80 60 45 83 39 81 ????R??Q????E?9?') - .assertMemoryValue(7, '0xe0 01 60 40 52 80 80 51 90 60 20 01 90 91 90 50 50 ???R??Q???????PP') - .assertMemoryValue(8, '0x100 5b 80 60 01 01 60 00 60 00 50 81 90 55 50 5b 50 ?????????P??UP?P') + .assertMemoryValue(6, '0x60\t\t60606040526040516020806045833981\t????R??Q????E?9?') + .assertMemoryValue(7, '0x70\t\t01604052808051906020019091905050\t???R??Q???????PP') + .assertMemoryValue(8, '0x80\t\t5b806001016000600050819055505b50\t?????????P??UP?P') .click('#intoforward') // CREATE .assertStack('') .assertStorageChanges('')