diff options
| author | 2015-05-22 23:42:23 -0400 | |
|---|---|---|
| committer | 2015-05-22 23:42:23 -0400 | |
| commit | 92fd2753c54e23815eead954dfec091a6b156840 (patch) | |
| tree | 859c3f64d65b797cb892de5d8100528774a3a653 /src | |
| parent | dyncom: remove load_r15 from arm_inst (diff) | |
| download | yuzu-92fd2753c54e23815eead954dfec091a6b156840.tar.gz yuzu-92fd2753c54e23815eead954dfec091a6b156840.tar.xz yuzu-92fd2753c54e23815eead954dfec091a6b156840.zip | |
dyncom: Remove unused cpu parameter from decode_thumb_instr
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom_interpreter.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp index 2d93f2b03..e4b5486e0 100644 --- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp +++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp | |||
| @@ -3490,7 +3490,7 @@ enum { | |||
| 3490 | FETCH_FAILURE | 3490 | FETCH_FAILURE |
| 3491 | }; | 3491 | }; |
| 3492 | 3492 | ||
| 3493 | static tdstate decode_thumb_instr(ARMul_State* cpu, u32 inst, u32 addr, u32* arm_inst, u32* inst_size, ARM_INST_PTR* ptr_inst_base) { | 3493 | static tdstate decode_thumb_instr(u32 inst, u32 addr, u32* arm_inst, u32* inst_size, ARM_INST_PTR* ptr_inst_base) { |
| 3494 | // Check if in Thumb mode | 3494 | // Check if in Thumb mode |
| 3495 | tdstate ret = thumb_translate (addr, inst, arm_inst, inst_size); | 3495 | tdstate ret = thumb_translate (addr, inst, arm_inst, inst_size); |
| 3496 | if(ret == t_branch){ | 3496 | if(ret == t_branch){ |
| @@ -3581,8 +3581,7 @@ static int InterpreterTranslate(ARMul_State* cpu, int& bb_start, u32 addr) { | |||
| 3581 | // If we are in thumb instruction, we will translate one thumb to one corresponding arm instruction | 3581 | // If we are in thumb instruction, we will translate one thumb to one corresponding arm instruction |
| 3582 | if (cpu->TFlag) { | 3582 | if (cpu->TFlag) { |
| 3583 | uint32_t arm_inst; | 3583 | uint32_t arm_inst; |
| 3584 | tdstate state; | 3584 | tdstate state = decode_thumb_instr(inst, phys_addr, &arm_inst, &inst_size, &inst_base); |
| 3585 | state = decode_thumb_instr(cpu, inst, phys_addr, &arm_inst, &inst_size, &inst_base); | ||
| 3586 | 3585 | ||
| 3587 | // We have translated the branch instruction of thumb in thumb decoder | 3586 | // We have translated the branch instruction of thumb in thumb decoder |
| 3588 | if(state == t_branch){ | 3587 | if(state == t_branch){ |