diff options
author | Lioncash <mathew1800@gmail.com> | 2015-12-06 21:11:09 +0100 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2015-12-06 21:14:51 +0100 |
commit | 56e22e6aac513e65acfec208a5d5ba2170eceb7a (patch) | |
tree | 27fa840b335e0898bd7220638e5e6b9ffeef79f9 /src/core/arm/dyncom | |
parent | arm_interface: Make GetNumInstructions const (diff) | |
download | yuzu-56e22e6aac513e65acfec208a5d5ba2170eceb7a.tar yuzu-56e22e6aac513e65acfec208a5d5ba2170eceb7a.tar.gz yuzu-56e22e6aac513e65acfec208a5d5ba2170eceb7a.tar.bz2 yuzu-56e22e6aac513e65acfec208a5d5ba2170eceb7a.tar.lz yuzu-56e22e6aac513e65acfec208a5d5ba2170eceb7a.tar.xz yuzu-56e22e6aac513e65acfec208a5d5ba2170eceb7a.tar.zst yuzu-56e22e6aac513e65acfec208a5d5ba2170eceb7a.zip |
Diffstat (limited to 'src/core/arm/dyncom')
-rw-r--r-- | src/core/arm/dyncom/arm_dyncom_run.h | 4 | ||||
-rw-r--r-- | src/core/arm/dyncom/arm_dyncom_thumb.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_run.h b/src/core/arm/dyncom/arm_dyncom_run.h index 85c8d798e..8eb694fee 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(const ARMul_State* cpu, int Rn) { +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(const 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(const ARMul_State* cpu, int Rn) { +inline u32 CHECK_READ_REG15(const ARMul_State* cpu, int Rn) { return (Rn == 15) ? ((cpu->Reg[15] & ~0x1) + cpu->GetInstructionSize() * 2) : cpu->Reg[Rn]; } diff --git a/src/core/arm/dyncom/arm_dyncom_thumb.h b/src/core/arm/dyncom/arm_dyncom_thumb.h index 447974363..c1be3c735 100644 --- a/src/core/arm/dyncom/arm_dyncom_thumb.h +++ b/src/core/arm/dyncom/arm_dyncom_thumb.h @@ -38,7 +38,7 @@ enum class ThumbDecodeStatus { // Translates a Thumb mode instruction into its ARM equivalent. ThumbDecodeStatus TranslateThumbInstruction(u32 addr, u32 instr, u32* ainstr, u32* inst_size); -static inline u32 GetThumbInstruction(u32 instr, u32 address) { +inline u32 GetThumbInstruction(u32 instr, u32 address) { // Normally you would need to handle instruction endianness, // however, it is fixed to little-endian on the MPCore, so // there's no need to check for this beforehand. |