aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/console.cpp
diff options
context:
space:
mode:
authorColin Snover2016-11-05 17:57:34 -0500
committerColin Snover2016-11-20 12:31:44 -0600
commit4814682d5ff72f0a986e878290394e3517b69da4 (patch)
tree145ba337eb4b5f7ccf4daaf750bce627c5b29d37 /engines/sci/console.cpp
parent9380b541204e2ec446d75627b8fad1b78850f356 (diff)
downloadscummvm-rg350-4814682d5ff72f0a986e878290394e3517b69da4.tar.gz
scummvm-rg350-4814682d5ff72f0a986e878290394e3517b69da4.tar.bz2
scummvm-rg350-4814682d5ff72f0a986e878290394e3517b69da4.zip
SCI: Improve disassembly output
1. pushi opcode now displays decimal value and selector value (if one exists) in-line 2. lofsa, lofss, and super opcodes now display resolved object/class names 3. Opcode arguments are visually aligned
Diffstat (limited to 'engines/sci/console.cpp')
-rw-r--r--engines/sci/console.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index 4028974c83..cfbc2f3a34 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -3397,7 +3397,7 @@ bool Console::cmdDisassemble(int argc, const char **argv) {
farthestTarget = jumpTarget;
}
// TODO: Use a true 32-bit reg_t for the position (addr)
- addr = disassemble(_engine->_gamestate, make_reg32(addr.getSegment(), addr.getOffset()), printBWTag, printBytecode);
+ addr = disassemble(_engine->_gamestate, make_reg32(addr.getSegment(), addr.getOffset()), objAddr, printBWTag, printBytecode);
if (addr.isNull() && prevAddr < farthestTarget)
addr = prevAddr + 1; // skip past the ret
} while (addr.getOffset() > 0);
@@ -3446,7 +3446,7 @@ bool Console::cmdDisassembleAddress(int argc, const char **argv) {
do {
// TODO: Use a true 32-bit reg_t for the position (vpc)
- vpc = disassemble(_engine->_gamestate, make_reg32(vpc.getSegment(), vpc.getOffset()), printBWTag, printBytes);
+ vpc = disassemble(_engine->_gamestate, make_reg32(vpc.getSegment(), vpc.getOffset()), NULL_REG, printBWTag, printBytes);
} while ((vpc.getOffset() > 0) && (vpc.getOffset() + 6 < size) && (--opCount));
return true;