diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom_interpreter.cpp | 48 |
1 files changed, 3 insertions, 45 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp index 3be13de0c..786ea91cb 100644 --- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp +++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp | |||
| @@ -44,10 +44,6 @@ enum { | |||
| 44 | #define ROTATE_RIGHT_32(n, i) ROTATE_RIGHT(n, i, 32) | 44 | #define ROTATE_RIGHT_32(n, i) ROTATE_RIGHT(n, i, 32) |
| 45 | #define ROTATE_LEFT_32(n, i) ROTATE_LEFT(n, i, 32) | 45 | #define ROTATE_LEFT_32(n, i) ROTATE_LEFT(n, i, 32) |
| 46 | 46 | ||
| 47 | #define rotr(x,n) ( (x >> n) | ((x & ((1 << (n + 1)) - 1)) << (32 - n)) ) | ||
| 48 | |||
| 49 | extern void switch_mode(arm_core_t *core, uint32_t mode); | ||
| 50 | |||
| 51 | typedef arm_core_t arm_processor; | 47 | typedef arm_core_t arm_processor; |
| 52 | typedef unsigned int (*shtop_fp_t)(arm_processor *cpu, unsigned int sht_oper); | 48 | typedef unsigned int (*shtop_fp_t)(arm_processor *cpu, unsigned int sht_oper); |
| 53 | 49 | ||
| @@ -227,45 +223,6 @@ unsigned int DPO(RotateRightByRegister)(arm_processor *cpu, unsigned int sht_ope | |||
| 227 | return shifter_operand; | 223 | return shifter_operand; |
| 228 | } | 224 | } |
| 229 | 225 | ||
| 230 | typedef struct _MiscImmeData { | ||
| 231 | unsigned int U; | ||
| 232 | unsigned int Rn; | ||
| 233 | unsigned int offset_8; | ||
| 234 | } MiscLSData; | ||
| 235 | |||
| 236 | typedef struct _MiscRegData { | ||
| 237 | unsigned int U; | ||
| 238 | unsigned int Rn; | ||
| 239 | unsigned int Rm; | ||
| 240 | } MiscRegData; | ||
| 241 | |||
| 242 | typedef struct _MiscImmePreIdx { | ||
| 243 | unsigned int offset_8; | ||
| 244 | unsigned int U; | ||
| 245 | unsigned int Rn; | ||
| 246 | } MiscImmePreIdx; | ||
| 247 | |||
| 248 | typedef struct _MiscRegPreIdx { | ||
| 249 | unsigned int U; | ||
| 250 | unsigned int Rn; | ||
| 251 | unsigned int Rm; | ||
| 252 | } MiscRegPreIdx; | ||
| 253 | |||
| 254 | typedef struct _MiscImmePstIdx { | ||
| 255 | unsigned int offset_8; | ||
| 256 | unsigned int U; | ||
| 257 | unsigned int Rn; | ||
| 258 | } MIscImmePstIdx; | ||
| 259 | |||
| 260 | typedef struct _MiscRegPstIdx { | ||
| 261 | unsigned int Rn; | ||
| 262 | unsigned int Rm; | ||
| 263 | unsigned int U; | ||
| 264 | } MiscRegPstIdx; | ||
| 265 | |||
| 266 | typedef struct _LSWordorUnsignedByte { | ||
| 267 | } LDnST; | ||
| 268 | |||
| 269 | typedef void (*get_addr_fp_t)(arm_processor *cpu, unsigned int inst, unsigned int &virt_addr, unsigned int rw); | 226 | typedef void (*get_addr_fp_t)(arm_processor *cpu, unsigned int inst, unsigned int &virt_addr, unsigned int rw); |
| 270 | 227 | ||
| 271 | typedef struct _ldst_inst { | 228 | typedef struct _ldst_inst { |
| @@ -275,8 +232,9 @@ typedef struct _ldst_inst { | |||
| 275 | #define DEBUG_MSG LOG_DEBUG(Core_ARM11, "inst is %x", inst); CITRA_IGNORE_EXIT(0) | 232 | #define DEBUG_MSG LOG_DEBUG(Core_ARM11, "inst is %x", inst); CITRA_IGNORE_EXIT(0) |
| 276 | 233 | ||
| 277 | int CondPassed(arm_processor *cpu, unsigned int cond); | 234 | int CondPassed(arm_processor *cpu, unsigned int cond); |
| 278 | #define LnSWoUB(s) glue(LnSWoUB, s) | 235 | |
| 279 | #define MLnS(s) glue(MLnS, s) | 236 | #define LnSWoUB(s) glue(LnSWoUB, s) |
| 237 | #define MLnS(s) glue(MLnS, s) | ||
| 280 | #define LdnStM(s) glue(LdnStM, s) | 238 | #define LdnStM(s) glue(LdnStM, s) |
| 281 | 239 | ||
| 282 | #define W_BIT BIT(inst, 21) | 240 | #define W_BIT BIT(inst, 21) |