[[ Script ]] Fix bytecode op argument decode / encode.

runrevmark · runrevmark · commit d4a0cda360a1 · 2014-12-09T12:45:46.000Z
diff --git a/libscript/src/script-builder.cpp b/libscript/src/script-builder.cpp
@@ -924,8 +924,9 @@ static void __emit_bytecode_uint(MCScriptModuleBuilderRef self, uindex_t p_value
     if ((p_value & (1 << 31)) != 0)
     {
         p_value &= ~(1 << 31);
-        t_bytes[0] = ((p_value >> 7) & 0x7f) | 0x80;
-        t_bytes[1] = (p_value & 0x7f);
+        
+        t_bytes[0] = (p_value & 0x7f) | 0x80;
+        t_bytes[1] = ((p_value >> 7) & 0x7f);
         t_index = 2;
         
         if ((p_value >> 14) != 0)
diff --git a/libscript/src/script-instance.cpp b/libscript/src/script-instance.cpp
@@ -539,13 +539,16 @@ static inline uindex_t MCScriptBytecodeDecodeArgument(byte_t*& x_bytecode_ptr)
 {
     uindex_t t_value;
     t_value = 0;
+    int t_shift;
+    t_shift = 0;
     for(;;)
     {
         byte_t t_next;
         t_next = *x_bytecode_ptr++;
-        t_value = (t_value << 7) | (t_next & 0x7f);
+        t_value |= (t_next & 0x7f) << t_shift;
         if ((t_next & 0x80) == 0)
             break;
+        t_shift += 7;
     }
     return t_value;
 }
@@ -662,7 +665,7 @@ static bool MCScriptPerformScriptInvoke(MCScriptFrame*& x_frame, byte_t*& x_next
     t_signature = p_instance -> module -> types[p_handler -> type] -> typeinfo;
     
     if (MCHandlerTypeInfoGetParameterCount(t_signature) != p_arity)
-        return MCScriptThrowWrongNumberOfArgumentsForInvokeError(x_frame -> instance -> module, x_frame -> address, p_handler, p_arity - 1);
+        return MCScriptThrowWrongNumberOfArgumentsForInvokeError(x_frame -> instance -> module, x_frame -> address, p_handler, p_arity);
     
     for(uindex_t i = 0; i < p_arity; i++)
     {

Original file line number	Diff line number	Diff line change
`@@ -539,13 +539,16 @@ static inline uindex_t MCScriptBytecodeDecodeArgument(byte_t*& x_bytecode_ptr)`
`539`	`539`	`{`
`540`	`540`	`uindex_t t_value;`
`541`	`541`	`t_value = 0;`
	`542`	`+ int t_shift;`
	`543`	`+ t_shift = 0;`
`542`	`544`	`for(;;)`
`543`	`545`	`{`
`544`	`546`	`byte_t t_next;`
`545`	`547`	`t_next = *x_bytecode_ptr++;`
`546`		`- t_value = (t_value << 7) \| (t_next & 0x7f);`
	`548`	`+ t_value \|= (t_next & 0x7f) << t_shift;`
`547`	`549`	`if ((t_next & 0x80) == 0)`
`548`	`550`	`break;`
	`551`	`+ t_shift += 7;`
`549`	`552`	`}`
`550`	`553`	`return t_value;`
`551`	`554`	`}`
`@@ -662,7 +665,7 @@ static bool MCScriptPerformScriptInvoke(MCScriptFrame& x_frame, byte_t& x_next`
`662`	`665`	`t_signature = p_instance -> module -> types[p_handler -> type] -> typeinfo;`
`663`	`666`
`664`	`667`	`if (MCHandlerTypeInfoGetParameterCount(t_signature) != p_arity)`
`665`		`- return MCScriptThrowWrongNumberOfArgumentsForInvokeError(x_frame -> instance -> module, x_frame -> address, p_handler, p_arity - 1);`
	`668`	`+ return MCScriptThrowWrongNumberOfArgumentsForInvokeError(x_frame -> instance -> module, x_frame -> address, p_handler, p_arity);`
`666`	`669`
`667`	`670`	`for(uindex_t i = 0; i < p_arity; i++)`
`668`	`671`	`{`