diff options
| author | Lioncash <mathew1800@gmail.com> | 2015-01-04 09:18:16 +0100 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2015-01-04 18:34:02 +0100 |
| commit | 41e1cb12e5060dba37071edb5b511abaf06dc9cf (patch) | |
| tree | b73b2a1f3348cb78c34674a3d705239aaf287ebf /src/core/arm/dyncom/arm_dyncom_run.h | |
| parent | Merge pull request #403 from yuriks/shutdown-system (diff) | |
| download | yuzu-41e1cb12e5060dba37071edb5b511abaf06dc9cf.tar yuzu-41e1cb12e5060dba37071edb5b511abaf06dc9cf.tar.gz yuzu-41e1cb12e5060dba37071edb5b511abaf06dc9cf.tar.bz2 yuzu-41e1cb12e5060dba37071edb5b511abaf06dc9cf.tar.lz yuzu-41e1cb12e5060dba37071edb5b511abaf06dc9cf.tar.xz yuzu-41e1cb12e5060dba37071edb5b511abaf06dc9cf.tar.zst yuzu-41e1cb12e5060dba37071edb5b511abaf06dc9cf.zip | |
Diffstat (limited to 'src/core/arm/dyncom/arm_dyncom_run.h')
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom_run.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_run.h b/src/core/arm/dyncom/arm_dyncom_run.h index aeabeac16..c70522274 100644 --- a/src/core/arm/dyncom/arm_dyncom_run.h +++ b/src/core/arm/dyncom/arm_dyncom_run.h @@ -24,8 +24,8 @@ void switch_mode(arm_core_t *core, uint32_t mode); /* FIXME, we temporarily think thumb instruction is always 16 bit */ -static inline uint32 GET_INST_SIZE(arm_core_t* core){ - return core->TFlag? 2 : 4; +static inline u32 GET_INST_SIZE(arm_core_t* core) { + return core->TFlag? 2 : 4; } /** @@ -36,8 +36,8 @@ static inline uint32 GET_INST_SIZE(arm_core_t* core){ * * @return */ -static inline addr_t CHECK_READ_REG15_WA(arm_core_t* core, int Rn){ - return (Rn == 15)? ((core->Reg[15] & ~0x3) + GET_INST_SIZE(core) * 2) : core->Reg[Rn]; +static inline addr_t CHECK_READ_REG15_WA(arm_core_t* core, int Rn) { + return (Rn == 15)? ((core->Reg[15] & ~0x3) + GET_INST_SIZE(core) * 2) : core->Reg[Rn]; } /** @@ -48,8 +48,8 @@ static inline addr_t CHECK_READ_REG15_WA(arm_core_t* core, int Rn){ * * @return */ -static inline uint32 CHECK_READ_REG15(arm_core_t* core, int Rn){ - return (Rn == 15)? ((core->Reg[15] & ~0x1) + GET_INST_SIZE(core) * 2) : core->Reg[Rn]; +static inline u32 CHECK_READ_REG15(arm_core_t* core, int Rn) { + return (Rn == 15)? ((core->Reg[15] & ~0x1) + GET_INST_SIZE(core) * 2) : core->Reg[Rn]; } #endif |