thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Some changes to the "dissassemble" command

Browse source 
Fixed a bug (the "bwt" and "bc" options were inversed) and added the
ability to skip a defined number of ret calls, useful when a function
continues after a ret call
This commit is contained in:
md5 2011-03-12 23:45:36 +02:00
parent 0bc9db7872
commit 5dce3235e9
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
engines/sci/console.cpp
View file

@ -2601,12 +2601,14 @@ bool Console::cmdDisassemble(int argc, const char **argv) {
DebugPrintf("Valid options are:\n");
DebugPrintf(" bwt : Print byte/word tag\n");
DebugPrintf(" bc : Print bytecode\n");
DebugPrintf(" rX : Continue after X ret opcodes before stopping decompilation\n");
return true;
}
reg_t objAddr = NULL_REG;
bool printBytecode = false;
bool printBWTag = false;
int ignoreXret = 0;
if (parse_reg_t(_engine->_gamestate, argv[1], &objAddr, false)) {
DebugPrintf("Invalid address passed.\n");
@ -2616,7 +2618,7 @@ bool Console::cmdDisassemble(int argc, const char **argv) {
const Object *obj = _engine->_gamestate->_segMan->getObject(objAddr);
int selectorId = _engine->getKernel()->findSelector(argv[2]);
reg_t addr;
reg_t addr = NULL_REG;
if (!obj) {
DebugPrintf("Not an object.");
@ -2635,13 +2637,20 @@ bool Console::cmdDisassemble(int argc, const char **argv) {
for (int i = 3; i < argc; i++) {
if (!scumm_stricmp(argv[i], "bwt"))
printBytecode = true;
else if (!scumm_stricmp(argv[i], "bc"))
printBWTag = true;
else if (!scumm_stricmp(argv[i], "bc"))
printBytecode = true;
else if (argv[i][0] == 'r')
ignoreXret = atoi(argv[i] + 1);
}
do {
reg_t prevAddr = addr;
addr = disassemble(_engine->_gamestate, addr, printBWTag, printBytecode);
if (addr.isNull() && ignoreXret) {
addr = prevAddr + 1; // skip past the ret
ignoreXret--;
}
} while (addr.offset > 0);
return true;