Merge remote-tracking branch 'origin/master' into polybackend

ZDoom · Dec 5, 2019 · dd87619 · dd87619
2 parents 9b7db26 + bbdd146
commit dd87619
Show file tree

Hide file tree

Showing 4 changed files with 784 additions and 559 deletions.
diff --git a/src/scripting/vm/jit_call.cpp b/src/scripting/vm/jit_call.cpp
@@ -78,7 +78,7 @@ void JitCompiler::EmitVMCall(asmjit::X86Gp vmfunc, VMFunction *target)
 	if (numparams != B)
 		I_Error("OP_CALL parameter count does not match the number of preceding OP_PARAM instructions");
 
-	if ((pc - 1)->op == OP_VTBL)
+	if (pc > sfunc->Code && (pc - 1)->op == OP_VTBL)
 		EmitVtbl(pc - 1);
 
 	FillReturns(pc + 1, C);
@@ -318,7 +318,7 @@ void JitCompiler::EmitNativeCall(VMNativeFunction *target)
 {
 	using namespace asmjit;
 
-	if ((pc - 1)->op == OP_VTBL)
+	if (pc > sfunc->Code && (pc - 1)->op == OP_VTBL)
 	{
 		I_Error("Native direct member function calls not implemented\n");
 	}