DSPSpy: Extract the dsp-interfacing code into a class. Fix colors - that new dark red was almost unreadable. Fix the size of a data cache flush.

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

Source/DSPSpy/DSPSpy.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="DSPSpy"
 	ProjectGUID="{3877AA3E-9CC0-4ADF-8E71-272EE4443478}"
 	RootNamespace="DSPSpy"
@@ -122,6 +122,10 @@
 			RelativePath=".\ConsoleHelper.h"
 			>
 		</File>
+		<File
+			RelativePath=".\dsp_interface.h"
+			>
+		</File>
 		<File
 			RelativePath=".\main_spy.cpp"
 			>
@@ -134,6 +138,14 @@
 			RelativePath=".\mem_dump.h"
 			>
 		</File>
+		<File
+			RelativePath=".\real_dsp.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\real_dsp.h"
+			>
+		</File>
 		<File
 			RelativePath=".\Stubs.cpp"
 			>

Source/DSPSpy/dsp_interface.cpp

@@ -0,0 +1,43 @@
+// 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/
+
+#include "dsp_interface.h"
+
+void IDSP::SendTask(void *addr, u16 iram_addr, u16 len, u16 start)
+{
+	while (CheckMailTo());
+	SendMailTo(0x80F3A001);
+	while (CheckMailTo());
+	SendMailTo((u32)addr);
+	while (CheckMailTo());
+	SendMailTo(0x80F3C002);
+	while (CheckMailTo());
+	SendMailTo(iram_addr);
+	while (CheckMailTo());
+	SendMailTo(0x80F3A002);
+	while (CheckMailTo());
+	SendMailTo(len);
+	while (CheckMailTo());
+	SendMailTo(0x80F3B002);
+	while (CheckMailTo());
+	SendMailTo(0);
+	while (CheckMailTo());
+	SendMailTo(0x80F3D001);
+	while (CheckMailTo());
+	SendMailTo(start);
+	while (CheckMailTo());
+}

Source/DSPSpy/dsp_interface.h

@@ -0,0 +1,50 @@
+// 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/
+
+#ifndef _DSP_INTERFACE_H
+#define _DSP_INTERFACE_H
+
+#include <gccore.h>
+
+// DSPCR bits
+#define DSPCR_DSPRESET      0x0800        // Reset DSP
+#define DSPCR_ARDMA         0x0200        // ARAM dma in progress, if set
+#define DSPCR_DSPINTMSK     0x0100        // * interrupt mask   (RW)
+#define DSPCR_DSPINT        0x0080        // * interrupt active (RWC)
+#define DSPCR_ARINTMSK      0x0040
+#define DSPCR_ARINT         0x0020
+#define DSPCR_AIINTMSK      0x0010
+#define DSPCR_AIINT         0x0008
+#define DSPCR_HALT          0x0004        // halt DSP
+#define DSPCR_PIINT         0x0002        // assert DSP PI interrupt
+#define DSPCR_RES           0x0001        // reset DSP
+
+class IDSP {
+public:
+	virtual ~IDSP() {}
+	
+	virtual void Init() = 0;
+	virtual void Reset() = 0;
+	virtual u32 CheckMailTo() = 0;
+	virtual void SendMailTo(u32 mail) = 0;
+
+	// Yeah, yeah, having a method here makes this not a pure interface - but
+	// the implementation does nothing but calling the virtual methods above.
+	void SendTask(void *addr, u16 iram_addr, u16 len, u16 start);
+};
+
+#endif  // _DSP_INTERFACE_H

Source/DSPSpy/main_spy.cpp

@@ -20,7 +20,7 @@
 // ops actually do.
 // It's very unpolished though
 // Use Dolphin's dsptool to generate a new dsp_code.h.
-// Originally written by duddie and modified by FIRES.
+// Originally written by duddie and modified by FIRES. Then further modified by ector.
 
 #include <gccore.h>
 #include <malloc.h>
@@ -32,12 +32,10 @@
 #include <time.h>
 #include <fat.h>
 #include <fcntl.h>
+
 #include <ogc/color.h>
 #include <ogc/consol.h>
-#include <ogc/dsp.h>
+
-#include <ogc/irq.h>
-#include <ogc/machine/asm.h>
-#include <ogc/machine/processor.h>
 #ifdef HW_RVL
 #include <wiiuse/wpad.h>
 #endif
@@ -51,24 +49,16 @@
 #include "dsp_code.h"
 #include "mem_dump.h"
 
-// DSPCR bits
+// Communication with the real DSP and with the DSP emulator.
-#define DSPCR_DSPRESET      0x0800        // Reset DSP
+#include "dsp_interface.h"
-#define DSPCR_ARDMA         0x0200        // ARAM dma in progress, if set
+#include "real_dsp.h"
-#define DSPCR_DSPINTMSK     0x0100        // * interrupt mask   (RW)
+// #include "virtual_dsp.h"
-#define DSPCR_DSPINT        0x0080        // * interrupt active (RWC)
-#define DSPCR_ARINTMSK      0x0040
-#define DSPCR_ARINT         0x0020
-#define DSPCR_AIINTMSK      0x0010
-#define DSPCR_AIINT         0x0008
-#define DSPCR_HALT          0x0004        // halt DSP
-#define DSPCR_PIINT         0x0002        // assert DSP PI interrupt
-#define DSPCR_RES           0x0001        // reset DSP
 
 // Used for communications with the DSP, such as dumping registers etc.
 u16 dspbuffer[16 * 1024] __attribute__ ((aligned (0x4000))); 
 
 static void *xfb = NULL;
-void (*reload)() = (void(*)())0x80001800;
+void (*reboot)() = (void(*)())0x80001800;
 GXRModeObj *rmode;
 
 static vu16* const _dspReg = (u16*)0xCC005000;
@@ -104,14 +94,13 @@ u16 dspreg_in[32] = {
 0x0000, 0x0000, 0x0000, 0xde6d, 0x0000, 0x0000, 0x0000, 0x004e,
 };*/ 
 
-
-
 u16 dspreg_out[1000][32];
 
 u32 padding[1024];
 
 // UI (interactive register editing)
 u32 ui_mode;
+
 #define UIM_SEL			1
 #define UIM_EDIT_REG	2
 #define	UIM_EDIT_BIN	4
@@ -125,17 +114,7 @@ u16 *reg_value;
 
 char last_message[20] = "OK";
 
-// Got regs to draw. Dunno why we need this.
+RealDSP real_dsp;
-volatile int regs_refreshed = false;
-
-
-// Handler for DSP interrupt.
-static void my__dsp_handler(u32 nIrq, void *pCtx)
-{
-	// Acknowledge interrupt?
-	_dspReg[5] = (_dspReg[5] & ~(DSPCR_AIINT|DSPCR_ARINT)) | DSPCR_DSPINT;
-}
-
 
 // When comparing regs, ignore the loop stack registers.
 bool regs_equal(int reg, u16 value1, u16 value2) {
@@ -153,11 +132,11 @@ void print_reg_block(int x, int y, int sel, const u16 *regs, const u16 *compare_
 		{
 			// Do not even display the loop stack registers.
 			const int reg = j * 8 + i;
-			CON_SetColor(sel == reg ? CON_YELLOW : CON_GREEN, CON_BLACK);
+			CON_SetColor(sel == reg ? CON_BRIGHT_YELLOW : CON_GREEN, CON_BLACK);
 			CON_Printf(x + j * 8, i + y, "%02x ", reg);
 			if (j != 1 || i < 4)
 			{
-				u8 color1 = regs_equal(reg, regs[reg], compare_regs[reg]) ? CON_WHITE : CON_RED;
+				u8 color1 = regs_equal(reg, regs[reg], compare_regs[reg]) ? CON_BRIGHT_WHITE : CON_BRIGHT_RED;
 				for (int k = 0; k < 4; k++)
 				{
 					if (sel == reg && k == small_cursor_x && ui_mode == UIM_EDIT_REG)
@@ -314,30 +293,6 @@ void init_video(void)
 	VIDEO_WaitVSync();
 }
 
-void my_send_task(void *addr, u16 iram_addr, u16 len, u16 start)
-{
-	while(DSP_CheckMailTo());
-	DSP_SendMailTo(0x80F3A001);
-	while(DSP_CheckMailTo());
-	DSP_SendMailTo((u32)addr);
-	while(DSP_CheckMailTo());
-	DSP_SendMailTo(0x80F3C002);
-	while(DSP_CheckMailTo());
-	DSP_SendMailTo(iram_addr);
-	while(DSP_CheckMailTo());
-	DSP_SendMailTo(0x80F3A002);
-	while(DSP_CheckMailTo());
-	DSP_SendMailTo(len);
-	while(DSP_CheckMailTo());
-	DSP_SendMailTo(0x80F3B002);
-	while(DSP_CheckMailTo());
-	DSP_SendMailTo(0);
-	while(DSP_CheckMailTo());
-	DSP_SendMailTo(0x80F3D001);
-	while(DSP_CheckMailTo());
-	DSP_SendMailTo(start);
-	while(DSP_CheckMailTo());
-}
 
 int main()
 {
@@ -354,14 +309,8 @@ int main()
 	for (int j = 0; j < 0x800; j++)
 		dspbufU[j] = 0xffffffff;
 
-	_dspReg[5] = (_dspReg[5] & ~(DSPCR_AIINT|DSPCR_ARINT|DSPCR_DSPINT)) | DSPCR_DSPRESET;
+	// Initialize DSP.
-	_dspReg[5] = (_dspReg[5] & ~(DSPCR_HALT|DSPCR_AIINT|DSPCR_ARINT|DSPCR_DSPINT));
+	real_dsp.Init();
-
-	// This code looks odd - shouldn't we initialize level?
-	u32 level;
-	_CPU_ISR_Disable(level);
-	IRQ_Request(IRQ_DSP_DSP, my__dsp_handler, NULL);
-	_CPU_ISR_Restore(level);
 
 	// Initialize FAT so we can write to SD.
 	fatInit(8, false);
@@ -390,8 +339,8 @@ int main()
 					dspbufC[0x00 + n] = dspreg_in[n];
 				DCFlushRange(dspbufC, 0x2000);
 				// Then send the code.
-				DCFlushRange((void *)dsp_code, 0x1000);
+				DCFlushRange((void *)dsp_code, 0x2000);
-				my_send_task((void *)MEM_VIRTUAL_TO_PHYSICAL(dsp_code), 0, 4000, 0x10);
+				real_dsp.SendTask((void *)MEM_VIRTUAL_TO_PHYSICAL(dsp_code), 0, 4000, 0x10);
 			}
 			else if (mail == 0x8888dead)
 			{
@@ -400,14 +349,12 @@ int main()
 				while (DSP_CheckMailTo());
 				DSP_SendMailTo((u32)tmpBuf);
 				while (DSP_CheckMailTo());
-				regs_refreshed = false;
 			}			
 			else if (mail == 0x8888beef)
 			{
 				while (DSP_CheckMailTo());
 				DSP_SendMailTo((u32)dspbufP);
 				while (DSP_CheckMailTo());
-				regs_refreshed = false;
 			}
 			else if (mail == 0x8888feeb)
 			{
@@ -415,7 +362,6 @@ int main()
 				DCInvalidateRange(dspbufC, 0x2000);
 				for (int i = 0 ; i < 32 ; i++)
 					dspreg_out[dsp_steps][i] = dspbufC[0xf80 + i];
-				regs_refreshed = true;
 
 				dsp_steps++;
 
@@ -427,8 +373,10 @@ int main()
 
 		VIDEO_WaitVSync();
 
-#ifdef HW_RVL
 		PAD_ScanPads();
+		if (PAD_ButtonsDown(0) & PAD_BUTTON_START)
+			exit(0);
+#ifdef HW_RVL
 		WPAD_ScanPads();
 		if ((WPAD_ButtonsDown(0) & WPAD_BUTTON_HOME) || (PAD_ButtonsDown(0) & PAD_BUTTON_START))
 			exit(0);
@@ -439,10 +387,6 @@ int main()
 		CON_Printf(4, 21, "Home to exit");
 		CON_Printf(4, 22, "2 to dump results to SD");
 #else
-		PAD_ScanPads();
-		if (PAD_ButtonsDown(0) & PAD_BUTTON_START)
-			exit(0);
-
 		CON_Printf(2, 18, "Controls:");
 		CON_Printf(4, 19, "L/R to move");
 		CON_Printf(4, 20, "B to start over");
@@ -486,12 +430,7 @@ int main()
 			DCFlushRange(dspbufC, 0x2000);
 
 			// Reset the DSP.
-			_dspReg[5] = (_dspReg[5] & ~(DSPCR_AIINT|DSPCR_ARINT|DSPCR_DSPINT)) | DSPCR_DSPRESET;
+			real_dsp.Reset();
-			_dspReg[5] = (_dspReg[5] & ~(DSPCR_HALT|DSPCR_AIINT|DSPCR_ARINT|DSPCR_DSPINT));
-			_dspReg[5] |= DSPCR_RES;
-			while (_dspReg[5] & DSPCR_RES)
-				;
-			_dspReg[9] = 0x63;
 			strcpy(last_message, "OK");
 		}
 
@@ -543,11 +482,12 @@ int main()
 	}
 
 	// Reset the DSP
-	_dspReg[5] = (_dspReg[5]&~(DSPCR_AIINT|DSPCR_ARINT|DSPCR_DSPINT))|DSPCR_DSPRESET;
+	real_dsp.Reset();
-	_dspReg[5] = (_dspReg[5]&~(DSPCR_HALT|DSPCR_AIINT|DSPCR_ARINT|DSPCR_DSPINT));
-	reload();
 
-	// Exit
+	// Reboot back to Homebrew Channel or whatever started this binary.
+	reboot();
+
+	// Will never reach here, but just to be sure..
 	exit(0);
 	return 0;
 }

Source/DSPSpy/real_dsp.cpp

@@ -0,0 +1,68 @@
+// 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/
+
+#include <gccore.h>
+#include <ogcsys.h>
+#include <ogc/dsp.h>
+#include <ogc/irq.h>
+#include <ogc/machine/asm.h>
+#include <ogc/machine/processor.h>
+
+#include "dsp_interface.h"
+#include "real_dsp.h"
+
+static vu16* const _dspReg = (u16*)0xCC005000;
+
+// Handler for DSP interrupt.
+static void dsp_irq_handler(u32 nIrq, void *pCtx)
+{
+	// Acknowledge interrupt?
+	_dspReg[5] = (_dspReg[5] & ~(DSPCR_AIINT|DSPCR_ARINT)) | DSPCR_DSPINT;
+}
+
+void RealDSP::Init()
+{
+	_dspReg[5] = (_dspReg[5] & ~(DSPCR_AIINT|DSPCR_ARINT|DSPCR_DSPINT)) | DSPCR_DSPRESET;
+	_dspReg[5] = (_dspReg[5] & ~(DSPCR_HALT|DSPCR_AIINT|DSPCR_ARINT|DSPCR_DSPINT));
+
+	// This code looks odd - shouldn't we initialize level?
+	u32 level;
+	_CPU_ISR_Disable(level);
+	IRQ_Request(IRQ_DSP_DSP, dsp_irq_handler, NULL);
+	_CPU_ISR_Restore(level);
+}
+
+void RealDSP::Reset()
+{
+	// Reset the DSP.
+	_dspReg[5] = (_dspReg[5] & ~(DSPCR_AIINT|DSPCR_ARINT|DSPCR_DSPINT)) | DSPCR_DSPRESET;
+	_dspReg[5] = (_dspReg[5] & ~(DSPCR_HALT|DSPCR_AIINT|DSPCR_ARINT|DSPCR_DSPINT));
+	_dspReg[5] |= DSPCR_RES;
+	while (_dspReg[5] & DSPCR_RES)
+		;
+	_dspReg[9] = 0x63;
+}
+
+u32 RealDSP::CheckMailTo()
+{
+	return DSP_CheckMailTo();
+}
+
+void RealDSP::SendMailTo(u32 mail)
+{
+	DSP_SendMailTo(mail);
+}

Source/DSPSpy/real_dsp.h

@@ -0,0 +1,31 @@
+// 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/
+
+#ifndef _REAL_DSP_H
+#define _REAL_DSP_H
+
+#include "dsp_interface.h"
+
+class RealDSP : public IDSP {
+public:
+	virtual void Init();
+	virtual void Reset();
+	virtual u32 CheckMailTo();
+	virtual void SendMailTo(u32 mail);
+};
+
+#endif  // _REAL_DSP_H