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_thumb.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_thumb.h')
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom_thumb.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_thumb.h b/src/core/arm/dyncom/arm_dyncom_thumb.h index 5541de9d1..bf69b2fd4 100644 --- a/src/core/arm/dyncom/arm_dyncom_thumb.h +++ b/src/core/arm/dyncom/arm_dyncom_thumb.h @@ -37,10 +37,10 @@ enum tdstate { t_uninitialized, }; -tdstate -thumb_translate(addr_t addr, uint32_t instr, uint32_t* ainstr, uint32_t* inst_size); -static inline uint32 get_thumb_instr(uint32 instr, addr_t pc){ - uint32 tinstr; +tdstate thumb_translate(addr_t addr, u32 instr, u32* ainstr, u32* inst_size); + +static inline u32 get_thumb_instr(u32 instr, addr_t pc) { + u32 tinstr; if ((pc & 0x3) != 0) tinstr = instr >> 16; else |