zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 23:32:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

- disable jit in 32-bit builds

Browse source
This commit is contained in:
Magnus Norddahl 2018-11-15 22:47:44 +01:00
parent 5ef2175c38
commit 00d41432d8
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/scripting/vm/vmframe.cpp
View file

@ -44,11 +44,17 @@
#include "c_cvars.h" #include "c_cvars.h"
#include "version.h" #include "version.h"
#if (defined(_M_X64 ) || defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(__amd64 ) || defined(__amd64__ ))
#define ARCH_X64
#endif
#ifdef ARCH_X64
CUSTOM_CVAR(Bool, vm_jit, true, CVAR_NOINITCALL) CUSTOM_CVAR(Bool, vm_jit, true, CVAR_NOINITCALL)
{ {
Printf("You must restart " GAMENAME " for this change to take effect.\n"); Printf("You must restart " GAMENAME " for this change to take effect.\n");
Printf("This cvar is currently not saved. You must specify it on the command line."); Printf("This cvar is currently not saved. You must specify it on the command line.");
} }
#endif
cycle_t VMCycles[10]; cycle_t VMCycles[10];
int VMCalls[10]; int VMCalls[10];
@ -217,6 +223,7 @@ int VMScriptFunction::PCToLine(const VMOP *pc)
int VMScriptFunction::FirstScriptCall(VMFunction *func, VMValue *params, int numparams, VMReturn *ret, int numret) int VMScriptFunction::FirstScriptCall(VMFunction *func, VMValue *params, int numparams, VMReturn *ret, int numret)
{ {
#ifdef ARCH_X64
if (vm_jit) if (vm_jit)
{ {
func->ScriptCall = JitCompile(static_cast<VMScriptFunction*>(func)); func->ScriptCall = JitCompile(static_cast<VMScriptFunction*>(func));
@ -227,6 +234,9 @@ int VMScriptFunction::FirstScriptCall(VMFunction *func, VMValue *params, int num
{ {
func->ScriptCall = VMExec; func->ScriptCall = VMExec;
} }
#else
func->ScriptCall = VMExec;
#endif
return func->ScriptCall(func, params, numparams, ret, numret); return func->ScriptCall(func, params, numparams, ret, numret);
} }