diff options
| author |  Lioncash <mathew1800@gmail.com> | 2015-05-07 20:35:17 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2015-05-07 20:45:28 -0400 |
| commit | ae0c38a333fba917b14bd08d71f23b9e96f87ea6 (patch) | |
| tree | bc3be06b390d761ecb69beae144ff68b4c0e6c23 /src/core/arm/dyncom/arm_dyncom_thumb.cpp | |
| parent | 4560178f6619b6550ee08220de05e917a01cda1e (diff) | |
Remove unnecessary dyncom header files
Diffstat (limited to 'src/core/arm/dyncom/arm_dyncom_thumb.cpp')
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom_thumb.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_thumb.cpp b/src/core/arm/dyncom/arm_dyncom_thumb.cpp index bfb45f10..08b5c0b7 100644 --- a/src/core/arm/dyncom/arm_dyncom_thumb.cpp +++ b/src/core/arm/dyncom/arm_dyncom_thumb.cpp @@ -6,8 +6,6 @@ // ARM instruction, and using the existing ARM simulator. #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 @@ -288,7 +286,7 @@ tdstate thumb_translate(u32 addr, u32 instr, u32* ainstr, u32* inst_size) { : 0xE28DDF00) // ADD |(tinstr & 0x007F); // off7 } else if ((tinstr & 0x0F00) == 0x0e00) - *ainstr = 0xEF000000 | SWI_Breakpoint; + *ainstr = 0xEF000000 | 0x180000; // base | BKPT mask else { static const ARMword subset[4] = { 0xE92D0000, // STMDB sp!,{rlist} @@ -320,7 +318,7 @@ tdstate thumb_translate(u32 addr, u32 instr, u32* ainstr, u32* inst_size) { *ainstr |= ((tinstr & 0x00FF) << 16); // New breakpoint value. See gdb/arm-tdep.c else if ((tinstr & 0x00FF) == 0xFE) - *ainstr |= SWI_Breakpoint; + *ainstr |= 0x180000; // base |= BKPT mask else *ainstr |= (tinstr & 0x00FF); } else if ((tinstr & 0x0F00) != 0x0E00) |