yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

Merge pull request #357 from bunnei/dyncom-pkhbt-pkhtb 

Implement PKHBT and PKHTB on dyncom, fix on armemu
This commit is contained in:
bunnei 2014-12-28 16:57:16 -05:00
parent 082f5b2311 bf9b33aa9f
commit 4bf803579f
2 changed files with 62 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/core/arm/dyncom/arm_dyncom_interpreter.cpp
View File

@ -1427,6 +1427,13 @@ typedef struct _blx_1_thumb {
unsigned int instr; unsigned int instr;
}blx_1_thumb; }blx_1_thumb;
typedef struct _pkh_inst {
u32 Rm;
u32 Rn;
u32 Rd;
u8 imm;
} pkh_inst;
typedef arm_inst * ARM_INST_PTR; typedef arm_inst * ARM_INST_PTR;
#define CACHE_BUFFER_SIZE (64 * 1024 * 2000) #define CACHE_BUFFER_SIZE (64 * 1024 * 2000)
@ -2376,8 +2383,30 @@ ARM_INST_PTR INTERPRETER_TRANSLATE(orr)(unsigned int inst, int index)
} }
return inst_base; return inst_base;
} }
ARM_INST_PTR INTERPRETER_TRANSLATE(pkhbt)(unsigned int inst, int index) { UNIMPLEMENTED_INSTRUCTION("PKHBT"); }
ARM_INST_PTR INTERPRETER_TRANSLATE(pkhtb)(unsigned int inst, int index) { UNIMPLEMENTED_INSTRUCTION("PKHTB"); } ARM_INST_PTR INTERPRETER_TRANSLATE(pkhbt)(unsigned int inst, int index)
{
arm_inst *inst_base = (arm_inst *)AllocBuffer(sizeof(arm_inst) + sizeof(pkh_inst));
pkh_inst *inst_cream = (pkh_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->Rd = BITS(inst, 12, 15);
inst_cream->Rn = BITS(inst, 16, 19);
inst_cream->Rm = BITS(inst, 0, 3);
inst_cream->imm = BITS(inst, 7, 11);
return inst_base;
}
ARM_INST_PTR INTERPRETER_TRANSLATE(pkhtb)(unsigned int inst, int index)
{
return INTERPRETER_TRANSLATE(pkhbt)(inst, index);
}
ARM_INST_PTR INTERPRETER_TRANSLATE(pld)(unsigned int inst, int index) ARM_INST_PTR INTERPRETER_TRANSLATE(pld)(unsigned int inst, int index)
{ {
arm_inst *inst_base = (arm_inst *)AllocBuffer(sizeof(arm_inst) + sizeof(pld_inst)); arm_inst *inst_base = (arm_inst *)AllocBuffer(sizeof(arm_inst) + sizeof(pld_inst));
@ -5659,8 +5688,34 @@ unsigned InterpreterMainLoop(ARMul_State* state)
FETCH_INST; FETCH_INST;
GOTO_NEXT_INST; GOTO_NEXT_INST;
} }
PKHBT_INST: PKHBT_INST:
{
INC_ICOUNTER;
if (inst_base->cond == 0xE || CondPassed(cpu, inst_base->cond)) {
pkh_inst *inst_cream = (pkh_inst *)inst_base->component;
RD = (RN & 0xFFFF) | ((RM << inst_cream->imm) & 0xFFFF0000);
}
cpu->Reg[15] += GET_INST_SIZE(cpu);
INC_PC(sizeof(pkh_inst));
FETCH_INST;
GOTO_NEXT_INST;
}
PKHTB_INST: PKHTB_INST:
{
INC_ICOUNTER;
if (inst_base->cond == 0xE || CondPassed(cpu, inst_base->cond)) {
pkh_inst *inst_cream = (pkh_inst *)inst_base->component;
int shift_imm = inst_cream->imm ? inst_cream->imm : 31;
RD = ((static_cast<s32>(RM) >> shift_imm) & 0xFFFF) | (RN & 0xFFFF0000);
}
cpu->Reg[15] += GET_INST_SIZE(cpu);
INC_PC(sizeof(pkh_inst));
FETCH_INST;
GOTO_NEXT_INST;
}
PLD_INST: PLD_INST:
{ {
INC_ICOUNTER; INC_ICOUNTER;

18
src/core/arm/interpreter/armemu.cpp
View File

@ -3100,7 +3100,6 @@ mainswitch:
break; break;
case 0x68: /* Store Word, No WriteBack, Post Inc, Reg. */ case 0x68: /* Store Word, No WriteBack, Post Inc, Reg. */
//ichfly PKHBT PKHTB todo check this
if ((instr & 0x70) == 0x10) { //pkhbt if ((instr & 0x70) == 0x10) { //pkhbt
u8 idest = BITS(12, 15); u8 idest = BITS(12, 15);
u8 rfis = BITS(16, 19); u8 rfis = BITS(16, 19);
@ -3109,18 +3108,11 @@ mainswitch:
state->Reg[idest] = (state->Reg[rfis] & 0xFFFF) | ((state->Reg[rlast] << ishi) & 0xFFFF0000); state->Reg[idest] = (state->Reg[rfis] & 0xFFFF) | ((state->Reg[rlast] << ishi) & 0xFFFF0000);
break; break;
} else if ((instr & 0x70) == 0x50) { //pkhtb } else if ((instr & 0x70) == 0x50) { //pkhtb
const u8 rd_idx = BITS(12, 15); u8 rd_idx = BITS(12, 15);
const u8 rn_idx = BITS(16, 19); u8 rn_idx = BITS(16, 19);
const u8 rm_idx = BITS(0, 3); u8 rm_idx = BITS(0, 3);
const u8 imm5 = BITS(7, 11); u8 imm5 = BITS(7, 11) ? BITS(7, 11) : 31;
state->Reg[rd_idx] = ((static_cast<s32>(state->Reg[rm_idx]) >> imm5) & 0xFFFF) | ((state->Reg[rn_idx]) & 0xFFFF0000);
ARMword val;
if (imm5 >= 32)
val = (state->Reg[rm_idx] >> 31);
else
val = (state->Reg[rm_idx] >> imm5);
state->Reg[rd_idx] = (val & 0xFFFF) | ((state->Reg[rn_idx]) & 0xFFFF0000);
break; break;
} else if (BIT (4)) { } else if (BIT (4)) {
#ifdef MODE32 #ifdef MODE32