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

SCI: added additional output to vmvars command

Browse Source 
svn-id: r50395
This commit is contained in:
Martin Kiewitz 2010-06-27 20:38:41 +00:00
parent 7078655de0
commit 0436f2823d
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
engines/sci/console.cpp
View File

@ -2054,9 +2054,11 @@ bool Console::cmdVMVars(int argc, const char **argv) {
if (!setValue) {
if (varType == 4)
DebugPrintf("%s == %04x:%04x\n", varNames[varType], PRINT_REG(*curValue));
DebugPrintf("%s == %04x:%04x", varNames[varType], PRINT_REG(*curValue));
else
DebugPrintf("%s var %d == %04x:%04x\n", varNames[varType], varIndex, PRINT_REG(*curValue));
DebugPrintf("%s var %d == %04x:%04x", varNames[varType], varIndex, PRINT_REG(*curValue));
printBasicVarInfo(*curValue);
DebugPrintf("\n");
} else {
if (parse_reg_t(s, setValue, curValue, true)) {
DebugPrintf("Invalid value/address passed.\n");
@ -3207,6 +3209,36 @@ static int parse_reg_t(EngineState *s, const char *str, reg_t *dest, bool mayBeV
return 0;
}
void Console::printBasicVarInfo(reg_t variable) {
int segType = g_sci->getKernel()->findRegType(variable);
SegManager *segMan = g_sci->getEngineState()->_segMan;
segType &= KSIG_ARITHMETIC | KSIG_OBJECT | KSIG_REF | KSIG_NODE | KSIG_LIST;
switch (segType) {
case KSIG_ARITHMETIC: {
uint16 content = variable.toUint16();
if (content >= 10)
DebugPrintf(" (%dd)", content);
break;
}
case KSIG_OBJECT:
DebugPrintf(" (object '%s')", segMan->getObjectName(variable));
break;
case KSIG_REF:
DebugPrintf(" (reference)");
break;
case KSIG_NODE:
DebugPrintf(" (node)");
break;
case KSIG_LIST:
DebugPrintf(" (list)");
break;
default:
DebugPrintf(" (???)");
}
}
void Console::printList(List *list) {
reg_t pos = list->first;
reg_t my_prev = NULL_REG;

2
engines/sci/console.h
View File

@ -146,6 +146,8 @@ private:
bool cmdViewActiveObject(int argc, const char **argv);
bool cmdViewAccumulatorObject(int argc, const char **argv);
void printBasicVarInfo(reg_t variable);
bool segmentInfo(int nr);
void printList(List *list);
int printNode(reg_t addr);