From cd34147f5e022865c3870067553c8facda5b055f Mon Sep 17 00:00:00 2001 From: stephena Date: Sat, 5 Jun 2010 01:23:39 +0000 Subject: [PATCH] Oops, the disassembly output should align based on the length of the entire disassembled text, not just the label length. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2043 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- src/debugger/CartDebug.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/debugger/CartDebug.cxx b/src/debugger/CartDebug.cxx index e695d8682..928d5a6db 100644 --- a/src/debugger/CartDebug.cxx +++ b/src/debugger/CartDebug.cxx @@ -290,7 +290,7 @@ string CartDebug::disassemble(uInt16 start, uInt16 lines) const if((tag.address & 0xfff) >= start) { if(begin == 0) begin = end; - length = BSPF_max(length, (uInt32)tag.label.length()); + length = BSPF_max(length, (uInt32)tag.disasm.length()); --lines; } @@ -301,7 +301,7 @@ string CartDebug::disassemble(uInt16 start, uInt16 lines) const { const CartDebug::DisassemblyTag& tag = disasm.list[i]; buffer << uppercase << hex << setw(4) << setfill('0') << tag.address - << ": " << tag.disasm << setw(length - tag.disasm.length() + 10) + << ": " << tag.disasm << setw(length - tag.disasm.length() + 1) << setfill(' ') << " " << tag.ccount << " " << tag.bytes << endl; }