libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-03 09:23:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: Added the ability to display original script bytecode in the "disasm" console command

Browse Source 
svn-id: r54275
This commit is contained in:
Filippos Karapetis 2010-11-17 00:05:09 +00:00
parent f81b42dcaf
commit c2d9c1b06b
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
engines/sci/console.cpp
View File

@ -1210,7 +1210,7 @@ bool Console::cmdClassTable(int argc, const char **argv) {
className,
PRINT_REG(temp.reg),
temp.script);
}
} else DebugPrintf(" Class 0x%x (not loaded; can't get name) (script %d)\n", i, temp.script);
}
}
@ -2609,13 +2609,17 @@ bool Console::cmdStepCallk(int argc, const char **argv) {
}
bool Console::cmdDisassemble(int argc, const char **argv) {
if (argc != 3) {
if (argc < 3) {
DebugPrintf("Disassembles a method by name.\n");
DebugPrintf("Usage: %s <object> <method>\n", argv[0]);
DebugPrintf("Usage: %s <object> <method> <print bytecode>\n", argv[0]);
DebugPrintf("The last parameter, <print bytecode> is optional. If true\n");
DebugPrintf("or 1 is specified, the associated bytecode is shown next to\n");
DebugPrintf("each dissassembled command\n");
return true;
}
reg_t objAddr = NULL_REG;
bool printBytecode = false;
if (parse_reg_t(_engine->_gamestate, argv[1], &objAddr, false)) {
DebugPrintf("Invalid address passed.\n");
@ -2642,8 +2646,11 @@ bool Console::cmdDisassemble(int argc, const char **argv) {
return true;
}
if (argc == 4 && (!strcmp(argv[3], "1") || !strcmp(argv[3], "true")))
printBytecode = true;
do {
addr = disassemble(_engine->_gamestate, addr, 0, 0);
addr = disassemble(_engine->_gamestate, addr, 0, printBytecode);
} while (addr.offset > 0);
return true;
@ -2663,7 +2670,7 @@ bool Console::cmdDisassembleAddress(int argc, const char **argv) {
reg_t vpc = NULL_REG;
int op_count = 1;
int do_bwc = 0;
int do_bytes = 0;
bool do_bytes = false;
int size;
if (parse_reg_t(_engine->_gamestate, argv[1], &vpc, false)) {
@ -2679,7 +2686,7 @@ bool Console::cmdDisassembleAddress(int argc, const char **argv) {
if (!scumm_stricmp(argv[i], "bwt"))
do_bwc = 1;
else if (!scumm_stricmp(argv[i], "bc"))
do_bytes = 1;
do_bytes = true;
else if (toupper(argv[i][0]) == 'C')
op_count = atoi(argv[i] + 1);
else {

2
engines/sci/console.h
View File

@ -36,7 +36,7 @@ namespace Sci {
class SciEngine;
struct List;
reg_t disassemble(EngineState *s, reg_t pos, int print_bw_tag, int print_bytecode);
reg_t disassemble(EngineState *s, reg_t pos, int print_bw_tag, bool printBytecode);
class Console : public GUI::Debugger {
public:

6
engines/sci/engine/scriptdebug.cpp
View File

@ -64,7 +64,7 @@ const char *opcodeNames[] = {
};
// Disassembles one command from the heap, returns address of next command or 0 if a ret was encountered.
reg_t disassemble(EngineState *s, reg_t pos, int print_bw_tag, int print_bytecode) {
reg_t disassemble(EngineState *s, reg_t pos, int print_bw_tag, bool printBytecode) {
SegmentObj *mobj = s->_segMan->getSegment(pos.segment, SEG_TYPE_SCRIPT);
Script *script_entity = NULL;
const byte *scr;
@ -97,7 +97,7 @@ reg_t disassemble(EngineState *s, reg_t pos, int print_bw_tag, int print_bytecod
debugN("%04x:%04x: ", PRINT_REG(pos));
if (print_bytecode) {
if (printBytecode) {
if (pos.offset + bytecount > scr_size) {
warning("Operation arguments extend beyond end of script");
return retval;
@ -335,7 +335,7 @@ void SciEngine::scriptDebug() {
}
debugN("Step #%d\n", s->scriptStepCounter);
disassemble(s, s->xs->addr.pc, 0, 1);
disassemble(s, s->xs->addr.pc, 0, true);
if (_debugState.runningStep) {
_debugState.runningStep--;