diff options
| author | bunnei <bunneidev@gmail.com> | 2015-02-03 18:40:16 +0100 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-02-03 18:40:16 +0100 |
| commit | d64c836369ec2feae8a39c883a832692a8239bad (patch) | |
| tree | 3c7d78bb2e4666cb7a11cfb7f57f61b8710ca07d /src/core/arm/dyncom | |
| parent | Merge pull request #523 from yuriks/kernel-lifetime5 (diff) | |
| parent | core: Fix some warnings on OSX (diff) | |
| download | yuzu-d64c836369ec2feae8a39c883a832692a8239bad.tar yuzu-d64c836369ec2feae8a39c883a832692a8239bad.tar.gz yuzu-d64c836369ec2feae8a39c883a832692a8239bad.tar.bz2 yuzu-d64c836369ec2feae8a39c883a832692a8239bad.tar.lz yuzu-d64c836369ec2feae8a39c883a832692a8239bad.tar.xz yuzu-d64c836369ec2feae8a39c883a832692a8239bad.tar.zst yuzu-d64c836369ec2feae8a39c883a832692a8239bad.zip | |
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 case 26: case 27: if (((tinstr & 0x0F00) != 0x0E00) && ((tinstr & 0x0F00) != 0x0F00)){ - u32 cond = (tinstr & 0x0F00) >> 8; inst_index = table_length - 4; *ptr_inst_base = arm_instruction_trans[inst_index](tinstr, inst_index); } else { @@ -3693,6 +3692,9 @@ static bool InAPrivilegedMode(arm_core_t *core) { } unsigned InterpreterMainLoop(ARMul_State* state) { + #undef RM + #undef RS + #define CRn inst_cream->crn #define OPCODE_2 inst_cream->opcode_2 #define CRm inst_cream->crm @@ -4999,7 +5001,7 @@ unsigned InterpreterMainLoop(ARMul_State* state) { } uint32_t byte_mask = (BIT(inst, 16) ? 0xff : 0) | (BIT(inst, 17) ? 0xff00 : 0) | (BIT(inst, 18) ? 0xff0000 : 0) | (BIT(inst, 19) ? 0xff000000 : 0); - uint32_t mask; + uint32_t mask = 0; if (!inst_cream->R) { if (InAPrivilegedMode(cpu)) { if ((operand & StateMask) != 0) { |