diff options
| author | JosJuice <josjuice@gmail.com> | 2021-07-07 12:07:42 +0200 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2021-07-07 12:21:07 +0200 |
| commit | cbbd3d39562437985678bb4f4a7953d59b687399 (patch) | |
| tree | 8c24db049087554e8fea2c792ac899dacd7be408 /Source/Core/Common/Arm64Emitter.cpp | |
| parent | 925379cb9fc1c1c15199406a1f9a18a09cb72dbc (diff) | |
Arm64Emitter: Fix 64-bit TBZ/TBNZ encoding
We haven't actually used 64-bit TBZ/TBNZ anywhere in Dolphin, so
this mistake hasn't broken anything, but let's fix it regardless.
Diffstat (limited to 'Source/Core/Common/Arm64Emitter.cpp')
| -rw-r--r-- | Source/Core/Common/Arm64Emitter.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/Core/Common/Arm64Emitter.cpp b/Source/Core/Common/Arm64Emitter.cpp index d8d975f87f..141336e212 100644 --- a/Source/Core/Common/Arm64Emitter.cpp +++ b/Source/Core/Common/Arm64Emitter.cpp @@ -514,7 +514,8 @@ void ARM64XEmitter::EncodeCompareBranchInst(u32 op, ARM64Reg Rt, const void* ptr void ARM64XEmitter::EncodeTestBranchInst(u32 op, ARM64Reg Rt, u8 bits, const void* ptr) { - bool b64Bit = Is64Bit(Rt); + u8 b40 = bits & 0x1F; + u8 b5 = (bits >> 5) & 0x1; s64 distance = (s64)ptr - (s64)m_code; ASSERT_MSG(DYNA_REC, !(distance & 0x3), "%s: distance must be a multiple of 4: %" PRIx64, @@ -525,8 +526,8 @@ void ARM64XEmitter::EncodeTestBranchInst(u32 op, ARM64Reg Rt, u8 bits, const voi ASSERT_MSG(DYNA_REC, distance >= -0x3FFF && distance < 0x3FFF, "%s: Received too large distance: %" PRIx64, __func__, distance); - Write32((b64Bit << 31) | (0x36 << 24) | (op << 24) | (bits << 19) | - (((u32)distance << 5) & 0x7FFE0) | DecodeReg(Rt)); + Write32((b5 << 31) | (0x36 << 24) | (op << 24) | (b40 << 19) | + ((static_cast<u32>(distance) << 5) & 0x7FFE0) | DecodeReg(Rt)); } void ARM64XEmitter::EncodeUnconditionalBranchInst(u32 op, const void* ptr) |