diff options
| author | Lioncash <mathew1800@gmail.com> | 2015-12-06 21:03:06 +0100 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2015-12-06 21:03:06 +0100 |
| commit | d03e7f08ff0f6ddbc98a92c01ad013128d9ba564 (patch) | |
| tree | 6e7a6dda60436c57042e5fab9e7ede23a1da4894 /src/core/arm/dyncom/arm_dyncom_run.h | |
| parent | Merge pull request #1252 from Subv/cam (diff) | |
| download | yuzu-d03e7f08ff0f6ddbc98a92c01ad013128d9ba564.tar yuzu-d03e7f08ff0f6ddbc98a92c01ad013128d9ba564.tar.gz yuzu-d03e7f08ff0f6ddbc98a92c01ad013128d9ba564.tar.bz2 yuzu-d03e7f08ff0f6ddbc98a92c01ad013128d9ba564.tar.lz yuzu-d03e7f08ff0f6ddbc98a92c01ad013128d9ba564.tar.xz yuzu-d03e7f08ff0f6ddbc98a92c01ad013128d9ba564.tar.zst yuzu-d03e7f08ff0f6ddbc98a92c01ad013128d9ba564.zip | |
Diffstat (limited to 'src/core/arm/dyncom/arm_dyncom_run.h')
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom_run.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_run.h b/src/core/arm/dyncom/arm_dyncom_run.h index 13bef17fc..85c8d798e 100644 --- a/src/core/arm/dyncom/arm_dyncom_run.h +++ b/src/core/arm/dyncom/arm_dyncom_run.h @@ -30,7 +30,7 @@ * @return If the PC is being read, then the word-aligned PC value is returned. * If the PC is not being read, then the value stored in the register is returned. */ -static inline u32 CHECK_READ_REG15_WA(ARMul_State* cpu, int Rn) { +static inline u32 CHECK_READ_REG15_WA(const ARMul_State* cpu, int Rn) { return (Rn == 15) ? ((cpu->Reg[15] & ~0x3) + cpu->GetInstructionSize() * 2) : cpu->Reg[Rn]; } @@ -43,6 +43,6 @@ static inline u32 CHECK_READ_REG15_WA(ARMul_State* cpu, int Rn) { * @return If the PC is being read, then the incremented PC value is returned. * If the PC is not being read, then the values stored in the register is returned. */ -static inline u32 CHECK_READ_REG15(ARMul_State* cpu, int Rn) { +static inline u32 CHECK_READ_REG15(const ARMul_State* cpu, int Rn) { return (Rn == 15) ? ((cpu->Reg[15] & ~0x1) + cpu->GetInstructionSize() * 2) : cpu->Reg[Rn]; } |