1 files changed, 202 insertions, 202 deletions
diff --git a/Source/Core/DSPCore/Src/DspIntMisc.cpp b/Source/Core/DSPCore/Src/DspIntMisc.cpp
index df60210d98..3b9deee559 100644
--- a/Source/Core/DSPCore/Src/DspIntMisc.cpp
+++ b/Source/Core/DSPCore/Src/DspIntMisc.cpp
@@ -1,202 +1,202 @@
-// Copyright (C) 2003-2009 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-// Additional copyrights go to Duddie and Tratax (c) 2004
-
-
-#include "DSPInterpreter.h"
-
-#include "DSPCore.h"
-#include "DSPIntUtil.h"
-
-namespace DSPInterpreter {
-
-void unknown(const UDSPInstruction& opc)
-{
-	//_assert_msg_(MASTER_LOG, !g_dsp.exception_in_progress_hack, "assert while exception");
-	ERROR_LOG(DSPLLE, "LLE: Unrecognized opcode 0x%04x, pc 0x%04x", opc.hex, g_dsp.pc);
-}
-
-// MRR $D, $S
-// 0001 11dd ddds ssss
-// Move value from register $S to register $D.
-// FIXME: Perform additional operation depending on destination register.
-void mrr(const UDSPInstruction& opc)
-{
-	u8 sreg = opc.hex & 0x1f;
-	u8 dreg = (opc.hex >> 5) & 0x1f;
-
-	u16 val = dsp_op_read_reg(sreg);
-	dsp_op_write_reg(dreg, val);
-}
-
-// 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.
-
-// DSPSpy discovery: This, and possibly other instructions that load a register,
-// has a different behaviour in S40 mode if loaded to AC0.M: The value gets sign extended
-// to the whole accumulator! This does not happen in S16 mode.
-void lri(const UDSPInstruction& opc)
-{
-	u8 reg  = opc.hex & DSP_REG_MASK;
-	u16 imm = dsp_fetch_code();
-	dsp_op_write_reg(reg, imm);
-	dsp_conditional_extend_accum(reg);
-}
-
-// LRIS $(0x18+D), #I
-// 0000 1ddd iiii iiii
-// Load immediate value I (8-bit sign extended) to accumulator register. 
-// FIXME: Perform additional operation depending on destination register.
-void lris(const UDSPInstruction& opc)
-{
-	u8 reg  = ((opc.hex >> 8) & 0x7) + DSP_REG_AXL0;
-	u16 imm = (s8)opc.hex;
-	dsp_op_write_reg(reg, imm);
-	dsp_conditional_extend_accum(reg);
-}
-
-
-// TSTAXL $acR
-// 1000 r001 xxxx xxxx
-// r specifies one of the main accumulators.
-// Definitely not a test instruction - it changes the accums.
-// Not affected by m0/m2. Not affected by s16/s40.
-void tstaxl(const UDSPInstruction& opc)
-{
-	// This is probably all wrong.
-	//u8 reg  = (opc.hex >> 8) & 0x1;
-	//s16 val = dsp_get_ax_l(reg);
-	//Update_SR_Register16(val);
-}
-
-// ADDARN $arD, $ixS
-// 0000 0000 0001 ssdd
-// Adds indexing register $ixS to an addressing register $arD.
-void addarn(const UDSPInstruction& opc)
-{
-	u8 dreg = opc.hex & 0x3;
-	u8 sreg = (opc.hex >> 2) & 0x3;
-
-	// g_dsp.r[dreg] += (s16)g_dsp.r[DSP_REG_IX0 + sreg];
-
-	dsp_increase_addr_reg(dreg, (s16)g_dsp.r[DSP_REG_IX0 + sreg]);
-
-	// It is critical for the Zelda ucode that this one wraps correctly.
-}
-
-// NX
-// 1000 -000 xxxx xxxx
-// No operation, but can be extended with extended opcode.
-void nx(const UDSPInstruction& opc)
-{
-	// This opcode is supposed to do nothing - it's used if you want to use
-	// an opcode extension but not do anything. At least according to duddie.
-}
-
-//-------------------------------------------------------------
-// DAR $arD  ?
-// 0000 0000 0000 01dd
-// Decrement address register $arD.
-void dar(const UDSPInstruction& opc)
-{
-	dsp_decrement_addr_reg(opc.hex & 0x3);
-}
-
-// IAR $arD  ?
-// 0000 0000 0000 10dd
-// Increment address register $arD.
-void iar(const UDSPInstruction& opc)
-{
-	dsp_increment_addr_reg(opc.hex & 0x3);
-}
-
-// SBCLR #I
-// 0001 0011 0000 0iii
-// bit of status register $sr. Bit number is calculated by adding 6 to
-// immediate value I.
-void sbclr(const UDSPInstruction& opc)
-{
-	u8 bit = (opc.hex & 0xff) + 6;
-	g_dsp.r[DSP_REG_SR] &= ~(1 << bit);
-}
-
-// SBSET #I
-// 0001 0010 0000 0iii
-// Set bit of status register $sr. Bit number is calculated by adding 6 to
-// immediate value I.
-void sbset(const UDSPInstruction& opc)
-{
-	u8 bit = (opc.hex & 0xff) + 6;
-	g_dsp.r[DSP_REG_SR] |= (1 << bit);
-}
-
-
-// FIXME inside
-// This is a bunch of flag setters, flipping bits in SR. So far so good,
-// but it's harder to know exactly what effect they have.
-// M0/M2 change the multiplier mode (it can multiply by 2 for free).
-//
-// SET16 changes something very important: see the LRI instruction above.
-// Hermes' demo sets the following defaults:
-// SET40
-// CLR15
-// M0 
-void srbith(const UDSPInstruction& opc)
-{
-	switch ((opc.hex >> 8) & 0xf)
-	{
-	// M0 seems to be the default. M2 is used in functions in Zelda
-	// and then reset with M0 at the end. Like the other bits here, it's
-	// done around loops with lots of multiplications.
-	// I've confirmed with DSPSpy that they flip this bit.
-	case 0xa:  // M2
-		g_dsp.r[DSP_REG_SR] &= ~SR_MUL_MODIFY;
-		break;
-	case 0xb:  // M0
-		g_dsp.r[DSP_REG_SR] |= SR_MUL_MODIFY;
-		break;
-
-	// If set, treat multiplicands as unsigned.
-	// If clear, treat them as signed.
-	case 0xc:  // CLR15
-		g_dsp.r[DSP_REG_SR] &= ~SR_MUL_UNSIGNED;
-		break;
-	case 0xd:  // SET15
-		g_dsp.r[DSP_REG_SR] |= SR_MUL_UNSIGNED;
-		break;
-
-	// Automatic 40-bit sign extension when loading ACx.M.
-	// 40 seems to be the default.
-	// Confirmed these by using DSPSpy and copying the value of SR to R00 after setting.
-	case 0xe:  // SET16  (really, clear SR's 0x4000) 
-		g_dsp.r[DSP_REG_SR] &= ~SR_40_MODE_BIT;
-		break;
-
-	case 0xf:  // SET40  (really, set SR's 0x4000) 
-		g_dsp.r[DSP_REG_SR] |= SR_40_MODE_BIT;
-		break;
-
-	default:
-		break;
-	}
-}
-
-}  // namespace
+// Copyright (C) 2003-2009 Dolphin Project.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 2.0.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official SVN repository and contact information can be found at
+// http://code.google.com/p/dolphin-emu/
+
+// Additional copyrights go to Duddie and Tratax (c) 2004
+
+
+#include "DSPInterpreter.h"
+
+#include "DSPCore.h"
+#include "DSPIntUtil.h"
+
+namespace DSPInterpreter {
+
+void unknown(const UDSPInstruction& opc)
+{
+	//_assert_msg_(MASTER_LOG, !g_dsp.exception_in_progress_hack, "assert while exception");
+	ERROR_LOG(DSPLLE, "LLE: Unrecognized opcode 0x%04x, pc 0x%04x", opc.hex, g_dsp.pc);
+}
+
+// MRR $D, $S
+// 0001 11dd ddds ssss
+// Move value from register $S to register $D.
+// FIXME: Perform additional operation depending on destination register.
+void mrr(const UDSPInstruction& opc)
+{
+	u8 sreg = opc.hex & 0x1f;
+	u8 dreg = (opc.hex >> 5) & 0x1f;
+
+	u16 val = dsp_op_read_reg(sreg);
+	dsp_op_write_reg(dreg, val);
+}
+
+// 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.
+
+// DSPSpy discovery: This, and possibly other instructions that load a register,
+// has a different behaviour in S40 mode if loaded to AC0.M: The value gets sign extended
+// to the whole accumulator! This does not happen in S16 mode.
+void lri(const UDSPInstruction& opc)
+{
+	u8 reg  = opc.hex & DSP_REG_MASK;
+	u16 imm = dsp_fetch_code();
+	dsp_op_write_reg(reg, imm);
+	dsp_conditional_extend_accum(reg);
+}
+
+// LRIS $(0x18+D), #I
+// 0000 1ddd iiii iiii
+// Load immediate value I (8-bit sign extended) to accumulator register. 
+// FIXME: Perform additional operation depending on destination register.
+void lris(const UDSPInstruction& opc)
+{
+	u8 reg  = ((opc.hex >> 8) & 0x7) + DSP_REG_AXL0;
+	u16 imm = (s8)opc.hex;
+	dsp_op_write_reg(reg, imm);
+	dsp_conditional_extend_accum(reg);
+}
+
+
+// TSTAXL $acR
+// 1000 r001 xxxx xxxx
+// r specifies one of the main accumulators.
+// Definitely not a test instruction - it changes the accums.
+// Not affected by m0/m2. Not affected by s16/s40.
+void tstaxl(const UDSPInstruction& opc)
+{
+	// This is probably all wrong.
+	//u8 reg  = (opc.hex >> 8) & 0x1;
+	//s16 val = dsp_get_ax_l(reg);
+	//Update_SR_Register16(val);
+}
+
+// ADDARN $arD, $ixS
+// 0000 0000 0001 ssdd
+// Adds indexing register $ixS to an addressing register $arD.
+void addarn(const UDSPInstruction& opc)
+{
+	u8 dreg = opc.hex & 0x3;
+	u8 sreg = (opc.hex >> 2) & 0x3;
+
+	// g_dsp.r[dreg] += (s16)g_dsp.r[DSP_REG_IX0 + sreg];
+
+	dsp_increase_addr_reg(dreg, (s16)g_dsp.r[DSP_REG_IX0 + sreg]);
+
+	// It is critical for the Zelda ucode that this one wraps correctly.
+}
+
+// NX
+// 1000 -000 xxxx xxxx
+// No operation, but can be extended with extended opcode.
+void nx(const UDSPInstruction& opc)
+{
+	// This opcode is supposed to do nothing - it's used if you want to use
+	// an opcode extension but not do anything. At least according to duddie.
+}
+
+//-------------------------------------------------------------
+// DAR $arD  ?
+// 0000 0000 0000 01dd
+// Decrement address register $arD.
+void dar(const UDSPInstruction& opc)
+{
+	dsp_decrement_addr_reg(opc.hex & 0x3);
+}
+
+// IAR $arD  ?
+// 0000 0000 0000 10dd
+// Increment address register $arD.
+void iar(const UDSPInstruction& opc)
+{
+	dsp_increment_addr_reg(opc.hex & 0x3);
+}
+
+// SBCLR #I
+// 0001 0011 0000 0iii
+// bit of status register $sr. Bit number is calculated by adding 6 to
+// immediate value I.
+void sbclr(const UDSPInstruction& opc)
+{
+	u8 bit = (opc.hex & 0xff) + 6;
+	g_dsp.r[DSP_REG_SR] &= ~(1 << bit);
+}
+
+// SBSET #I
+// 0001 0010 0000 0iii
+// Set bit of status register $sr. Bit number is calculated by adding 6 to
+// immediate value I.
+void sbset(const UDSPInstruction& opc)
+{
+	u8 bit = (opc.hex & 0xff) + 6;
+	g_dsp.r[DSP_REG_SR] |= (1 << bit);
+}
+
+
+// FIXME inside
+// This is a bunch of flag setters, flipping bits in SR. So far so good,
+// but it's harder to know exactly what effect they have.
+// M0/M2 change the multiplier mode (it can multiply by 2 for free).
+//
+// SET16 changes something very important: see the LRI instruction above.
+// Hermes' demo sets the following defaults:
+// SET40
+// CLR15
+// M0 
+void srbith(const UDSPInstruction& opc)
+{
+	switch ((opc.hex >> 8) & 0xf)
+	{
+	// M0 seems to be the default. M2 is used in functions in Zelda
+	// and then reset with M0 at the end. Like the other bits here, it's
+	// done around loops with lots of multiplications.
+	// I've confirmed with DSPSpy that they flip this bit.
+	case 0xa:  // M2
+		g_dsp.r[DSP_REG_SR] &= ~SR_MUL_MODIFY;
+		break;
+	case 0xb:  // M0
+		g_dsp.r[DSP_REG_SR] |= SR_MUL_MODIFY;
+		break;
+
+	// If set, treat multiplicands as unsigned.
+	// If clear, treat them as signed.
+	case 0xc:  // CLR15
+		g_dsp.r[DSP_REG_SR] &= ~SR_MUL_UNSIGNED;
+		break;
+	case 0xd:  // SET15
+		g_dsp.r[DSP_REG_SR] |= SR_MUL_UNSIGNED;
+		break;
+
+	// Automatic 40-bit sign extension when loading ACx.M.
+	// 40 seems to be the default.
+	// Confirmed these by using DSPSpy and copying the value of SR to R00 after setting.
+	case 0xe:  // SET16  (really, clear SR's 0x4000) 
+		g_dsp.r[DSP_REG_SR] &= ~SR_40_MODE_BIT;
+		break;
+
+	case 0xf:  // SET40  (really, set SR's 0x4000) 
+		g_dsp.r[DSP_REG_SR] |= SR_40_MODE_BIT;
+		break;
+
+	default:
+		break;
+	}
+}
+
+}  // namespace