diff options
| author | nakeee <nakeee@gmail.com> | 2009-07-22 06:28:04 +0000 |
|---|---|---|
| committer | nakeee <nakeee@gmail.com> | 2009-07-22 06:28:04 +0000 |
| commit | ef6b00f9b02c9b451868c4154a74797771e7d0ab (patch) | |
| tree | 735895be964f25dcea2c1a8c0433fac6fc9a3312 /Source/Core/DSPCore/Src/DSPIntExtOps.cpp | |
| parent | 93a28c0f5b706cecf92438671a0ed758b47f264f (diff) | |
DSPLLE: LD now doesn't give memory errors, still need to be tested with LDM/N and if it really takes 0x00
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3870 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DSPCore/Src/DSPIntExtOps.cpp')
| -rw-r--r-- | Source/Core/DSPCore/Src/DSPIntExtOps.cpp | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/Source/Core/DSPCore/Src/DSPIntExtOps.cpp b/Source/Core/DSPCore/Src/DSPIntExtOps.cpp index b8f4c7073c..bb807e5456 100644 --- a/Source/Core/DSPCore/Src/DSPIntExtOps.cpp +++ b/Source/Core/DSPCore/Src/DSPIntExtOps.cpp @@ -357,13 +357,18 @@ void dsp_op_ext_ld(const UDSPInstruction& opc) u8 dreg1 = (((opc.hex >> 5) & 0x1) << 1) + 0x18; u8 dreg2 = (((opc.hex >> 4) & 0x1) << 1) + 0x19; u8 sreg = opc.hex & 0x3; - g_dsp.r[dreg1] = dsp_dmem_read(g_dsp.r[sreg]); - g_dsp.r[dreg2] = dsp_dmem_read(g_dsp.r[0x03]); + + // TODO: test the 0x00 in the else + if (sreg != 0x3) { + g_dsp.r[dreg1] = dsp_dmem_read(g_dsp.r[sreg]); + g_dsp.r[dreg2] = dsp_dmem_read(g_dsp.r[0x03]); + } else { + g_dsp.r[dreg1] = dsp_dmem_read(g_dsp.r[0x00]); + } if (opc.hex & 0x04) // N { dsp_increase_addr_reg(sreg, (s16)g_dsp.r[DSP_REG_IX0 + sreg]); - //g_dsp.r[sreg] += g_dsp.r[sreg + 0x04]; } else { @@ -372,14 +377,19 @@ void dsp_op_ext_ld(const UDSPInstruction& opc) if (opc.hex & 0x08) // M { - dsp_increase_addr_reg(0x03, (s16)g_dsp.r[DSP_REG_IX0 + 0x03]); - // g_dsp.r[0x03] += g_dsp.r[0x07]; + // TODO test + if (sreg != 0x3) + dsp_increase_addr_reg(0x03, (s16)g_dsp.r[DSP_REG_IX0 + 0x03]); + else + dsp_increase_addr_reg(0x00, (s16)g_dsp.r[DSP_REG_IX0 + 0x03]); } else { - // Tested to increase 0x3 only by one + // Tested if (sreg != 0x3) dsp_increment_addr_reg(0x03); + else + dsp_increment_addr_reg(0x00); } } |