[[ LCB ]] Fix minor errors in code gen for indirect calls.

runrevmark · runrevmark · commit 414679037bbc · 2015-01-21T15:56:25.000Z
diff --git a/libscript/src/script-builder.cpp b/libscript/src/script-builder.cpp
@@ -1368,7 +1368,7 @@ void MCScriptBeginInvokeEvaluateInModule(MCScriptModuleBuilderRef self, uindex_t
 }
 #endif
 
-void MCScriptBeginIndirectInvokeInModule(MCScriptModuleBuilderRef self, uindex_t p_handler_reg, uindex_t p_result_reg)
+void MCScriptBeginInvokeIndirectInModule(MCScriptModuleBuilderRef self, uindex_t p_handler_reg, uindex_t p_result_reg)
 {
     if (self == nil || !self -> valid)
         return;
diff --git a/toolchain/lc-compile/src/emit.cpp b/toolchain/lc-compile/src/emit.cpp
@@ -984,7 +984,7 @@ void EmitBeginInvoke(long index, long contextreg, long resultreg)
 
 void EmitBeginIndirectInvoke(long handlerreg, long contextreg, long resultreg)
 {
-    MCScriptBeginInvokeInModule(s_builder, handlerreg, resultreg);
+    MCScriptBeginInvokeIndirectInModule(s_builder, handlerreg, resultreg);
     MCLog("[Emit] BeginExecuteIndirectInvoke(%ld, %ld, %ld)", handlerreg, contextreg, resultreg);
 }
 
diff --git a/toolchain/lc-compile/src/generate.g b/toolchain/lc-compile/src/generate.g
@@ -1369,7 +1369,7 @@
             -- If the Id is not a handler it must be a variable
             ne(Kind, handler)
             EmitCreateRegister(-> HandlerReg)
-            EmitFetchVar(Kind, Index, HandlerReg)
+            EmitFetchVar(Kind, HandlerReg, Index)
         ||
             where(-1 -> HandlerReg)
         |)
@@ -1501,12 +1501,13 @@
 
 'action' EmitFetchVar(SYMBOLKIND, INT, INT)
 
-    'rule' EmitFetchVar(variable, Reg, Var):
-        EmitFetchGlobal(Reg, Var)
-        
-    'rule' EmitFetchVar(_, Reg, Var):
+    'rule' EmitFetchVar(local, Reg, Var):
         EmitFetchLocal(Reg, Var)
 
+    -- This catches all module-scope things, including variables and handler references.
+    'rule' EmitFetchVar(_, Reg, Var):
+        EmitFetchGlobal(Reg, Var)
+        
 'action' EmitInvokeRegisterList(INTLIST)
 
     'rule' EmitInvokeRegisterList(intlist(Head, Tail)):

Original file line number	Diff line number	Diff line change
`@@ -1368,7 +1368,7 @@ void MCScriptBeginInvokeEvaluateInModule(MCScriptModuleBuilderRef self, uindex_t`
`1368`	`1368`	`}`
`1369`	`1369`	`#endif`
`1370`	`1370`
`1371`		`-void MCScriptBeginIndirectInvokeInModule(MCScriptModuleBuilderRef self, uindex_t p_handler_reg, uindex_t p_result_reg)`
	`1371`	`+void MCScriptBeginInvokeIndirectInModule(MCScriptModuleBuilderRef self, uindex_t p_handler_reg, uindex_t p_result_reg)`
`1372`	`1372`	`{`
`1373`	`1373`	`if (self == nil \|\| !self -> valid)`
`1374`	`1374`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -984,7 +984,7 @@ void EmitBeginInvoke(long index, long contextreg, long resultreg)`
`984`	`984`
`985`	`985`	`void EmitBeginIndirectInvoke(long handlerreg, long contextreg, long resultreg)`
`986`	`986`	`{`
`987`		`- MCScriptBeginInvokeInModule(s_builder, handlerreg, resultreg);`
	`987`	`+ MCScriptBeginInvokeIndirectInModule(s_builder, handlerreg, resultreg);`
`988`	`988`	`MCLog("[Emit] BeginExecuteIndirectInvoke(%ld, %ld, %ld)", handlerreg, contextreg, resultreg);`
`989`	`989`	`}`
`990`	`990`