diff options
author | bunnei <bunneidev@gmail.com> | 2015-02-18 05:54:01 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2015-02-18 05:54:01 +0100 |
commit | 60f9cd6a4a67c3232ae2e0a7fe1c8cdd74e67feb (patch) | |
tree | 15e66ce5d3f36fbfffa111536ace16d2b16bf6e2 /src/core/arm/dyncom/arm_dyncom_interpreter.cpp | |
parent | Merge pull request #578 from linkmauve/math-typo (diff) | |
parent | dyncom: Support conditional BKPT instructions (diff) | |
download | yuzu-60f9cd6a4a67c3232ae2e0a7fe1c8cdd74e67feb.tar yuzu-60f9cd6a4a67c3232ae2e0a7fe1c8cdd74e67feb.tar.gz yuzu-60f9cd6a4a67c3232ae2e0a7fe1c8cdd74e67feb.tar.bz2 yuzu-60f9cd6a4a67c3232ae2e0a7fe1c8cdd74e67feb.tar.lz yuzu-60f9cd6a4a67c3232ae2e0a7fe1c8cdd74e67feb.tar.xz yuzu-60f9cd6a4a67c3232ae2e0a7fe1c8cdd74e67feb.tar.zst yuzu-60f9cd6a4a67c3232ae2e0a7fe1c8cdd74e67feb.zip |
Diffstat (limited to 'src/core/arm/dyncom/arm_dyncom_interpreter.cpp')
-rw-r--r-- | src/core/arm/dyncom/arm_dyncom_interpreter.cpp | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp index a8b3c1276..b691ffbc3 100644 --- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp +++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp @@ -792,6 +792,7 @@ typedef struct _stm_inst { } stm_inst; struct bkpt_inst { + u32 imm; }; struct blx1_inst { @@ -1371,7 +1372,22 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(bic)(unsigned int inst, int index) inst_base->br = INDIRECT_BRANCH; return inst_base; } -static ARM_INST_PTR INTERPRETER_TRANSLATE(bkpt)(unsigned int inst, int index) { UNIMPLEMENTED_INSTRUCTION("BKPT"); } + +static ARM_INST_PTR INTERPRETER_TRANSLATE(bkpt)(unsigned int inst, int index) +{ + arm_inst* const inst_base = (arm_inst*)AllocBuffer(sizeof(arm_inst) + sizeof(bkpt_inst)); + bkpt_inst* const inst_cream = (bkpt_inst*)inst_base->component; + + inst_base->cond = BITS(inst, 28, 31); + inst_base->idx = index; + inst_base->br = NON_BRANCH; + inst_base->load_r15 = 0; + + inst_cream->imm = BITS(inst, 8, 19) | BITS(inst, 0, 3); + + return inst_base; +} + static ARM_INST_PTR INTERPRETER_TRANSLATE(blx)(unsigned int inst, int index) { arm_inst *inst_base = (arm_inst *)AllocBuffer(sizeof(arm_inst) + sizeof(blx_inst)); @@ -4081,6 +4097,16 @@ unsigned InterpreterMainLoop(ARMul_State* state) { GOTO_NEXT_INST; } BKPT_INST: + { + if (inst_base->cond == 0xE || CondPassed(cpu, inst_base->cond)) { + bkpt_inst* const inst_cream = (bkpt_inst*)inst_base->component; + LOG_DEBUG(Core_ARM11, "Breakpoint instruction hit. Immediate: 0x%08X", inst_cream->imm); + } + cpu->Reg[15] += GET_INST_SIZE(cpu); + INC_PC(sizeof(bkpt_inst)); + FETCH_INST; + GOTO_NEXT_INST; + } BLX_INST: { blx_inst *inst_cream = (blx_inst *)inst_base->component; |