[Scummvm-cvs-logs] SF.net SVN: scummvm:[44510] scummvm/trunk/engines/sci

[wjpalenstijn at users.sourceforge.net]

Revision: 44510
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44510&view=rev
Author:   wjpalenstijn
Date:     2009-10-01 08:53:10 +0000 (Thu, 01 Oct 2009)

Log Message:
-----------
SCI: Remove outdated debugging hack.
In the past, a negative selector value was used to identify a callk
stack frame. Currently a type of EXEC_STACK_TYPE_KERNEL already does that.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/console.cpp
    scummvm/trunk/engines/sci/engine/vm.cpp
    scummvm/trunk/engines/sci/engine/vm.h

Modified: scummvm/trunk/engines/sci/console.cpp
===================================================================
--- scummvm/trunk/engines/sci/console.cpp	2009-10-01 08:38:16 UTC (rev 44509)
+++ scummvm/trunk/engines/sci/console.cpp	2009-10-01 08:53:10 UTC (rev 44510)
@@ -2003,7 +2003,7 @@
 		break;
 
 		case EXEC_STACK_TYPE_KERNEL: // Kernel function
-			printf(" %x:[%x]  k%s(", i, call.origin, _vm->getKernel()->getKernelName(kMagicSelectorOffset - call.selector).c_str());
+			printf(" %x:[%x]  k%s(", i, call.origin, _vm->getKernel()->getKernelName(call.selector).c_str());
 			break;
 
 		case EXEC_STACK_TYPE_VARSELECTOR:

Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp	2009-10-01 08:38:16 UTC (rev 44509)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2009-10-01 08:53:10 UTC (rev 44510)
@@ -953,8 +953,7 @@
 						ExecStack *xstack;
 						xstack = add_exec_stack_entry(s, NULL_REG, NULL, NULL_REG, argc, argv - 1, 0, NULL_REG,
 	                              s->_executionStack.size()-1, SCI_XS_CALLEE_LOCALS);
-						// Debugging hack to identify kernel function
-						xstack->selector = kMagicSelectorOffset - opparams[0];
+						xstack->selector = opparams[0];
 						xstack->type = EXEC_STACK_TYPE_KERNEL;
 
 						// Call kernel function

Modified: scummvm/trunk/engines/sci/engine/vm.h
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.h	2009-10-01 08:38:16 UTC (rev 44509)
+++ scummvm/trunk/engines/sci/engine/vm.h	2009-10-01 08:53:10 UTC (rev 44510)
@@ -102,14 +102,6 @@
 	kSelectorMethod
 };
 
-enum {
-	/**
-	 * Magic offset, used to compute fake selector values for use in ExecStack
-	 * when doing a callk. See the callk code in vm.cpp for details.
-	 */
-	kMagicSelectorOffset = -42
-};
-
 struct Class {
 	int script; /**< number of the script the class is in, -1 for non-existing */
 	reg_t reg; /**< offset; script-relative offset, segment: 0 if not instantiated */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.