diff --git a/src/scripting/vm/jit.cpp b/src/scripting/vm/jit.cpp index 14960d0f1..b305b13fb 100644 --- a/src/scripting/vm/jit.cpp +++ b/src/scripting/vm/jit.cpp @@ -92,10 +92,15 @@ JitFuncPtr JitCompile(VMScriptFunction *sfunc) ///////////////////////////////////////////////////////////////////////////// +static const char *OpNames[NUM_OPS] = +{ +#define xx(op, name, mode, alt, kreg, ktype) #op +#include "vmops.h" +#undef xx +}; + void JitCompiler::Codegen() { - using namespace asmjit; - Setup(); pc = sfunc->Code; diff --git a/src/scripting/vm/jitintern.h b/src/scripting/vm/jitintern.h index b716843ef..ffbc8d954 100644 --- a/src/scripting/vm/jitintern.h +++ b/src/scripting/vm/jitintern.h @@ -24,13 +24,6 @@ extern int VMCalls[10]; #define ABCs (pc[0].i24) #define JMPOFS(x) ((x)->i24) -static const char *OpNames[NUM_OPS] = -{ -#define xx(op, name, mode, alt, kreg, ktype) #op -#include "vmops.h" -#undef xx -}; - class JitCompiler { public: @@ -46,15 +39,15 @@ private: #include "vmops.h" #undef xx + void Setup(); void EmitOpcode(); + void EmitDoCall(asmjit::X86Gp ptr); void StoreInOuts(int b); void LoadReturns(const VMOP *retval, int numret, bool inout); void FillReturns(const VMOP *retval, int numret); static int DoCall(VMFrameStack *stack, VMFunction *call, int b, int c, VMValue *param, VMReturn *returns, JitExceptionInfo *exceptinfo); - void Setup(); - template void EmitComparisonOpcode(Func jmpFunc) {