comments, tstaxl guessing, clear log messages

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

4 files changed, 49 insertions, 10 deletions

diff --git a/Source/Plugins/Plugin_DSP_LLE-testing/Src/DSPInterpreter.cpp b/Source/Plugins/Plugin_DSP_LLE-testing/Src/DSPInterpreter.cpp
index 03abe4da14..6599db1782 100644
--- a/Source/Plugins/Plugin_DSP_LLE-testing/Src/DSPInterpreter.cpp
+++ b/Source/Plugins/Plugin_DSP_LLE-testing/Src/DSPInterpreter.cpp
@@ -386,7 +386,11 @@ void ilrrn(const UDSPInstruction& opc)
 	g_dsp.r[reg] += g_dsp.r[DSP_REG_IX0 + reg];

 }

 

-

+// LRI $D, #I

+// 0000 0000 100d dddd

+// iiii iiii iiii iiii

+// Load immediate value I to register $D. 

+// FIXME: Perform additional operation depending on destination register.

 void lri(const UDSPInstruction& opc)

 {

 	u8 reg  = opc.hex & DSP_REG_MASK;

@@ -394,6 +398,10 @@ void lri(const UDSPInstruction& opc)
 	dsp_op_write_reg(reg, imm);

 }

 

+// LRIS $(0x18+D), #I

+// 0000 1ddd iiii iiii

+// Load immediate value I (8-bit sign extended) to accumulator register$(0x18+D). 

+// FIXME: Perform additional operation depending on destination register.

 void lris(const UDSPInstruction& opc)

 {

 	u8 reg  = ((opc.hex >> 8) & 0x7) + 0x18;

@@ -401,6 +409,11 @@ void lris(const UDSPInstruction& opc)
 	dsp_op_write_reg(reg, imm);

 }

 

+// LR $D, @M

+// 0000 0000 110d dddd

+// mmmm mmmm mmmm mmmm

+// Move value from data memory pointed by address M to register $D.

+// FIXME: Perform additional operation depending on destination register.

 void lr(const UDSPInstruction& opc)

 {

 	u8 reg   = opc.hex & DSP_REG_MASK;

@@ -409,6 +422,11 @@ void lr(const UDSPInstruction& opc)
 	dsp_op_write_reg(reg, val);

 }

 

+// SR @M, $S

+// 0000 0000 111s ssss

+// mmmm mmmm mmmm mmmm

+// Store value from register $S to a memory pointed by address M.

+// FIXME: Perform additional operation depending on destination register.

 void sr(const UDSPInstruction& opc)

 {

 	u8 reg   = opc.hex & DSP_REG_MASK;

@@ -417,6 +435,11 @@ void sr(const UDSPInstruction& opc)
 	dsp_dmem_write(addr, val);

 }

 

+// SI @M, #I

+// 0001 0110 mmmm mmmm

+// iiii iiii iiii iiii

+// Store 16-bit immediate value I to a memory location pointed by address

+// M (M is 8-bit value sign extended).

 void si(const UDSPInstruction& opc)

 {

 	u16 addr = (s8)opc.hex;

@@ -424,6 +447,9 @@ void si(const UDSPInstruction& opc)
 	dsp_dmem_write(addr, imm);

 }

 

+// TSTAXH $axR.h

+// 1000 011r xxxx xxxx

+// Test hight part of secondary accumulator $axR.h.

 void tstaxh(const UDSPInstruction& opc)

 {

 	u8 reg  = (opc.hex >> 8) & 0x1;

@@ -432,6 +458,17 @@ void tstaxh(const UDSPInstruction& opc)
 	Update_SR_Register16(val);

 }

 

+// TSTAXL $axR.h

+// 1000 011r xxxx xxxx

+// Test lower part of secondary accumulator $axR.h.

+void tstaxl(const UDSPInstruction& opc)

+{

+	u8 reg  = (opc.hex >> 8) & 0x1;

+	s16 val = dsp_get_ax_l(reg);

+

+	Update_SR_Register16(val);

+}

+

 // CLR $acR

 // 1000 r001 xxxx xxxx

 // Clears accumulator $acR

@@ -1222,33 +1259,33 @@ void srbith(const UDSPInstruction& opc)
 	// done around loops with lots of multiplications.

 

 	case 0xa: // M2

-		ERROR_LOG(DSPLLE, "M2");

+		//ERROR_LOG(DSPLLE, "M2");

 		break;

 		// FIXME: Both of these appear in the beginning of the Wind Waker

 	case 0xb: // M0

-		ERROR_LOG(DSPLLE, "M0");

+		//ERROR_LOG(DSPLLE, "M0");

 		break;

 

 	// 15-bit precision? clamping? no idea :(

 	// CLR15 seems to be the default.

 	case 0xc: // CLR15

-		ERROR_LOG(DSPLLE, "CLR15");

+		//ERROR_LOG(DSPLLE, "CLR15");

 		break;

 	case 0xd: // SET15

-		ERROR_LOG(DSPLLE, "SET15");

+		//ERROR_LOG(DSPLLE, "SET15");

 		break;

 

 	// 40-bit precision? clamping? no idea :(

 	// 40 seems to be the default.

 	case 0xe: // SET40  (really, clear SR's 0x4000?) something about "set 40-bit operation"?

 		g_dsp.r[DSP_REG_SR] &= ~(1 << 14);

-		ERROR_LOG(DSPLLE, "SET40");

+		//ERROR_LOG(DSPLLE, "SET40");

 		break;

 

 	case 0xf: // SET16  (really, set SR's 0x4000?) something about "set 16-bit operation"?

 		// that doesnt happen on a real console  << what does this comment mean?

 		g_dsp.r[DSP_REG_SR] |= (1 << 14);

-		ERROR_LOG(DSPLLE, "SET16");

+		//ERROR_LOG(DSPLLE, "SET16");

 		break;

 

 	default:

diff --git a/Source/Plugins/Plugin_DSP_LLE-testing/Src/DSPInterpreter.h b/Source/Plugins/Plugin_DSP_LLE-testing/Src/DSPInterpreter.h
index af2dfba3ae..d8e8c359e4 100644
--- a/Source/Plugins/Plugin_DSP_LLE-testing/Src/DSPInterpreter.h
+++ b/Source/Plugins/Plugin_DSP_LLE-testing/Src/DSPInterpreter.h
@@ -136,7 +136,7 @@ void srbith(const UDSPInstruction& opc);
 // END OF FIXMEs

 

 // TODO: PENDING IMPLEMENTATION / UNIMPLEMENTED

-

+ void tstaxl(const UDSPInstruction& opc);

 // The mysterious a100

 

 // END OF UNIMPLEMENTED

diff --git a/Source/Plugins/Plugin_DSP_LLE-testing/Src/DSPTables.cpp b/Source/Plugins/Plugin_DSP_LLE-testing/Src/DSPTables.cpp
index 3e535b3490..fd68d23f34 100644
--- a/Source/Plugins/Plugin_DSP_LLE-testing/Src/DSPTables.cpp
+++ b/Source/Plugins/Plugin_DSP_LLE-testing/Src/DSPTables.cpp
@@ -232,6 +232,9 @@ DSPOPCTemplate opcodes[] =
 

 	{"TST",		0xb100, 0xf7ff, DSPInterpreter::tst,   nop, 1 | P_EXT, 1, {{P_ACCM, 1, 0, 11, 0x0800}}, dsp_op_ext_ops_pro, dsp_op_ext_ops_epi},

 

+	// GUESSING NOT SURE AT ALL!!!!

+	{"TSTAXL",  0xa100, 0xfeff, DSPInterpreter::tstaxl, nop, 1 | P_EXT, 1, {{P_REG1A, 1, 0, 8, 0x0100}}, dsp_op_ext_ops_pro, dsp_op_ext_ops_epi},

+

 	{"TSTAXH",  0x8600, 0xfeff, DSPInterpreter::tstaxh, nop, 1 | P_EXT, 1, {{P_REG1A, 1, 0, 8, 0x0100}}, dsp_op_ext_ops_pro, dsp_op_ext_ops_epi},

 

 	{"CMP",		0x8200, 0xffff, DSPInterpreter::cmp,    nop, 1 | P_EXT, 0, {}, dsp_op_ext_ops_pro, dsp_op_ext_ops_epi},

@@ -266,7 +269,6 @@ DSPOPCTemplate opcodes[] =
 	{"ORC",		0x3E00, 0xfeff, nop, nop, 1 | P_EXT, 1, {{P_ACCM, 1, 0, 8, 0x0100}}, dsp_op_ext_ops_pro, dsp_op_ext_ops_epi}, // Hermes doesn't list this

 

 	{"MULX",    0xa000, 0xe7ff, DSPInterpreter::mulx,    nop, 1 | P_EXT, 2, {{P_REGM18, 1, 0, 11, 0x1000}, {P_REGM19, 1, 0, 10, 0x0800}}, dsp_op_ext_ops_pro, dsp_op_ext_ops_epi},

-	// {"MULX???",     0xa100, 0xf7ff, DSPInterpreter::unknown,nop, 1 | P_EXT, 1, {{P_ACCM, 1, 0, 11, 0x0800}}, dsp_op_ext_ops_pro, dsp_op_ext_ops_epi},

 	{"MULXMVZ", 0xa200, 0xe6ff, DSPInterpreter::mulxmvz, nop, 1 | P_EXT, 3, {{P_REGM18, 1, 0, 11, 0x1000}, {P_REGM19, 1, 0, 10, 0x0800}, {P_ACCM, 1, 0, 8, 0x0100}}, dsp_op_ext_ops_pro, dsp_op_ext_ops_epi},

 	{"MULXAC",  0xa400, 0xe6ff, DSPInterpreter::mulxac,  nop, 1 | P_EXT, 3, {{P_REGM18, 1, 0, 11, 0x1000}, {P_REGM19, 1, 0, 10, 0x0800}, {P_ACCM, 1, 0, 8, 0x0100}}, dsp_op_ext_ops_pro, dsp_op_ext_ops_epi},

 	{"MULXMV",  0xa600, 0xe6ff, DSPInterpreter::mulxmv,  nop, 1 | P_EXT, 3, {{P_REGM18, 1, 0, 11, 0x1000}, {P_REGM19, 1, 0, 10, 0x0800}, {P_ACCM, 1, 0, 8, 0x0100}}, dsp_op_ext_ops_pro, dsp_op_ext_ops_epi},

diff --git a/Source/Plugins/Plugin_DSP_LLE-testing/Src/gdsp_condition_codes.cpp b/Source/Plugins/Plugin_DSP_LLE-testing/Src/gdsp_condition_codes.cpp
index 2c8aa3f262..65b82caf8b 100644
--- a/Source/Plugins/Plugin_DSP_LLE-testing/Src/gdsp_condition_codes.cpp
+++ b/Source/Plugins/Plugin_DSP_LLE-testing/Src/gdsp_condition_codes.cpp
@@ -120,7 +120,7 @@ bool CheckCondition(u8 _Condition)
 		break;

 

 	case 0x6: // L - LESS

-		if ((g_dsp.r[DSP_REG_SR] & 0x02) || (g_dsp.r[DSP_REG_SR] & 0x08))

+		if (!(g_dsp.r[DSP_REG_SR] & 0x02) && (g_dsp.r[DSP_REG_SR] & 0x08))

 			taken = true;

 		break;