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

SCI: logkernel changes

Browse source 
removing old manual debug code, use logkernel * on/off to log all calls

svn-id: r51222
This commit is contained in:
Martin Kiewitz 2010-07-23 20:59:27 +00:00
parent 9fc67f5c0b
commit b984d9afc0
3 changed files with 23 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/sci/console.cpp
View file

@ -2695,7 +2695,7 @@ bool Console::cmdGo(int argc, const char **argv) {
bool Console::cmdLogKernel(int argc, const char **argv) {
if (argc < 3) {
DebugPrintf("Logs calls to specified kernel function.\n");
DebugPrintf("Usage: %s <kernel-function> <on/off>\n", argv[0]);
DebugPrintf("Usage: %s <kernel-function/*> <on/off>\n", argv[0]);
DebugPrintf("Example: %s StrCpy on\n", argv[0]);
return true;
}

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

@ -651,6 +651,7 @@ void Kernel::mapFunctions() {
}
bool Kernel::debugSetFunctionLogging(const char *kernelName, bool logging) {
if (strcmp(kernelName, "*")) {
for (uint id = 0; id < _kernelFuncs.size(); id++) {
if (_kernelFuncs[id].name) {
if (strcmp(kernelName, _kernelFuncs[id].name) == 0) {
@ -660,6 +661,13 @@ bool Kernel::debugSetFunctionLogging(const char *kernelName, bool logging) {
}
}
return false;
}
// Set debugLogging for all calls
for (uint id = 0; id < _kernelFuncs.size(); id++) {
if (_kernelFuncs[id].name)
_kernelFuncs[id].debugLogging = logging;
}
return true;
}
void Kernel::setDefaultKernelNames() {

27
engines/sci/engine/vm.cpp
View file

@ -642,7 +642,7 @@ static void addKernelCallToExecStack(EngineState *s, int kernelCallNr, int argc,
xstack->type = EXEC_STACK_TYPE_KERNEL;
}
static void logKernelCall(const KernelFunction *kernelCall, EngineState *s, int argc, reg_t *argv) {
static void logKernelCall(const KernelFunction *kernelCall, EngineState *s, int argc, reg_t *argv, reg_t result) {
Kernel *kernel = g_sci->getKernel();
printf("k%s: ", kernelCall->name);
for (int parmNr = 0; parmNr < argc; parmNr++) {
@ -671,7 +671,10 @@ static void logKernelCall(const KernelFunction *kernelCall, EngineState *s, int
}
}
}
printf("\n");
if (result.segment)
printf(" = %04x:%04x\n", PRINT_REG(result));
else
printf(" = %04x\n", result.offset);
}
static void callKernelFunc(EngineState *s, int kernelCallNr, int argc) {
@ -708,10 +711,11 @@ static void callKernelFunc(EngineState *s, int kernelCallNr, int argc) {
// Call kernel function
if (!kernelCall.subFunctionCount) {
if (kernelCall.debugLogging)
logKernelCall(&kernelCall, s, argc, argv);
addKernelCallToExecStack(s, kernelCallNr, argc, argv);
s->r_acc = kernelCall.function(s, argc, argv);
if (kernelCall.debugLogging)
logKernelCall(&kernelCall, s, argc, argv, s->r_acc);
} else {
// Sub-functions available, check signature and call that one directly
if (argc < 1)
@ -757,21 +761,6 @@ static void callKernelFunc(EngineState *s, int kernelCallNr, int argc) {
s->r_acc = kernelSubCall.function(s, argc, argv);
}
#if 0
// Used for debugging
Common::String debugMsg = Common::String::printf("%s [0x%x]", kernelCall.name, kernelCallNr) +
Common::String::printf(", %d params: ", argc) +
" (";
for (int i = 0; i < argc; i++) {
debugMsg += Common::String::printf("%04x:%04x", PRINT_REG(argv[i]));
debugMsg += (i == argc - 1 ? ")" : ", ");
}
debugMsg += ", result: " + Common::String::printf("%04x:%04x", PRINT_REG(s->r_acc));
debug("%s", debugMsg.c_str());
#endif
// Remove callk stack frame again, if there's still an execution stack
if (s->_executionStack.begin() != s->_executionStack.end())
s->_executionStack.pop_back();