diff options
author | Martin Kiewitz | 2010-07-29 17:22:38 +0000 |
---|---|---|
committer | Martin Kiewitz | 2010-07-29 17:22:38 +0000 |
commit | 41ed8b438944025628b2e5a002ea3815b694fd22 (patch) | |
tree | 95c09d4ccc11f004ae54f59717d59eb7889728c6 /engines/sci/engine/vm.cpp | |
parent | 148c830d769aaf4fd4e08e46284d419ff0c93f18 (diff) | |
download | scummvm-rg350-41ed8b438944025628b2e5a002ea3815b694fd22.tar.gz scummvm-rg350-41ed8b438944025628b2e5a002ea3815b694fd22.tar.bz2 scummvm-rg350-41ed8b438944025628b2e5a002ea3815b694fd22.zip |
SCI: some subfunction support for logkernel
svn-id: r51475
Diffstat (limited to 'engines/sci/engine/vm.cpp')
-rw-r--r-- | engines/sci/engine/vm.cpp | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index 6625387b56..b7f6896a48 100644 --- a/engines/sci/engine/vm.cpp +++ b/engines/sci/engine/vm.cpp @@ -647,9 +647,19 @@ 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, reg_t result) { +static void logKernelCall(const KernelFunction *kernelCall, const KernelSubFunction *kernelSubCall, EngineState *s, int argc, reg_t *argv, reg_t result) { Kernel *kernel = g_sci->getKernel(); - printf("k%s: ", kernelCall->name); + if (!kernelSubCall) { + printf("k%s: ", kernelCall->name); + } else { + int callNameLen = strlen(kernelCall->name); + if (strncmp(kernelCall->name, kernelSubCall->name, callNameLen) == 0) { + const char *subCallName = kernelSubCall->name + callNameLen; + printf("k%s(%s): ", kernelCall->name, subCallName); + } else { + printf("k%s(%s): ", kernelCall->name, kernelSubCall->name); + } + } for (int parmNr = 0; parmNr < argc; parmNr++) { if (parmNr) printf(", "); @@ -732,7 +742,7 @@ static void callKernelFunc(EngineState *s, int kernelCallNr, int argc) { s->r_acc = kernelCall.function(s, argc, argv); if (kernelCall.debugLogging) - logKernelCall(&kernelCall, s, argc, argv, s->r_acc); + logKernelCall(&kernelCall, NULL, s, argc, argv, s->r_acc); } else { // Sub-functions available, check signature and call that one directly if (argc < 1) @@ -780,6 +790,9 @@ static void callKernelFunc(EngineState *s, int kernelCallNr, int argc) { error("[VM] k%s: subfunction-id %d requested, but not available", kernelCall.name, subId); addKernelCallToExecStack(s, kernelCallNr, argc, argv); s->r_acc = kernelSubCall.function(s, argc, argv); + + if (kernelSubCall.debugLogging) + logKernelCall(&kernelCall, &kernelSubCall, s, argc, argv, s->r_acc); } // Remove callk stack frame again, if there's still an execution stack |