diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-10-21 14:17:07 +0000 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-10-21 14:17:07 +0000 |
| commit | 2e9481444186f67701374507de38d7259c90580b (patch) | |
| tree | e14dfe1f9be8c4c706df860a02c36a2de51951d1 /Source/Core/Common/ArmEmitter.cpp | |
| parent | 080883ad9e5c2d1961ded65042aea544161c2d4a (diff) | |
Changes from ARMv6 NOP to ARMv7 NOP.
Dolphin doesn't support ARMv6. Get this out of here.
Diffstat (limited to 'Source/Core/Common/ArmEmitter.cpp')
| -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) |