diff options
author | bunnei <bunneidev@gmail.com> | 2015-02-13 15:59:17 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2015-02-13 15:59:17 +0100 |
commit | c44d75787b03e84591aac3ab3cc07eaf8c023188 (patch) | |
tree | fb2a89cbc953be437c43db3b16654be8f4d7efb8 /src/core/arm/dyncom/arm_dyncom_thumb.cpp | |
parent | Merge pull request #569 from lioncash/modeswitch (diff) | |
parent | arm: General cleanup (diff) | |
download | yuzu-c44d75787b03e84591aac3ab3cc07eaf8c023188.tar yuzu-c44d75787b03e84591aac3ab3cc07eaf8c023188.tar.gz yuzu-c44d75787b03e84591aac3ab3cc07eaf8c023188.tar.bz2 yuzu-c44d75787b03e84591aac3ab3cc07eaf8c023188.tar.lz yuzu-c44d75787b03e84591aac3ab3cc07eaf8c023188.tar.xz yuzu-c44d75787b03e84591aac3ab3cc07eaf8c023188.tar.zst yuzu-c44d75787b03e84591aac3ab3cc07eaf8c023188.zip |
Diffstat (limited to 'src/core/arm/dyncom/arm_dyncom_thumb.cpp')
-rw-r--r-- | src/core/arm/dyncom/arm_dyncom_thumb.cpp | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_thumb.cpp b/src/core/arm/dyncom/arm_dyncom_thumb.cpp index d5a698365..e30d515fb 100644 --- a/src/core/arm/dyncom/arm_dyncom_thumb.cpp +++ b/src/core/arm/dyncom/arm_dyncom_thumb.cpp @@ -5,27 +5,17 @@ // We can provide simple Thumb simulation by decoding the Thumb instruction into its corresponding // ARM instruction, and using the existing ARM simulator. -#include "core/arm/skyeye_common/skyeye_defs.h" - -#ifndef MODET // Required for the Thumb instruction support -#if 1 -#error "MODET needs to be defined for the Thumb world to work" -#else -#define MODET (1) -#endif -#endif - -#include "core/arm/skyeye_common/armos.h" #include "core/arm/dyncom/arm_dyncom_thumb.h" +#include "core/arm/skyeye_common/armos.h" +#include "core/arm/skyeye_common/skyeye_defs.h" // Decode a 16bit Thumb instruction. The instruction is in the low 16-bits of the tinstr field, // with the following Thumb instruction held in the high 16-bits. Passing in two Thumb instructions // allows easier simulation of the special dual BL instruction. -tdstate thumb_translate (addr_t addr, uint32_t instr, uint32_t* ainstr, uint32_t* inst_size) { +tdstate thumb_translate(addr_t addr, uint32_t instr, uint32_t* ainstr, uint32_t* inst_size) { tdstate valid = t_uninitialized; - ARMword tinstr; - tinstr = instr; + ARMword tinstr = instr; // The endian should be judge here if((addr & 0x3) != 0) |