dspspy working again

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

4 files changed, 71 insertions, 2 deletions

diff --git a/Source/DSPSpy/DSPSpy.vcproj b/Source/DSPSpy/DSPSpy.vcproj
index af38eb5a73..0d1aa47e8b 100644
--- a/Source/DSPSpy/DSPSpy.vcproj
+++ b/Source/DSPSpy/DSPSpy.vcproj
@@ -231,6 +231,10 @@
 			>
 		</File>
 		<File
+			RelativePath=".\dspregs.h"
+			>
+		</File>
+		<File
 			RelativePath=".\main_spy.cpp"
 			>
 		</File>
diff --git a/Source/DSPSpy/Stubs.cpp b/Source/DSPSpy/Stubs.cpp
index b9cba53042..37e97fab66 100644
--- a/Source/DSPSpy/Stubs.cpp
+++ b/Source/DSPSpy/Stubs.cpp
@@ -17,6 +17,7 @@
 
 // Stubs to make DSPCore compile as part of DSPSpy.
 
+/*
 #include <stdlib.h>
 #include <stdio.h>
 
@@ -117,3 +118,5 @@ bool ReadFileToString(bool text_file, const char *filename, std::string &str)
 }
 
 }
+
+*/
\ No newline at end of file
diff --git a/Source/DSPSpy/dspregs.h b/Source/DSPSpy/dspregs.h
new file mode 100644
index 0000000000..a5f1d2c473
--- /dev/null
+++ b/Source/DSPSpy/dspregs.h
@@ -0,0 +1,63 @@
+// Copyright (C) 2003 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 _DSPREGS_H
+#define _DSPREGS_H
+#endif
+
+#define DSP_REG_AR0		0x00 // address registers
+#define DSP_REG_AR1		0x01
+#define DSP_REG_AR2		0x02
+#define DSP_REG_AR3		0x03
+
+#define DSP_REG_IX0		0x04 // indexing registers (actually, mostly used as increments)
+#define DSP_REG_IX1		0x05
+#define DSP_REG_IX2		0x06
+#define DSP_REG_IX3		0x07
+
+#define DSP_REG_WR0		0x08 // address wrapping registers. should be initialized to 0xFFFF if not used.
+#define DSP_REG_WR1		0x09
+#define DSP_REG_WR2		0x0a
+#define DSP_REG_WR3		0x0b
+
+#define DSP_REG_ST0		0x0c // stacks.
+#define DSP_REG_ST1		0x0d
+#define DSP_REG_ST2		0x0e
+#define DSP_REG_ST3		0x0f
+
+#define DSP_REG_CR		0x12 // Seems to be the top 8 bits of LRS/SRS.
+#define DSP_REG_SR		0x13
+
+#define DSP_REG_PRODL	0x14 // product.
+#define DSP_REG_PRODM	0x15
+#define DSP_REG_PRODH	0x16
+#define DSP_REG_PRODM2	0x17
+
+#define DSP_REG_AXL0	0x18
+#define DSP_REG_AXL1	0x19
+#define DSP_REG_AXH0	0x1a
+#define DSP_REG_AXH1	0x1b
+
+#define DSP_REG_ACC0	0x1c // accumulator (global)
+#define DSP_REG_ACC1	0x1d
+
+#define DSP_REG_ACL0	0x1c // Low accumulator
+#define DSP_REG_ACL1	0x1d
+#define DSP_REG_ACM0	0x1e // Mid accumulator
+#define DSP_REG_ACM1	0x1f
+#define DSP_REG_ACH0	0x10 // Sign extended 8 bit register 0
+#define DSP_REG_ACH1	0x11 // Sign extended 8 bit register 1
\ No newline at end of file
diff --git a/Source/DSPSpy/main_spy.cpp b/Source/DSPSpy/main_spy.cpp
index 80221ec9ce..aba2007852 100644
--- a/Source/DSPSpy/main_spy.cpp
+++ b/Source/DSPSpy/main_spy.cpp
@@ -50,8 +50,7 @@
 
 #include "ConsoleHelper.h"
 
-// Pull in some constants etc from DSPCore.
-#include "../Core/DSPCore/Src/DSPCore.h"
+#include "dspregs.h"
 
 // This is where the DSP binary is.
 #include "dsp_code.h"