diff options
| author | 2015-02-03 08:07:03 -0500 | |
|---|---|---|
| committer | 2015-02-03 08:14:42 -0500 | |
| commit | 676daef3c7b1d2dc4ad178d7d799c994383b2512 (patch) | |
| tree | 3c7d78bb2e4666cb7a11cfb7f57f61b8710ca07d /src/core/arm/dyncom | |
| parent | Merge pull request #523 from yuriks/kernel-lifetime5 (diff) | |
| download | yuzu-676daef3c7b1d2dc4ad178d7d799c994383b2512.tar.gz yuzu-676daef3c7b1d2dc4ad178d7d799c994383b2512.tar.xz yuzu-676daef3c7b1d2dc4ad178d7d799c994383b2512.zip | |
core: Fix some warnings on OSX
Diffstat (limited to 'src/core/arm/dyncom')
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom_interpreter.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp index 96d71cd50..3be13de0c 100644 --- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp +++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp | |||
| @@ -3553,7 +3553,6 @@ static tdstate decode_thumb_instr(arm_processor *cpu, uint32_t inst, addr_t addr | |||
| 3553 | case 26: | 3553 | case 26: |
| 3554 | case 27: | 3554 | case 27: |
| 3555 | if (((tinstr & 0x0F00) != 0x0E00) && ((tinstr & 0x0F00) != 0x0F00)){ | 3555 | if (((tinstr & 0x0F00) != 0x0E00) && ((tinstr & 0x0F00) != 0x0F00)){ |
| 3556 | u32 cond = (tinstr & 0x0F00) >> 8; | ||
| 3557 | inst_index = table_length - 4; | 3556 | inst_index = table_length - 4; |
| 3558 | *ptr_inst_base = arm_instruction_trans[inst_index](tinstr, inst_index); | 3557 | *ptr_inst_base = arm_instruction_trans[inst_index](tinstr, inst_index); |
| 3559 | } else { | 3558 | } else { |
| @@ -3693,6 +3692,9 @@ static bool InAPrivilegedMode(arm_core_t *core) { | |||
| 3693 | } | 3692 | } |
| 3694 | 3693 | ||
| 3695 | unsigned InterpreterMainLoop(ARMul_State* state) { | 3694 | unsigned InterpreterMainLoop(ARMul_State* state) { |
| 3695 | #undef RM | ||
| 3696 | #undef RS | ||
| 3697 | |||
| 3696 | #define CRn inst_cream->crn | 3698 | #define CRn inst_cream->crn |
| 3697 | #define OPCODE_2 inst_cream->opcode_2 | 3699 | #define OPCODE_2 inst_cream->opcode_2 |
| 3698 | #define CRm inst_cream->crm | 3700 | #define CRm inst_cream->crm |
| @@ -4999,7 +5001,7 @@ unsigned InterpreterMainLoop(ARMul_State* state) { | |||
| 4999 | } | 5001 | } |
| 5000 | uint32_t byte_mask = (BIT(inst, 16) ? 0xff : 0) | (BIT(inst, 17) ? 0xff00 : 0) | 5002 | uint32_t byte_mask = (BIT(inst, 16) ? 0xff : 0) | (BIT(inst, 17) ? 0xff00 : 0) |
| 5001 | | (BIT(inst, 18) ? 0xff0000 : 0) | (BIT(inst, 19) ? 0xff000000 : 0); | 5003 | | (BIT(inst, 18) ? 0xff0000 : 0) | (BIT(inst, 19) ? 0xff000000 : 0); |
| 5002 | uint32_t mask; | 5004 | uint32_t mask = 0; |
| 5003 | if (!inst_cream->R) { | 5005 | if (!inst_cream->R) { |
| 5004 | if (InAPrivilegedMode(cpu)) { | 5006 | if (InAPrivilegedMode(cpu)) { |
| 5005 | if ((operand & StateMask) != 0) { | 5007 | if ((operand & StateMask) != 0) { |