diff options
| author |  bunnei <bunneidev@gmail.com> | 2015-07-25 23:12:34 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-07-25 23:12:34 -0400 |
| commit | 392c7feba0cd152e46ffbe6089def35082fa2692 (patch) | |
| tree | d959d1751d99a6f5307b45d04e46c19c53d5efc2 /src/core/arm/dyncom/arm_dyncom_dec.cpp | |
| parent | 453764aefc3b822d08dae3642fab83ea1adf2bc8 (diff) | |
| parent | 03213f893e7f2cbd692144334ac72d9138fd5e70 (diff) | |
Merge pull request #990 from lioncash/arm
dyncom: General cleanup
Diffstat (limited to 'src/core/arm/dyncom/arm_dyncom_dec.cpp')
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom_dec.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_dec.cpp b/src/core/arm/dyncom/arm_dyncom_dec.cpp index 697be955..3ab9f2c1 100644 --- a/src/core/arm/dyncom/arm_dyncom_dec.cpp +++ b/src/core/arm/dyncom/arm_dyncom_dec.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "core/arm/skyeye_common/armdefs.h" #include "core/arm/dyncom/arm_dyncom_dec.h" +#include "core/arm/skyeye_common/armsupp.h" const ISEITEM arm_instruction[] = { { "vmla", 4, ARMVFP2, { 23, 27, 0x1C, 20, 21, 0x0, 9, 11, 0x5, 4, 4, 0 }}, @@ -414,7 +414,7 @@ const ISEITEM arm_exclusion_code[] = { { "invalid", 0, INVALID, { 0 }} }; -int decode_arm_instr(uint32_t instr, int32_t *idx) { +int decode_arm_instr(u32 instr, s32* idx) { int n = 0; int base = 0; int ret = DECODE_FAILURE; |