diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2023-01-09 21:00:41 +0100 |
|---|---|---|
| committer | Admiral H. Curtiss <pikachu025@gmail.com> | 2023-01-27 15:22:41 +0100 |
| commit | 8bab3ac755d4b89f294716d6d21ee6de5fe866bd (patch) | |
| tree | a99b9a1ee364d417824675800c55b5291296d7eb /Source/Core | |
| parent | 126590c4cddd3f46f7c5d53276670896ce76a9b1 (diff) | |
PowerPC: Parametrize MMCR1 macro.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/PowerPC/Jit64/Jit.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/Core/PowerPC/JitArm64/Jit.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/Core/PowerPC/PowerPC.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/Core/PowerPC/PowerPC.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/PowerPC/Jit64/Jit.cpp index e1f8abdd4b..ac5a0565e8 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit.cpp @@ -534,7 +534,7 @@ bool Jit64::Cleanup() } // SPEED HACK: MMCR0/MMCR1 should be checked at run-time, not at compile time. - if (MMCR0(PowerPC::ppcState).Hex || MMCR1.Hex) + if (MMCR0(PowerPC::ppcState).Hex || MMCR1(PowerPC::ppcState).Hex) { ABI_PushRegistersAndAdjustStack({}, 0); ABI_CallFunctionCCC(PowerPC::UpdatePerformanceMonitor, js.downcountAmount, js.numLoadStoreInst, diff --git a/Source/Core/Core/PowerPC/JitArm64/Jit.cpp b/Source/Core/Core/PowerPC/JitArm64/Jit.cpp index ae7045053c..2fdf65b0b5 100644 --- a/Source/Core/Core/PowerPC/JitArm64/Jit.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/Jit.cpp @@ -288,7 +288,7 @@ void JitArm64::Cleanup() } // SPEED HACK: MMCR0/MMCR1 should be checked at run-time, not at compile time. - if (MMCR0(PowerPC::ppcState).Hex || MMCR1.Hex) + if (MMCR0(PowerPC::ppcState).Hex || MMCR1(PowerPC::ppcState).Hex) { MOVP2R(ARM64Reg::X8, &PowerPC::UpdatePerformanceMonitor); MOVI2R(ARM64Reg::X0, js.downcountAmount); diff --git a/Source/Core/Core/PowerPC/PowerPC.cpp b/Source/Core/Core/PowerPC/PowerPC.cpp index 5ef46abdcd..5bba56ad49 100644 --- a/Source/Core/Core/PowerPC/PowerPC.cpp +++ b/Source/Core/Core/PowerPC/PowerPC.cpp @@ -430,7 +430,7 @@ void UpdatePerformanceMonitor(u32 cycles, u32 num_load_stores, u32 num_fp_inst) break; } - switch (MMCR1.PMC3SELECT) + switch (MMCR1(PowerPC::ppcState).PMC3SELECT) { case 0: // No change break; @@ -444,7 +444,7 @@ void UpdatePerformanceMonitor(u32 cycles, u32 num_load_stores, u32 num_fp_inst) break; } - switch (MMCR1.PMC4SELECT) + switch (MMCR1(PowerPC::ppcState).PMC4SELECT) { case 0: // No change break; diff --git a/Source/Core/Core/PowerPC/PowerPC.h b/Source/Core/Core/PowerPC/PowerPC.h index d42e7409d6..f086576549 100644 --- a/Source/Core/Core/PowerPC/PowerPC.h +++ b/Source/Core/Core/PowerPC/PowerPC.h @@ -241,7 +241,7 @@ void UpdatePerformanceMonitor(u32 cycles, u32 num_load_stores, u32 num_fp_inst); #define DMAU(ppc_state) (*(UReg_DMAU*)&(ppc_state).spr[SPR_DMAU]) #define DMAL(ppc_state) (*(UReg_DMAL*)&(ppc_state).spr[SPR_DMAL]) #define MMCR0(ppc_state) ((UReg_MMCR0&)(ppc_state).spr[SPR_MMCR0]) -#define MMCR1 ((UReg_MMCR1&)PowerPC::ppcState.spr[SPR_MMCR1]) +#define MMCR1(ppc_state) ((UReg_MMCR1&)(ppc_state).spr[SPR_MMCR1]) #define THRM1 ((UReg_THRM12&)PowerPC::ppcState.spr[SPR_THRM1]) #define THRM2 ((UReg_THRM12&)PowerPC::ppcState.spr[SPR_THRM2]) #define THRM3 ((UReg_THRM3&)PowerPC::ppcState.spr[SPR_THRM3]) |