diff options
| author | Arisotura <thetotalworm@gmail.com> | 2021-11-18 01:17:51 +0100 |
|---|---|---|
| committer | Arisotura <thetotalworm@gmail.com> | 2021-11-18 01:17:51 +0100 |
| commit | 19ddaee13b5400b14ef3d3a6299474e7f715a948 (patch) | |
| tree | 3a8b0804e91454109936db361a0ad7a9d5e1d5d5 /src/ARMJIT_x64 | |
| parent | 65c2a844ac0c1d323a67044973860cdc0dcac953 (diff) | |
finally decouple Config from the core. baahhahahahah
Diffstat (limited to 'src/ARMJIT_x64')
| -rw-r--r-- | src/ARMJIT_x64/ARMJIT_Compiler.cpp | 13 | ||||
| -rw-r--r-- | src/ARMJIT_x64/ARMJIT_LoadStore.cpp | 2 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/ARMJIT_x64/ARMJIT_Compiler.cpp b/src/ARMJIT_x64/ARMJIT_Compiler.cpp index 8178684..6fffcec 100644 --- a/src/ARMJIT_x64/ARMJIT_Compiler.cpp +++ b/src/ARMJIT_x64/ARMJIT_Compiler.cpp @@ -19,7 +19,6 @@ #include "ARMJIT_Compiler.h" #include "../ARMInterpreter.h" -#include "../Config.h" #include <assert.h> #include <stdarg.h> @@ -638,11 +637,11 @@ const Compiler::CompileFunc T_Comp[ARMInstrInfo::tk_Count] = { // LDR/STR sp rel F(T_Comp_MemSPRel), F(T_Comp_MemSPRel), // PUSH/POP - F(T_Comp_PUSH_POP), F(T_Comp_PUSH_POP), + F(T_Comp_PUSH_POP), F(T_Comp_PUSH_POP), // LDMIA, STMIA - F(T_Comp_LDMIA_STMIA), F(T_Comp_LDMIA_STMIA), + F(T_Comp_LDMIA_STMIA), F(T_Comp_LDMIA_STMIA), // Branch - F(T_Comp_BCOND), F(T_Comp_BranchXchangeReg), F(T_Comp_BranchXchangeReg), F(T_Comp_B), F(T_Comp_BL_LONG_1), F(T_Comp_BL_LONG_2), + F(T_Comp_BCOND), F(T_Comp_BranchXchangeReg), F(T_Comp_BranchXchangeReg), F(T_Comp_B), F(T_Comp_BL_LONG_1), F(T_Comp_BL_LONG_2), // Unk, SVC NULL, NULL, F(T_Comp_BL_Merged) @@ -832,7 +831,7 @@ JitBlockEntry Compiler::CompileBlock(ARM* cpu, bool thumb, FetchedInstr instrs[] SetJumpTarget(skipExecute); } } - + } } @@ -888,7 +887,7 @@ void Compiler::Comp_AddCycles_CI(Gen::X64Reg i, int add) s32 cycles = Num ? NDS::ARM7MemTimings[CurInstr.CodeCycles][Thumb ? 0 : 2] : ((R15 & 0x2) ? 0 : CurInstr.CodeCycles); - + if (!Thumb && CurInstr.Cond() < 0xE) { LEA(32, RSCRATCH, MDisp(i, add + cycles)); @@ -933,7 +932,7 @@ void Compiler::Comp_AddCycles_CDI() { cycles = numC + numD + 1; } - + if (!Thumb && CurInstr.Cond() < 0xE) ADD(32, MDisp(RCPU, offsetof(ARM, Cycles)), Imm8(cycles)); else diff --git a/src/ARMJIT_x64/ARMJIT_LoadStore.cpp b/src/ARMJIT_x64/ARMJIT_LoadStore.cpp index c1a09fa..07cade4 100644 --- a/src/ARMJIT_x64/ARMJIT_LoadStore.cpp +++ b/src/ARMJIT_x64/ARMJIT_LoadStore.cpp @@ -18,8 +18,6 @@ #include "ARMJIT_Compiler.h" -#include "../Config.h" - using namespace Gen; namespace ARMJIT |