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

SCI: Remove selector_name function, some cleanup

Browse source 
svn-id: r49966
This commit is contained in:
Max Horn 2010-06-17 23:13:30 +00:00
parent 337711d321
commit cfcbdf8656
5 changed files with 40 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

24
engines/sci/console.cpp
View file

@ -419,13 +419,6 @@ ResourceType parseResourceType(const char *resid) {
return res;
}
const char *selector_name(EngineState *s, int selector) {
if (selector >= 0 && selector < (int)g_sci->getKernel()->getSelectorNamesSize())
return g_sci->getKernel()->getSelectorName(selector).c_str();
else
return "--INVALID--";
}
bool Console::cmdGetVersion(int argc, const char **argv) {
const char *viewTypeDesc[] = { "Unknown", "EGA", "VGA", "VGA SCI1.1", "Amiga" };
@ -2324,10 +2317,9 @@ bool Console::cmdBacktrace(int argc, const char **argv) {
switch (call.type) {
case EXEC_STACK_TYPE_CALL: {// Normal function
case EXEC_STACK_TYPE_CALL: // Normal function
DebugPrintf(" %x:[%x] %s::%s(", i, call.origin, objname, (call.selector == -1) ? "<call[be]?>" :
selector_name(_engine->_gamestate, call.selector));
}
_engine->getKernel()->getSelectorName(call.selector).c_str());
break;
case EXEC_STACK_TYPE_KERNEL: // Kernel function
@ -2554,11 +2546,11 @@ bool Console::cmdSend(int argc, const char **argv) {
return true;
}
const char *selector_name = argv[2];
int selectorId = _engine->getKernel()->findSelector(selector_name);
const char *selectorName = argv[2];
int selectorId = _engine->getKernel()->findSelector(selectorName);
if (selectorId < 0) {
DebugPrintf("Unknown selector: \"%s\"\n", selector_name);
DebugPrintf("Unknown selector: \"%s\"\n", selectorName);
return true;
}
@ -2571,7 +2563,7 @@ bool Console::cmdSend(int argc, const char **argv) {
SelectorType selector_type = lookupSelector(_engine->_gamestate->_segMan, object, selectorId, NULL, NULL);
if (selector_type == kSelectorNone) {
DebugPrintf("Object does not support selector: \"%s\"\n", selector_name);
DebugPrintf("Object does not support selector: \"%s\"\n", selectorName);
return true;
}
@ -3273,7 +3265,7 @@ int Console::printObject(reg_t pos) {
DebugPrintf(" ");
if (i < var_container->getVarCount()) {
uint16 varSelector = var_container->getVarSelector(i);
DebugPrintf("[%03x] %s = ", varSelector, selector_name(s, varSelector));
DebugPrintf("[%03x] %s = ", varSelector, _engine->getKernel()->getSelectorName(varSelector).c_str());
} else
DebugPrintf("p#%x = ", i);
@ -3292,7 +3284,7 @@ int Console::printObject(reg_t pos) {
DebugPrintf(" -- methods:\n");
for (i = 0; i < obj->getMethodCount(); i++) {
reg_t fptr = obj->getFunction(i);
DebugPrintf(" [%03x] %s = %04x:%04x\n", obj->getFuncSelector(i), selector_name(s, obj->getFuncSelector(i)), PRINT_REG(fptr));
DebugPrintf(" [%03x] %s = %04x:%04x\n", obj->getFuncSelector(i), _engine->getKernel()->getSelectorName(obj->getFuncSelector(i)).c_str(), PRINT_REG(fptr));
}
if (s->_segMan->_heap[pos.segment]->getType() == SEG_TYPE_SCRIPT)
DebugPrintf("\nOwner script: %d\n", s->_segMan->getScript(pos.segment)->_nr);

8
engines/sci/engine/kernel.cpp
View file

@ -410,7 +410,8 @@ SciKernelFunction kfunct_mappers[] = {
{NULL, NULL, NULL} // Terminator
};
Kernel::Kernel(ResourceManager *resMan, SegManager *segMan) : _resMan(resMan), _segMan(segMan) {
Kernel::Kernel(ResourceManager *resMan, SegManager *segMan)
: _resMan(resMan), _segMan(segMan), _invalid("<invalid>") {
loadSelectorNames();
mapSelectors(); // Map a few special selectors for later use
}
@ -428,6 +429,8 @@ uint Kernel::getSelectorNamesSize() const {
}
const Common::String &Kernel::getSelectorName(uint selector) const {
if (selector >= _selectorNames.size())
return _invalid;
return _selectorNames[selector];
}
@ -439,9 +442,8 @@ const Common::String &Kernel::getKernelName(uint number) const {
// FIXME: The following check is a temporary workaround for
// an issue leading to crashes when using the debugger's backtrace
// command.
static const Common::String invalid = "(invalid)";
if (number >= _kernelNames.size())
return invalid;
return _invalid;
return _kernelNames[number];
}

2
engines/sci/engine/kernel.h
View file

@ -246,6 +246,8 @@ private:
// Kernel-related lists
Common::StringArray _selectorNames;
Common::StringArray _kernelNames;
const Common::String _invalid;
};
#ifdef USE_OLD_MUSIC_FUNCTIONS

38
engines/sci/engine/scriptdebug.cpp
View file

@ -63,9 +63,7 @@ const char *opcodeNames[] = {
"-sli", "-sti", "-spi"
};
extern const char *selector_name(EngineState *s, int selector);
DebugState g_debugState;
DebugState g_debugState; // FIXME: Avoid non-const global vars
// 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) {
@ -197,7 +195,7 @@ reg_t disassemble(EngineState *s, reg_t pos, int print_bw_tag, int print_bytecod
if (!obj)
warning("Attempted to reference on non-object at %04x:%04x", PRINT_REG(s->xs->objp));
else
printf(" (%s)", selector_name(s, obj->propertyOffsetToId(s->_segMan, scr[pos.offset + 1])));
printf(" (%s)", g_sci->getKernel()->getSelectorName(obj->propertyOffsetToId(s->_segMan, scr[pos.offset + 1])).c_str());
}
}
@ -244,7 +242,7 @@ reg_t disassemble(EngineState *s, reg_t pos, int print_bw_tag, int print_bytecod
if (!name)
name = "<invalid>";
printf(" %s::%s[", name, (selector > kernel->getSelectorNamesSize()) ? "<invalid>" : selector_name(s, selector));
printf(" %s::%s[", name, g_sci->getKernel()->getSelectorName(selector).c_str());
switch (lookupSelector(s->_segMan, called_obj_addr, selector, 0, &fun_ref)) {
case kSelectorMethod:
@ -314,17 +312,15 @@ void script_debug(EngineState *s) {
if (paramb1 != g_debugState.seekSpecial)
return;
case kDebugSeekCallk: {
case kDebugSeekCallk:
if (op != op_callk)
return;
break;
}
case kDebugSeekLevelRet: {
case kDebugSeekLevelRet:
if ((op != op_ret) || (g_debugState.seekLevel < (int)s->_executionStack.size()-1))
return;
break;
}
case kDebugSeekGlobal:
if (op < op_sag)
@ -491,19 +487,17 @@ void Kernel::dissectScript(int scriptNumber, Vocabulary *vocab) {
dumpScriptObject((char *)script->data, seeker, objsize);
break;
case SCI_OBJ_CODE: {
case SCI_OBJ_CODE:
printf("Code\n");
Common::hexdump(script->data + seeker, objsize - 4, 16, seeker);
};
break;
case 3: {
case 3:
printf("<unknown>\n");
Common::hexdump(script->data + seeker, objsize - 4, 16, seeker);
};
break;
case SCI_OBJ_SAID: {
case SCI_OBJ_SAID:
printf("Said\n");
Common::hexdump(script->data + seeker, objsize - 4, 16, seeker);
@ -551,45 +545,39 @@ void Kernel::dissectScript(int scriptNumber, Vocabulary *vocab) {
}
}
printf("\n");
}
break;
case SCI_OBJ_STRINGS: {
case SCI_OBJ_STRINGS:
printf("Strings\n");
while (script->data [seeker]) {
printf("%04x: %s\n", seeker, script->data + seeker);
seeker += strlen((char *)script->data + seeker) + 1;
}
seeker++; // the ending zero byte
};
break;
case SCI_OBJ_CLASS:
dumpScriptClass((char *)script->data, seeker, objsize);
break;
case SCI_OBJ_EXPORTS: {
case SCI_OBJ_EXPORTS:
printf("Exports\n");
Common::hexdump((unsigned char *)script->data + seeker, objsize - 4, 16, seeker);
};
break;
case SCI_OBJ_POINTERS: {
case SCI_OBJ_POINTERS:
printf("Pointers\n");
Common::hexdump(script->data + seeker, objsize - 4, 16, seeker);
};
break;
case 9: {
case 9:
printf("<unknown>\n");
Common::hexdump(script->data + seeker, objsize - 4, 16, seeker);
};
break;
case SCI_OBJ_LOCALVARS: {
case SCI_OBJ_LOCALVARS:
printf("Local vars\n");
Common::hexdump(script->data + seeker, objsize - 4, 16, seeker);
};
break;
default: