diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-10-21 13:05:06 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-10-21 13:05:06 -0400 |
| commit | eef9453abe0ef382c8d20b27410395c851b90ea2 (patch) | |
| tree | b12e53e7674ff0e457c84cdc2ead7570bee2b849 /Source | |
| parent | ec1d6c4de5e0dee57ca5ff10240f6bea8b7c165e (diff) | |
| parent | 2e9481444186f67701374507de38d7259c90580b (diff) | |
Merge pull request #1358 from Sonicadvance1/ARMv7-NOP
Changes from ARMv6 NOP to ARMv7 NOP.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Common/ArmEmitter.cpp | 10 |
1 files 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) |