ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18 from lioncash/small-jit-macro-cleanup 

Move two macros (JITDISABLE and INSTRUCTION_START) into JitBase.h.
This commit is contained in:
Pierre Bourdon 2014-02-01 09:29:00 -08:00
parent 4680d22ead 89001accd8
commit 97119d0e89
6 changed files with 10 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Core/PowerPC/Jit64/Jit.h
View File

@ -37,16 +37,6 @@
#include "x64Analyzer.h" #include "x64Analyzer.h"
#include "x64Emitter.h" #include "x64Emitter.h"
// Use these to control the instruction selection
// #define INSTRUCTION_START Default(inst); return;
// #define INSTRUCTION_START PPCTables::CountInstruction(inst);
#define INSTRUCTION_START
#define JITDISABLE(setting) \
if (Core::g_CoreStartupParameter.bJITOff || \
Core::g_CoreStartupParameter.setting) \
{Default(inst); return;}
class Jit64 : public Jitx86Base class Jit64 : public Jitx86Base
{ {
private: private:

9
Source/Core/Core/PowerPC/Jit64IL/JitIL.h
View File

@ -36,15 +36,6 @@
#include "../../HW/Memmap.h" #include "../../HW/Memmap.h"
#include "../../HW/GPFifo.h" #include "../../HW/GPFifo.h"
// #define INSTRUCTION_START Default(inst); return;
// #define INSTRUCTION_START PPCTables::CountInstruction(inst);
#define INSTRUCTION_START
#define JITDISABLE(setting) \
if (Core::g_CoreStartupParameter.bJITOff || \
Core::g_CoreStartupParameter.setting) \
{Default(inst); return;}
#ifdef _M_X64 #ifdef _M_X64
#define DISABLE64 \ #define DISABLE64 \
{Default(inst); return;} {Default(inst); return;}

8
Source/Core/Core/PowerPC/JitArm32/Jit.h
View File

@ -39,14 +39,6 @@
#include "JitAsm.h" #include "JitAsm.h"
#include "../JitCommon/JitBase.h" #include "../JitCommon/JitBase.h"
// Use these to control the instruction selection
// #define INSTRUCTION_START Default(inst); return;
// #define INSTRUCTION_START PPCTables::CountInstruction(inst);
#define INSTRUCTION_START
#define JITDISABLE(setting) \
if (Core::g_CoreStartupParameter.bJITOff || \
Core::g_CoreStartupParameter.setting) \
{Default(inst); return;}
#define PPCSTATE_OFF(elem) ((s32)STRUCT_OFF(PowerPC::ppcState, elem) - (s32)STRUCT_OFF(PowerPC::ppcState, spr[0])) #define PPCSTATE_OFF(elem) ((s32)STRUCT_OFF(PowerPC::ppcState, elem) - (s32)STRUCT_OFF(PowerPC::ppcState, spr[0]))
class JitArm : public JitBase, public ArmGen::ARMXCodeBlock class JitArm : public JitBase, public ArmGen::ARMXCodeBlock
{ {

5
Source/Core/Core/PowerPC/JitArmIL/JitIL.h
View File

@ -13,11 +13,6 @@
#include "../JitCommon/JitBase.h" #include "../JitCommon/JitBase.h"
#include "JitILAsm.h" #include "JitILAsm.h"
#define JITDISABLE(setting) \
if (Core::g_CoreStartupParameter.bJITOff || \
Core::g_CoreStartupParameter.setting) \
{Default(inst); return;}
#define PPCSTATE_OFF(elem) ((s32)STRUCT_OFF(PowerPC::ppcState, elem) - (s32)STRUCT_OFF(PowerPC::ppcState, spr[0])) #define PPCSTATE_OFF(elem) ((s32)STRUCT_OFF(PowerPC::ppcState, elem) - (s32)STRUCT_OFF(PowerPC::ppcState, spr[0]))
class JitArmIL : public JitILBase, public ArmGen::ARMXCodeBlock class JitArmIL : public JitILBase, public ArmGen::ARMXCodeBlock
{ {

10
Source/Core/Core/PowerPC/JitCommon/JitBase.h
View File

@ -27,6 +27,16 @@
#include <unordered_set> #include <unordered_set>
// Use these to control the instruction selection
// #define INSTRUCTION_START Default(inst); return;
// #define INSTRUCTION_START PPCTables::CountInstruction(inst);
#define INSTRUCTION_START
#define JITDISABLE(setting) \
if (Core::g_CoreStartupParameter.bJITOff || \
Core::g_CoreStartupParameter.setting) \
{ Default(inst); return; }
class JitBase : public CPUCoreBase class JitBase : public CPUCoreBase
{ {
protected: protected:

7
Source/Core/Core/PowerPC/JitILCommon/JitILBase.h
View File

@ -16,13 +16,6 @@
#include "../../HW/GPFifo.h" #include "../../HW/GPFifo.h"
#include "../../HW/Memmap.h" #include "../../HW/Memmap.h"
#define INSTRUCTION_START
#define JITDISABLE(setting) \
if (Core::g_CoreStartupParameter.bJITOff || \
Core::g_CoreStartupParameter.setting) \
{Default(inst); return;}
class JitILBase : public JitBase class JitILBase : public JitBase
{ {
protected: protected: