DSPLLE - 0xa100 figured out = abs(), small mul fix, cleaning, some extra comments

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5216 8ced0084-cf51-0410-be5f-012b33b47a6e

1 files changed, 73 insertions, 80 deletions

diff --git a/Source/Core/DSPCore/Src/DSPIntExtOps.cpp b/Source/Core/DSPCore/Src/DSPIntExtOps.cpp
index c62388537c..332f5c20d0 100644
--- a/Source/Core/DSPCore/Src/DSPIntExtOps.cpp
+++ b/Source/Core/DSPCore/Src/DSPIntExtOps.cpp
@@ -74,9 +74,9 @@ void nr(const UDSPInstruction& opc) {
 	writeToBackLog(0, reg, dsp_increase_addr_reg(reg, (s16)g_dsp.r[DSP_REG_IX0 + reg]));
 }
 
-// MV $axD, $acS.l
+// MV $axD.D, $acS.S
 // xxxx xxxx 0001 ddss
-// Move value of $acS.l to the $axD.l.
+// Move value of $acS.S to the $axD.D.
 void mv(const UDSPInstruction& opc)
 {
  	u8 sreg = (opc.hex & 0x3) + DSP_REG_ACL0;
@@ -90,10 +90,10 @@ void mv(const UDSPInstruction& opc)
 		writeToBackLog(0, dreg + DSP_REG_AXL0, g_dsp.r[sreg]);
 }
 	
-// S @$D, $acD.l
+// S @$arD, $acS.S
 // xxxx xxxx 001s s0dd
-// Store value of $(acS.l) in the memory pointed by register $D.
-// Post increment register $D.
+// Store value of $acS.S in the memory pointed by register $arD.
+// Post increment register $arD.
 void s(const UDSPInstruction& opc)
 {
 	u8 dreg = opc.hex & 0x3;
@@ -103,24 +103,23 @@ void s(const UDSPInstruction& opc)
 	writeToBackLog(0, dreg,	dsp_increment_addr_reg(dreg));
 }
 
-// SN @$D, $acD.l
+// SN @$arD, $acS.S
 // xxxx xxxx 001s s1dd
-// Store value of register $acS in the memory pointed by register $D.
-// Add indexing register $ixD to register $D.
+// Store value of register $acS.S in the memory pointed by register $arD.
+// Add indexing register $ixD to register $arD.
 void sn(const UDSPInstruction& opc)
 {
 	u8 dreg = opc.hex & 0x3;
 	u8 sreg = ((opc.hex >> 3) & 0x3) + DSP_REG_ACL0;
 
 	dsp_dmem_write(g_dsp.r[dreg], g_dsp.r[sreg]);
-
 	writeToBackLog(0, dreg,	dsp_increase_addr_reg(dreg, (s16)g_dsp.r[DSP_REG_IX0 + dreg]));
 }
 
-// L axD.l, @$S
+// L $axD.D, @$arS
 // xxxx xxxx 01dd d0ss
-// Load $axD with value from memory pointed by register $S. 
-// Post increment register $S.
+// Load $axD.D/$acD.D with value from memory pointed by register $arS. 
+// Post increment register $arS.
 void l(const UDSPInstruction& opc)
 {
 	u8 sreg = opc.hex & 0x3;
@@ -141,10 +140,10 @@ void l(const UDSPInstruction& opc)
 	}
 }
 
-// LN axD.l, @$S
+// LN $axD.D, @$arS
 // xxxx xxxx 01dd d0ss
-// Load $axD with value from memory pointed by register $S. 
-// Add indexing register register $ixS to register $S.
+// Load $axD.D/$acD.D with value from memory pointed by register $arS. 
+// Add indexing register register $ixS to register $arS.
 void ln(const UDSPInstruction& opc)
 {
 	u8 sreg = opc.hex & 0x3;
@@ -165,161 +164,159 @@ void ln(const UDSPInstruction& opc)
 	}
 }
 
-// LS $axD.l, $acS.m
+// LS $axD.D, $acS.m
 // xxxx xxxx 10dd 000s
-// Load register $axD.l with value from memory pointed by register
+// Load register $axD.D with value from memory pointed by register
 // $ar0. Store value from register $acS.m to memory location pointed by
 // register $ar3. Increment both $ar0 and $ar3.
 void ls(const UDSPInstruction& opc)
 {
-	u8 areg = (opc.hex & 0x1) + DSP_REG_ACM0;
-	u8 sreg = DSP_REG_AR3;
+	u8 sreg = (opc.hex & 0x1) + DSP_REG_ACM0;
 	u8 dreg = ((opc.hex >> 4) & 0x3) + DSP_REG_AXL0;
 
-	dsp_dmem_write(g_dsp.r[sreg], g_dsp.r[areg]);
+	dsp_dmem_write(g_dsp.r[DSP_REG_AR3], g_dsp.r[sreg]);
 
 	writeToBackLog(0, dreg,	dsp_dmem_read(g_dsp.r[DSP_REG_AR0]));
-	writeToBackLog(1, sreg,	dsp_increment_addr_reg(sreg));
+	writeToBackLog(1, DSP_REG_AR3, dsp_increment_addr_reg(DSP_REG_AR3));
 	writeToBackLog(2, DSP_REG_AR0, dsp_increment_addr_reg(DSP_REG_AR0)); 
 }
 
 
-// LSN $acD.l, $acS.m
+// LSN $axD.D, $acS.m
 // xxxx xxxx 10dd 010s
-// Load register $acD.l with value from memory pointed by register
+// Load register $axD.D with value from memory pointed by register
 // $ar0. Store value from register $acS.m to memory location pointed by
 // register $ar3. Add corresponding indexing register $ix0 to addressing
 // register $ar0 and increment $ar3.
 void lsn(const UDSPInstruction& opc)
 {
-	u8 areg = (opc.hex & 0x1) + DSP_REG_ACM0;
-	u8 sreg = DSP_REG_AR3;
+	u8 sreg = (opc.hex & 0x1) + DSP_REG_ACM0;
 	u8 dreg = ((opc.hex >> 4) & 0x3) + DSP_REG_AXL0;
 
-	dsp_dmem_write(g_dsp.r[sreg], g_dsp.r[areg]);
+	dsp_dmem_write(g_dsp.r[DSP_REG_AR3], g_dsp.r[sreg]);
 
 	writeToBackLog(0, dreg,	dsp_dmem_read(g_dsp.r[DSP_REG_AR0]));
-	writeToBackLog(1, sreg,	dsp_increment_addr_reg(sreg));
+	writeToBackLog(1, DSP_REG_AR3, dsp_increment_addr_reg(DSP_REG_AR3));
 	writeToBackLog(2, DSP_REG_AR0, dsp_increase_addr_reg(DSP_REG_AR0, (s16)g_dsp.r[DSP_REG_IX0]));
 }
 
-// LSM $acD.l, $acS.m
+// LSM $axD.D, $acS.m
 // xxxx xxxx 10dd 100s
-// Load register $acD.l with value from memory pointed by register
+// Load register $axD.D with value from memory pointed by register
 // $ar0. Store value from register $acS.m to memory location pointed by
 // register $ar3. Add corresponding indexing register $ix3 to addressing
 // register $ar3 and increment $ar0.
 void lsm(const UDSPInstruction& opc)
 {
-	u8 areg = (opc.hex & 0x1) + DSP_REG_ACM0;
-	u8 sreg = DSP_REG_AR3;
+	u8 sreg = (opc.hex & 0x1) + DSP_REG_ACM0;
 	u8 dreg = ((opc.hex >> 4) & 0x3) + DSP_REG_AXL0;
 	
-	dsp_dmem_write(g_dsp.r[sreg], g_dsp.r[areg]);
+	dsp_dmem_write(g_dsp.r[DSP_REG_AR3], g_dsp.r[sreg]);
 
 	writeToBackLog(0, dreg,	dsp_dmem_read(g_dsp.r[DSP_REG_AR0]));
-	writeToBackLog(1, sreg,	dsp_increase_addr_reg(sreg, (s16)g_dsp.r[DSP_REG_IX0 + sreg]));
-	writeToBackLog(2, DSP_REG_AR0,	dsp_increment_addr_reg(DSP_REG_AR0));
+	writeToBackLog(1, DSP_REG_AR3, dsp_increase_addr_reg(DSP_REG_AR3, (s16)g_dsp.r[DSP_REG_IX0 + DSP_REG_AR3]));
+	writeToBackLog(2, DSP_REG_AR0, dsp_increment_addr_reg(DSP_REG_AR0));
 }
 
-// LSMN $acD.l, $acS.m
+// LSMN $axD.D, $acS.m
 // xxxx xxxx 10dd 110s
-// Load register $acD.l with value from memory pointed by register
+// Load register $axD.D with value from memory pointed by register
 // $ar0. Store value from register $acS.m to memory location pointed by
 // register $ar3. Add corresponding indexing register $ix0 to addressing
 // register $ar0 and add corresponding indexing register $ix3 to addressing
 // register $ar3.
 void lsnm(const UDSPInstruction& opc)
 {
-	u8 areg = (opc.hex & 0x1) + DSP_REG_ACM0;
-	u8 sreg = DSP_REG_AR3;
+	u8 sreg = (opc.hex & 0x1) + DSP_REG_ACM0;
 	u8 dreg = ((opc.hex >> 4) & 0x3) + DSP_REG_AXL0;
 	
-	dsp_dmem_write(g_dsp.r[sreg], g_dsp.r[areg]);
+	dsp_dmem_write(g_dsp.r[DSP_REG_AR3], g_dsp.r[sreg]);
 
 	writeToBackLog(0, dreg,	dsp_dmem_read(g_dsp.r[DSP_REG_AR0]));
-	writeToBackLog(1, sreg,	dsp_increase_addr_reg(sreg, (s16)g_dsp.r[DSP_REG_IX0 + sreg]));
+	writeToBackLog(1, DSP_REG_AR3, dsp_increase_addr_reg(DSP_REG_AR3, (s16)g_dsp.r[DSP_REG_IX0 + DSP_REG_AR3]));
 	writeToBackLog(2, DSP_REG_AR0, dsp_increase_addr_reg(DSP_REG_AR0, (s16)g_dsp.r[DSP_REG_IX0]));
 }
 
-// SL $acS.m, $acD.l
+// SL $acS.m, $axD.D
 // xxxx xxxx 10dd 001s
 // Store value from register $acS.m to memory location pointed by register
-// $ar0. Load register $acD.l with value from memory pointed by register
+// $ar0. Load register $axD.D with value from memory pointed by register
 // $ar3. Increment both $ar0 and $ar3.
 void sl(const UDSPInstruction& opc)
 {
-	u8 areg = (opc.hex & 0x1) + DSP_REG_ACM0;
+	u8 sreg = (opc.hex & 0x1) + DSP_REG_ACM0;
 	u8 dreg = ((opc.hex >> 4) & 0x3) + DSP_REG_AXL0;
-	const u8 sreg = DSP_REG_AR3;
 	
-	dsp_dmem_write(g_dsp.r[DSP_REG_AR0], g_dsp.r[areg]);
+	dsp_dmem_write(g_dsp.r[DSP_REG_AR0], g_dsp.r[sreg]);
 
-	writeToBackLog(0, dreg,	dsp_dmem_read(g_dsp.r[sreg]));
-	writeToBackLog(1, sreg,	dsp_increment_addr_reg(sreg));
-	writeToBackLog(2, DSP_REG_AR0,	dsp_increment_addr_reg(DSP_REG_AR0)); 
+	writeToBackLog(0, dreg,	dsp_dmem_read(g_dsp.r[DSP_REG_AR3]));
+	writeToBackLog(1, DSP_REG_AR3, dsp_increment_addr_reg(DSP_REG_AR3));
+	writeToBackLog(2, DSP_REG_AR0, dsp_increment_addr_reg(DSP_REG_AR0)); 
 }
 
-// SLN $acS.m, $acD.l
+// SLN $acS.m, $axD.D
 // xxxx xxxx 10dd 011s
 // Store value from register $acS.m to memory location pointed by register
-// $ar0. Load register $acD.l with value from memory pointed by register
+// $ar0. Load register $axD.D with value from memory pointed by register
 // $ar3. Add corresponding indexing register $ix0 to addressing register $ar0
 // and increment $ar3.
 void sln(const UDSPInstruction& opc)
 {
-	u8 areg = (opc.hex & 0x1) + DSP_REG_ACM0;
+	u8 sreg = (opc.hex & 0x1) + DSP_REG_ACM0;
 	u8 dreg = ((opc.hex >> 4) & 0x3) + DSP_REG_AXL0;
-	const u8 sreg = DSP_REG_AR3;
 	
-	dsp_dmem_write(g_dsp.r[DSP_REG_AR0], g_dsp.r[areg]);
+	dsp_dmem_write(g_dsp.r[DSP_REG_AR0], g_dsp.r[sreg]);
 	
-	writeToBackLog(0, dreg,	dsp_dmem_read(g_dsp.r[sreg]));
-	writeToBackLog(1, sreg,	dsp_increment_addr_reg(sreg));
+	writeToBackLog(0, dreg,	dsp_dmem_read(g_dsp.r[DSP_REG_AR3]));
+	writeToBackLog(1, DSP_REG_AR3, dsp_increment_addr_reg(DSP_REG_AR3));
 	writeToBackLog(2, DSP_REG_AR0, dsp_increase_addr_reg(DSP_REG_AR0, (s16)g_dsp.r[DSP_REG_IX0]));
 }
 
-// SLM $acS.m, $acD.l
+// SLM $acS.m, $axD.D
 // xxxx xxxx 10dd 101s
 // Store value from register $acS.m to memory location pointed by register
-// $ar0. Load register $acD.l with value from memory pointed by register
+// $ar0. Load register $axD.D with value from memory pointed by register
 // $ar3. Add corresponding indexing register $ix3 to addressing register $ar3
 // and increment $ar0.
 void slm(const UDSPInstruction& opc)
 {
-	u8 areg = (opc.hex & 0x1) + DSP_REG_ACM0;
+	u8 sreg = (opc.hex & 0x1) + DSP_REG_ACM0;
 	u8 dreg = ((opc.hex >> 4) & 0x3) + DSP_REG_AXL0;
-	const u8 sreg = DSP_REG_AR3;
 	
-	dsp_dmem_write(g_dsp.r[DSP_REG_AR0], g_dsp.r[areg]);
+	dsp_dmem_write(g_dsp.r[DSP_REG_AR0], g_dsp.r[sreg]);
 
-	writeToBackLog(0, dreg,	dsp_dmem_read(g_dsp.r[sreg]));
-	writeToBackLog(1, sreg,	dsp_increase_addr_reg(sreg, (s16)g_dsp.r[DSP_REG_IX0 + sreg]));
-	writeToBackLog(2, DSP_REG_AR0,	dsp_increment_addr_reg(DSP_REG_AR0));
+	writeToBackLog(0, dreg,	dsp_dmem_read(g_dsp.r[DSP_REG_AR3]));
+	writeToBackLog(1, DSP_REG_AR3, dsp_increase_addr_reg(DSP_REG_AR3, (s16)g_dsp.r[DSP_REG_IX0 + DSP_REG_AR3]));
+	writeToBackLog(2, DSP_REG_AR0, dsp_increment_addr_reg(DSP_REG_AR0));
 }
 
-// SLMN $acS.m, $acD.l
+// SLMN $acS.m, $axD.D
 // xxxx xxxx 10dd 111s
 // Store value from register $acS.m to memory location pointed by register
-// $ar0. Load register $acD.l with value from memory pointed by register
+// $ar0. Load register $axD.D with value from memory pointed by register
 // $ar3. Add corresponding indexing register $ix0 to addressing register $ar0
 // and add corresponding indexing register $ix3 to addressing register $ar3.
 void slnm(const UDSPInstruction& opc)
 {
-	u8 areg = (opc.hex & 0x1) + DSP_REG_ACM0;
+	u8 sreg = (opc.hex & 0x1) + DSP_REG_ACM0;
 	u8 dreg = ((opc.hex >> 4) & 0x3) + DSP_REG_AXL0;
-	const u8 sreg = DSP_REG_AR3;
 	
-	dsp_dmem_write(g_dsp.r[DSP_REG_AR0], g_dsp.r[areg]);
+	dsp_dmem_write(g_dsp.r[DSP_REG_AR0], g_dsp.r[sreg]);
 
-	writeToBackLog(0, dreg,	dsp_dmem_read(g_dsp.r[sreg]));
-	writeToBackLog(1, sreg,	dsp_increase_addr_reg(sreg, (s16)g_dsp.r[DSP_REG_IX0 + sreg]));
+	writeToBackLog(0, dreg,	dsp_dmem_read(g_dsp.r[DSP_REG_AR3]));
+	writeToBackLog(1, DSP_REG_AR3, dsp_increase_addr_reg(DSP_REG_AR3, (s16)g_dsp.r[DSP_REG_IX0 + DSP_REG_AR3]));
 	writeToBackLog(2, DSP_REG_AR0, dsp_increase_addr_reg(DSP_REG_AR0, (s16)g_dsp.r[DSP_REG_IX0]));
 }
 
-// Not in duddie's doc
-// LD $ax0.d $ax1.r @$arS
+// LD $ax0.d, $ax1.r, @$arS
 // xxxx xxxx 11dr 00ss
+// example for "nx'ld $AX0.L, $AX1.L, @$AR3"
+// Loads the word pointed by AR0 to AX0.H, then loads the word pointed by AR3 to AX0.L. 
+// Increments AR0 and AR3.
+// If AR0 and AR3 point into the same memory page (upper 6 bits of addr are the same -> games are not doing that!)
+// then the value pointed by AR0 is loaded to BOTH AX0.H and AX0.L.
+// If AR0 points into an invalid memory page (ie 0x2000), then AX0.H keeps its old value. (not implemented yet)
+// If AR3 points into an invalid memory page, then AX0.L gets the same value as AX0.H. (not implemented yet)
 void ld(const UDSPInstruction& opc)
 {
 	u8 dreg = (opc.hex >> 5) & 0x1;
@@ -349,8 +346,7 @@ void ld(const UDSPInstruction& opc)
 	writeToBackLog(3, DSP_REG_AR3, dsp_increment_addr_reg(DSP_REG_AR3));
 }
 
-// Not in duddie's doc
-// LDN $ax0.d $ax1.r @$arS
+// LDN $ax0.d, $ax1.r, @$arS
 // xxxx xxxx 11dr 01ss
 void ldn(const UDSPInstruction& opc)
 {
@@ -381,9 +377,7 @@ void ldn(const UDSPInstruction& opc)
 	writeToBackLog(3, DSP_REG_AR3, dsp_increment_addr_reg(DSP_REG_AR3));
 }
 
-
-// Not in duddie's doc
-// LDM $ax0.d $ax1.r @$arS
+// LDM $ax0.d, $ax1.r, @$arS
 // xxxx xxxx 11dr 10ss
 void ldm(const UDSPInstruction& opc)
 {
@@ -415,8 +409,7 @@ void ldm(const UDSPInstruction& opc)
 				   dsp_increase_addr_reg(DSP_REG_AR3, (s16)g_dsp.r[DSP_REG_IX0 + DSP_REG_AR3]));
 }
 
-// Not in duddie's doc
-// LDNM $ax0.d $ax1.r @$arS
+// LDNM $ax0.d, $ax1.r, @$arS
 // xxxx xxxx 11dr 11ss
 void ldnm(const UDSPInstruction& opc)
 {
@@ -491,7 +484,7 @@ void zeroWriteBackLog()
 }
 
 //needed for 0x3... (at least)..., + clrl
-//ex. corner case -> 0x4060: main opcode modifies .m, and extended .l -> .l shoudnt be zeroed because of .m write...
+//ex. corner case -> 0x3060: main opcode modifies .m, and extended .l -> .l shoudnt be zeroed because of .m write...
 void zeroWriteBackLogPreserveAcc(u8 acc) 
 {
 	for (int i = 0; writeBackLogIdx[i] != -1; i++) {