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

[waltervn at users.sourceforge.net]

Revision: 47646
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47646&view=rev
Author:   waltervn
Date:     2010-01-28 19:22:58 +0000 (Thu, 28 Jan 2010)

Log Message:
-----------
SCI: Add debug opcodes

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

Modified: scummvm/trunk/engines/sci/engine/script.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/script.cpp	2010-01-28 18:57:31 UTC (rev 47645)
+++ scummvm/trunk/engines/sci/engine/script.cpp	2010-01-28 19:22:58 UTC (rev 47646)
@@ -64,7 +64,7 @@
 	/*38*/
 	{Script_Property, END}, {Script_SRelative, END}, {Script_SRelative, END}, {Script_None},
 	/*3C*/
-	{Script_None}, {Script_None}, {Script_None}, {Script_Invalid},
+	{Script_None}, {Script_None}, {Script_None}, {Script_Word},
 	/*40-4F*/
 	{Script_Global, END}, {Script_Local, END}, {Script_Temp, END}, {Script_Param, END},
 	{Script_Global, END}, {Script_Local, END}, {Script_Temp, END}, {Script_Param, END},

Modified: scummvm/trunk/engines/sci/engine/script.h
===================================================================
--- scummvm/trunk/engines/sci/engine/script.h	2010-01-28 18:57:31 UTC (rev 47645)
+++ scummvm/trunk/engines/sci/engine/script.h	2010-01-28 19:22:58 UTC (rev 47646)
@@ -133,7 +133,7 @@
 	op_push1    = 0x3c,	// 060
 	op_push2    = 0x3d,	// 061
 	op_pushSelf = 0x3e,	// 062
-	// dummy      0x3f,	// 063
+	op_line     = 0x3f,	// 063
 	op_lag      = 0x40,	// 064
 	op_lal      = 0x41,	// 065
 	op_lat      = 0x42,	// 066

Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp	2010-01-28 18:57:31 UTC (rev 47645)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2010-01-28 19:22:58 UTC (rev 47646)
@@ -1354,11 +1354,16 @@
 			break;
 
 		case op_pushSelf: // 0x3e (62)
-			PUSH32(scriptState.xs->objp);
+			if (!(opcode & 1)) {
+				PUSH32(scriptState.xs->objp);
+			} else {
+				// Debug opcode op_file, skip null-terminated string (file name)
+				while (GET_OP_BYTE()) ;
+			}
 			break;
 
-		case 0x3f: // (63)
-			error("Dummy opcode 0x%x called", opnumber);	// should never happen
+		case op_line: // 0x3f (63)
+			// Debug opcode (line number)
 			break;
 
 		case op_lag: // 0x40 (64)


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