citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #673 from lioncash/cleanup 

dyncom: Remove unused/unnecessary macros and macro constants
This commit is contained in:
bunnei 2015-03-24 13:12:50 -04:00
parent 03ceb7adf9 2df10d2284
commit eea0df8c52
2 changed files with 2 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/arm/dyncom/arm_dyncom_dec.cpp
View File

@ -413,7 +413,7 @@ int decode_arm_instr(uint32_t instr, int32_t *idx) {
if (instr != arm_instruction[i].content[base + 2]) { if (instr != arm_instruction[i].content[base + 2]) {
break; break;
} }
} else if (BITS(arm_instruction[i].content[base], arm_instruction[i].content[base + 1]) != arm_instruction[i].content[base + 2]) { } else if (BITS(instr, arm_instruction[i].content[base], arm_instruction[i].content[base + 1]) != arm_instruction[i].content[base + 2]) {
break; break;
} }
base += 3; base += 3;
@ -429,7 +429,7 @@ int decode_arm_instr(uint32_t instr, int32_t *idx) {
if (n != 0) { if (n != 0) {
base = 0; base = 0;
while (n) { while (n) {
if (BITS(arm_exclusion_code[i].content[base], arm_exclusion_code[i].content[base + 1]) != arm_exclusion_code[i].content[base + 2]) { if (BITS(instr, arm_exclusion_code[i].content[base], arm_exclusion_code[i].content[base + 1]) != arm_exclusion_code[i].content[base + 2]) {
break; break;
} }
base += 3; base += 3;

37
src/core/arm/dyncom/arm_dyncom_dec.h
View File

@ -4,43 +4,6 @@
#pragma once #pragma once
#define BITS(a,b) ((instr >> (a)) & ((1 << (1+(b)-(a)))-1))
#define BIT(n) ((instr >> (n)) & 1)
// For MUL instructions
#define RDHi ((instr >> 16) & 0xF)
#define RDLo ((instr >> 12) & 0xF)
#define MUL_RD ((instr >> 16) & 0xF)
#define MUL_RN ((instr >> 12) & 0xF)
#define RS ((instr >> 8) & 0xF)
#define RD ((instr >> 12) & 0xF)
#define RN ((instr >> 16) & 0xF)
#define RM (instr & 0xF)
// CP15 registers
#define OPCODE_1 BITS(21, 23)
#define CRn BITS(16, 19)
#define CRm BITS(0, 3)
#define OPCODE_2 BITS(5, 7)
#define I BIT(25)
#define S BIT(20)
#define SHIFT BITS(5,6)
#define SHIFT_IMM BITS(7,11)
#define IMMH BITS(8,11)
#define IMML BITS(0,3)
#define LSPBIT BIT(24)
#define LSUBIT BIT(23)
#define LSBBIT BIT(22)
#define LSWBIT BIT(21)
#define LSLBIT BIT(20)
#define LSSHBITS BITS(5,6)
#define OFFSET12 BITS(0,11)
#define SBIT BIT(20)
#define DESTReg (BITS (12, 15))
int decode_arm_instr(uint32_t instr, int32_t *idx); int decode_arm_instr(uint32_t instr, int32_t *idx);
enum DECODE_STATUS { enum DECODE_STATUS {