From 2e9481444186f67701374507de38d7259c90580b Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Tue, 21 Oct 2014 14:17:07 +0000 Subject: [PATCH] Changes from ARMv6 NOP to ARMv7 NOP. Dolphin doesn't support ARMv6. Get this out of here. --- Source/Core/Common/ArmEmitter.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/Common/ArmEmitter.cpp b/Source/Core/Common/ArmEmitter.cpp index 99a6d760f7..dda13cb4c1 100644 --- a/Source/Core/Common/ArmEmitter.cpp +++ b/Source/Core/Common/ArmEmitter.cpp @@ -370,7 +370,7 @@ void ARMXEmitter::NOP(int count) { for (int i = 0; i < count; i++) { - Write32(condition | 0x01A00000); + Write32(condition | 0x0320F000); } } @@ -395,7 +395,7 @@ FixupBranch ARMXEmitter::B() branch.ptr = code; branch.condition = condition; //We'll write NOP here for now. - Write32(condition | 0x01A00000); + Write32(condition | 0x0320F000); return branch; } FixupBranch ARMXEmitter::BL() @@ -405,7 +405,7 @@ FixupBranch ARMXEmitter::BL() branch.ptr = code; branch.condition = condition; //We'll write NOP here for now. - Write32(condition | 0x01A00000); + Write32(condition | 0x0320F000); return branch; } @@ -416,7 +416,7 @@ FixupBranch ARMXEmitter::B_CC(CCFlags Cond) branch.ptr = code; branch.condition = Cond << 28; //We'll write NOP here for now. - Write32(condition | 0x01A00000); + Write32(condition | 0x0320F000); return branch; } void ARMXEmitter::B_CC(CCFlags Cond, const void *fnptr) @@ -434,7 +434,7 @@ FixupBranch ARMXEmitter::BL_CC(CCFlags Cond) branch.ptr = code; branch.condition = Cond << 28; //We'll write NOP here for now. - Write32(condition | 0x01A00000); + Write32(condition | 0x0320F000); return branch; } void ARMXEmitter::SetJumpTarget(FixupBranch const &branch)