citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Merge pull request #442 from lioncash/smul 

dyncom: Fix SMULWB/SMULWT
This commit is contained in:
bunnei 2015-01-07 16:49:30 -05:00
parent 3eca33c6a4 df5e0f9f28
commit 4c583732f2
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5891,16 +5891,13 @@ unsigned InterpreterMainLoop(ARMul_State* state) {
SMULW_INST: SMULW_INST:
{ {
if ((inst_base->cond == 0xe) || CondPassed(cpu, inst_base->cond)) { if (inst_base->cond == 0xE || CondPassed(cpu, inst_base->cond)) {
smlad_inst *inst_cream = (smlad_inst *)inst_base->component; smlad_inst* const inst_cream = (smlad_inst*)inst_base->component;
int64_t rm = RM;
int64_t rn = RN; s16 rm = (inst_cream->m == 1) ? ((RM >> 16) & 0xFFFF) : (RM & 0xFFFF);
if (inst_cream->m)
rm = BITS(rm, 16, 31); s64 result = (s64)rm * (s64)(s32)RN;
else RD = BITS(result, 16, 47);
rm = BITS(rm, 0, 15);
int64_t rst = rm * rn;
RD = BITS(rst, 16, 47);
} }
cpu->Reg[15] += GET_INST_SIZE(cpu); cpu->Reg[15] += GET_INST_SIZE(cpu);
INC_PC(sizeof(smlad_inst)); INC_PC(sizeof(smlad_inst));