diff --git a/SConstruct b/SConstruct index 3b03ab6e04..843e5fbf78 100644 --- a/SConstruct +++ b/SConstruct @@ -99,6 +99,7 @@ vars.AddVariables( BoolVariable('wxgl', 'Set For Building with WX GL libs (WIP)', False), BoolVariable('sdlgl', 'Set For Building with SDL GL libs (WIP)', False), BoolVariable('gltest', 'temp don\'t use (WIP)', False), + BoolVariable('jittest', 'temp don\'t use (WIP)', False), EnumVariable('flavor', 'Choose a build flavor', 'release', allowed_values = ('release', 'devel', 'debug', 'fastlog'), ignorecase = 2 @@ -240,6 +241,12 @@ if env['gltest']: conf.Define('GLTEST', env['GLTEST']) +env['JITTEST'] = 0 +if env['jittest']: + env['JITTEST'] = 1 + +conf.Define('JITTEST', env['JITTEST']) + # Gui less build if env['nowx']: env['HAVE_WX'] = 0; diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.h b/Source/Core/Core/Src/PowerPC/Jit64/Jit.h index e4a613ba58..50f82fad0e 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.h +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.h @@ -27,6 +27,9 @@ // * A flush simply does a conditional write to the appropriate CRx. // * If flag available, branch code can become absolutely trivial. +#ifdef JITTEST +#include "../Jit64IL/Jit.h" +#else #ifndef _JIT_H #define _JIT_H @@ -292,4 +295,4 @@ extern Jit64 jit; void Jit(u32 em_address); #endif - +#endif diff --git a/Source/Core/Core/Src/SConscript b/Source/Core/Core/Src/SConscript index c8a8577394..fa4c904e0e 100644 --- a/Source/Core/Core/Src/SConscript +++ b/Source/Core/Core/Src/SConscript @@ -80,25 +80,45 @@ files = ["Console.cpp", "PowerPC/Interpreter/Interpreter_LoadStore.cpp", "PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp", "PowerPC/Interpreter/Interpreter_SystemRegisters.cpp", - "PowerPC/Jit64/Jit.cpp", - "PowerPC/Jit64/JitBackpatch.cpp", - # "PowerPC/Jit64/JitCore.cpp", - "PowerPC/Jit64/JitCache.cpp", - "PowerPC/Jit64/JitRegCache.cpp", - "PowerPC/Jit64/JitAsm.cpp", - "PowerPC/Jit64/Jit_Branch.cpp", - "PowerPC/Jit64/Jit_Integer.cpp", - "PowerPC/Jit64/Jit_FloatingPoint.cpp", - "PowerPC/Jit64/Jit_LoadStorePaired.cpp", - "PowerPC/Jit64/Jit_Paired.cpp", - "PowerPC/Jit64/Jit_LoadStore.cpp", - "PowerPC/Jit64/Jit_LoadStoreFloating.cpp", - "PowerPC/Jit64/Jit_SystemRegisters.cpp", - "PowerPC/Jit64/Jit_Util.cpp", "HLE/HLE.cpp", "HLE/HLE_Misc.cpp", "HLE/HLE_OS.cpp", ] + +if env['JITTEST']: + files += ["PowerPC/Jit64IL/Jit.cpp", + "PowerPC/Jit64IL/JitBackpatch.cpp", + "PowerPC/Jit64IL/JitCache.cpp", + "PowerPC/Jit64IL/JitRegCache.cpp", + "PowerPC/Jit64IL/JitAsm.cpp", + "PowerPC/Jit64IL/Jit_Branch.cpp", + "PowerPC/Jit64IL/Jit_Integer.cpp", + "PowerPC/Jit64IL/Jit_FloatingPoint.cpp", + "PowerPC/Jit64IL/Jit_LoadStorePaired.cpp", + "PowerPC/Jit64IL/Jit_Paired.cpp", + "PowerPC/Jit64IL/Jit_LoadStore.cpp", + "PowerPC/Jit64IL/Jit_LoadStoreFloating.cpp", + "PowerPC/Jit64IL/Jit_SystemRegisters.cpp", + "PowerPC/Jit64IL/Jit_Util.cpp", + "PowerPC/Jit64IL/IR.cpp", + ] +else: + files += ["PowerPC/Jit64/Jit.cpp", + "PowerPC/Jit64/JitBackpatch.cpp", + "PowerPC/Jit64/JitCache.cpp", + "PowerPC/Jit64/JitRegCache.cpp", + "PowerPC/Jit64/JitAsm.cpp", + "PowerPC/Jit64/Jit_Branch.cpp", + "PowerPC/Jit64/Jit_Integer.cpp", + "PowerPC/Jit64/Jit_FloatingPoint.cpp", + "PowerPC/Jit64/Jit_LoadStorePaired.cpp", + "PowerPC/Jit64/Jit_Paired.cpp", + "PowerPC/Jit64/Jit_LoadStore.cpp", + "PowerPC/Jit64/Jit_LoadStoreFloating.cpp", + "PowerPC/Jit64/Jit_SystemRegisters.cpp", + "PowerPC/Jit64/Jit_Util.cpp", + ] + libs = [ 'bdisasm' ]