diff options
| author | Arisotura <thetotalworm@gmail.com> | 2020-10-26 20:47:30 +0100 |
|---|---|---|
| committer | Arisotura <thetotalworm@gmail.com> | 2020-10-26 20:47:30 +0100 |
| commit | fc922ffb14da3aa087a7eebeb55d09cf3b856e0d (patch) | |
| tree | 68ad639693d7b97d286e71364ac796bfaaeefd7b /src/dolphin/Arm64Emitter.cpp | |
| parent | 8d42b1c7d7466abf80a61ea51ee3006110c15b65 (diff) | |
| parent | 49a96f41daa53ffa5dc4a46bdac4ee68f0b7eaee (diff) | |
Merge branch 'master' into dsi_camera
# Conflicts:
# src/DSi_I2C.cpp
Diffstat (limited to 'src/dolphin/Arm64Emitter.cpp')
| -rw-r--r-- | src/dolphin/Arm64Emitter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dolphin/Arm64Emitter.cpp b/src/dolphin/Arm64Emitter.cpp index 97c93ba..289b20c 100644 --- a/src/dolphin/Arm64Emitter.cpp +++ b/src/dolphin/Arm64Emitter.cpp @@ -1631,7 +1631,7 @@ void ARM64XEmitter::ASR(ARM64Reg Rd, ARM64Reg Rm, int shift) int bits = Is64Bit(Rd) ? 64 : 32; SBFM(Rd, Rm, shift, bits - 1); } -void ARM64XEmitter::ROR_(ARM64Reg Rd, ARM64Reg Rm, int shift) +void ARM64XEmitter::ROR(ARM64Reg Rd, ARM64Reg Rm, int shift) { EXTR(Rd, Rm, Rm, shift); } |