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

Add a hexDumpReg function to view references that are not raw and fix SCI32 strings/arrays in segmentInfo.

Browse source 
svn-id: r50660
This commit is contained in:
Matthew Hoops 2010-07-04 23:38:08 +00:00
parent 6219ffe52f
commit 18b449d4fd
2 changed files with 72 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

74
engines/sci/console.cpp
View file

@ -1558,6 +1558,15 @@ bool Console::segmentInfo(int nr) {
break; break;
} }
#ifdef ENABLE_SCI32
case SEG_TYPE_STRING:
DebugPrintf("SCI32 strings\n");
break;
case SEG_TYPE_ARRAY:
DebugPrintf("SCI32 arrays\n");
break;
#endif
default : default :
DebugPrintf("Invalid type %d\n", mobj->getType()); DebugPrintf("Invalid type %d\n", mobj->getType());
break; break;
@ -2112,7 +2121,7 @@ bool Console::cmdViewReference(int argc, const char **argv) {
return true; return true;
} }
if (reg_end.segment != reg.segment) { if (reg_end.segment != reg.segment && reg_end != NULL_REG) {
DebugPrintf("Ending segment different from starting segment. Assuming no bound on dump.\n"); DebugPrintf("Ending segment different from starting segment. Assuming no bound on dump.\n");
reg_end = NULL_REG; reg_end = NULL_REG;
} }
@ -2151,13 +2160,15 @@ bool Console::cmdViewReference(int argc, const char **argv) {
switch (_engine->_gamestate->_segMan->getSegmentType(reg.segment)) { switch (_engine->_gamestate->_segMan->getSegmentType(reg.segment)) {
#ifdef ENABLE_SCI32 #ifdef ENABLE_SCI32
case SEG_TYPE_STRING: { case SEG_TYPE_STRING: {
DebugPrintf("SCI32 string\n");
const SciString *str = _engine->_gamestate->_segMan->lookupString(reg); const SciString *str = _engine->_gamestate->_segMan->lookupString(reg);
Common::hexdump((const byte *) str->getRawData(), str->getSize(), 16, 0); Common::hexdump((const byte *) str->getRawData(), str->getSize(), 16, 0);
break; break;
} }
case SEG_TYPE_ARRAY: { case SEG_TYPE_ARRAY: {
DebugPrintf("SCI32 array:\n");
const SciArray<reg_t> *array = _engine->_gamestate->_segMan->lookupArray(reg); const SciArray<reg_t> *array = _engine->_gamestate->_segMan->lookupArray(reg);
Common::hexdump((const byte *) array->getRawData(), array->getSize(), 16, 0); hexDumpReg(array->getRawData(), array->getSize(), 4, 0, true);
break; break;
} }
#endif #endif
@ -2179,7 +2190,10 @@ bool Console::cmdViewReference(int argc, const char **argv) {
if (reg_end.segment != 0) if (reg_end.segment != 0)
DebugPrintf("Block size less than or equal to %d\n", size); DebugPrintf("Block size less than or equal to %d\n", size);
Common::hexdump(block.raw, size, 16, 0); if (block.isRaw)
Common::hexdump(block.raw, size, 16, 0);
else
hexDumpReg(block.reg, size / 2, 4, 0);
} }
} }
break; break;
@ -3284,4 +3298,58 @@ int Console::printObject(reg_t pos) {
return 0; return 0;
} }
void Console::hexDumpReg(const reg_t *data, int len, int regsPerLine, int startOffset, bool isArray) {
// reg_t version of Common::hexdump
assert(1 <= regsPerLine && regsPerLine <= 8);
int i;
byte c;
int offset = startOffset;
while (len >= regsPerLine) {
printf("%06x: ", offset);
for (i = 0; i < regsPerLine; i++) {
printf("%04x:%04x ", PRINT_REG(data[i]));
}
printf(" |");
for (i = 0; i < regsPerLine; i++) {
c = data[i].toUint16() >> 8;
if (c < 32 || c >= 127)
c = '.';
printf("%c", c);
c = data[i].toUint16() & 0xff;
if (c < 32 || c >= 127)
c = '.';
printf("%c", c);
}
printf("|\n");
data += regsPerLine;
len -= regsPerLine;
offset += regsPerLine * (isArray ? 1 : 2);
}
if (len <= 0)
return;
printf("%06x: ", offset);
for (i = 0; i < regsPerLine; i++) {
if (i < len)
printf("%04x:%04x ", PRINT_REG(data[i]));
else
printf(" ");
}
printf(" |");
for (i = 0; i < len; i++) {
c = data[i].toUint16() >> 8;
if (c < 32 || c >= 127)
c = '.';
printf("%c", c);
c = data[i].toUint16() & 0xff;
if (c < 32 || c >= 127)
c = '.';
printf("%c", c);
}
for (; i < regsPerLine; i++)
printf(" ");
printf("|\n");
}
} // End of namespace Sci } // End of namespace Sci

1
engines/sci/console.h
View file

@ -151,6 +151,7 @@ private:
bool segmentInfo(int nr); bool segmentInfo(int nr);
void printList(List *list); void printList(List *list);
int printNode(reg_t addr); int printNode(reg_t addr);
void hexDumpReg(const reg_t *data, int len, int regsPerLine = 4, int startOffset = 0, bool isArray = false);
private: private:
SciEngine *_engine; SciEngine *_engine;