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

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sun Feb 7 13:14:26 CET 2010


Revision: 47957
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47957&view=rev
Author:   fingolfin
Date:     2010-02-07 12:14:26 +0000 (Sun, 07 Feb 2010)

Log Message:
-----------
SCI: Get rid of GET_OP_ macros

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

Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp	2010-02-07 12:13:59 UTC (rev 47956)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2010-02-07 12:14:26 UTC (rev 47957)
@@ -259,14 +259,6 @@
 #define PUSH32(a) (*(validate_stack_addr(s, (scriptState.xs->sp)++)) = (a))
 #define POP32() (*(validate_stack_addr(s, --(scriptState.xs->sp))))
 
-// Getting instruction parameters
-#define GET_OP_BYTE() ((uint8)code_buf[(scriptState.xs->addr.pc.offset)++])
-#define GET_OP_WORD() (READ_LE_UINT16(code_buf + ((scriptState.xs->addr.pc.offset) += 2) - 2))
-#define GET_OP_FLEX() ((opcode & 1)? GET_OP_BYTE() : GET_OP_WORD())
-#define GET_OP_SIGNED_BYTE() ((int8)(code_buf[(scriptState.xs->addr.pc.offset)++]))
-#define GET_OP_SIGNED_WORD() (((int16)READ_LE_UINT16(code_buf + ((scriptState.xs->addr.pc.offset) += 2) - 2)))
-#define GET_OP_SIGNED_FLEX() ((opcode & 1)? GET_OP_SIGNED_BYTE() : GET_OP_SIGNED_WORD())
-
 ExecStack *execute_method(EngineState *s, uint16 script, uint16 pubfunct, StackPtr sp, reg_t calling_obj, uint16 argc, StackPtr argp) {
 	int seg = s->_segMan->getScriptSegment(script);
 	Script *scr = s->_segMan->getScriptIfLoaded(seg);
@@ -1449,7 +1441,7 @@
 				PUSH32(scriptState.xs->objp);
 			} else {
 				// Debug opcode op_file, skip null-terminated string (file name)
-				while (GET_OP_BYTE()) ;
+				while (code_buf[scriptState.xs->addr.pc.offset++]) ;
 			}
 			break;
 


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




More information about the Scummvm-git-logs mailing list