diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-10-25 20:38:44 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-10-25 20:38:44 -0500 |
| commit | 0fbd5248cacaae1bae1fc442ad59dbfceeb3ad12 (patch) | |
| tree | 0c48b84b705a919743abe89e39ff87ef58e70db0 /Source | |
| parent | 17f352e2aa1847fef1b3a73bf48ff9cc5e7cd390 (diff) | |
Fixes a potential crash on the ARMv7 JIT if someone disables the entire JIT in the debugger.
We can't disable branches in the JITs. Make sure they don't become disabled if someone tries to disable the full JIT.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Core/PowerPC/JitArm32/JitArm_Branch.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/Source/Core/Core/PowerPC/JitArm32/JitArm_Branch.cpp b/Source/Core/Core/PowerPC/JitArm32/JitArm_Branch.cpp index cc222cce70..dd4fa2d7a7 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitArm_Branch.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/JitArm_Branch.cpp @@ -20,7 +20,6 @@ using namespace ArmGen; void JitArm::sc(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(bJITBranchOff); gpr.Flush(); fpr.Flush(); @@ -39,7 +38,6 @@ void JitArm::sc(UGeckoInstruction inst) void JitArm::rfi(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(bJITBranchOff); gpr.Flush(); fpr.Flush(); @@ -86,7 +84,6 @@ void JitArm::rfi(UGeckoInstruction inst) void JitArm::bx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(bJITBranchOff); // We must always process the following sentence // even if the blocks are merged by PPCAnalyst::Flatten(). if (inst.LK) @@ -133,7 +130,6 @@ void JitArm::bx(UGeckoInstruction inst) void JitArm::bcx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(bJITBranchOff); // USES_CR ARMReg rA = gpr.GetReg(); @@ -193,7 +189,6 @@ void JitArm::bcx(UGeckoInstruction inst) void JitArm::bcctrx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(bJITBranchOff); // bcctrx doesn't decrement and/or test CTR _dbg_assert_msg_(POWERPC, inst.BO_2 & BO_DONT_DECREMENT_FLAG, "bcctrx with decrement and test CTR option is invalid!"); @@ -259,7 +254,6 @@ void JitArm::bcctrx(UGeckoInstruction inst) void JitArm::bclrx(UGeckoInstruction inst) { INSTRUCTION_START - JITDISABLE(bJITBranchOff); ARMReg rA = gpr.GetReg(); ARMReg rB = gpr.GetReg(); |