From eaa3bbf8b78e2329b6ad8e27c2d497aec27771df Mon Sep 17 00:00:00 2001
From: Nik Henson <nik-m3@diablo-designs.co.uk>
Date: Wed, 21 Sep 2011 23:47:11 +0000
Subject: [PATCH] Changes to get debugger classes to compile under Linux

---
 Makefiles/Makefile.SDL.UNIX.GCC |  3 ++-
 Src/Debugger/AddressTable.cpp   |  1 +
 Src/Debugger/CPU/PPCDebug.cpp   | 20 ++++++++++----------
 Src/Debugger/CPU/PPCDebug.h     |  9 ---------
 Src/Debugger/Debugger.h         |  8 ++++----
 Src/Model3/DriveBoard.cpp       |  1 +
 6 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/Makefiles/Makefile.SDL.UNIX.GCC b/Makefiles/Makefile.SDL.UNIX.GCC
index 7aaf61b..694a5ed 100644
--- a/Makefiles/Makefile.SDL.UNIX.GCC
+++ b/Makefiles/Makefile.SDL.UNIX.GCC
@@ -107,9 +107,10 @@ ifeq ($(strip $(ENABLE_DEBUGGER)),yes)
 	OBJ += $(OBJ_DIR)/Debugger.o $(OBJ_DIR)/ConsoleDebugger.o $(OBJ_DIR)/SupermodelDebugger.o $(OBJ_DIR)/CPUDebug.o \
 		$(OBJ_DIR)/AddressTable.o $(OBJ_DIR)/Breakpoint.o $(OBJ_DIR)/CodeAnalyser.o $(OBJ_DIR)/Exception.o \
 		$(OBJ_DIR)/Interrupt.o $(OBJ_DIR)/IO.o $(OBJ_DIR)/Label.o $(OBJ_DIR)/Register.o $(OBJ_DIR)/Watch.o \
-		$(OBJ_DIR)/PPCDebug.o		
+		$(OBJ_DIR)/PPCDebug.o $(OBJ_DIR)/68KDebug.o $(OBJ_DIR)/Musashi68KDebug.o $(OBJ_DIR)/Z80Debug.o		
 endif
 
+
 #
 # Targets
 #
diff --git a/Src/Debugger/AddressTable.cpp b/Src/Debugger/AddressTable.cpp
index 588eb56..fb46163 100644
--- a/Src/Debugger/AddressTable.cpp
+++ b/Src/Debugger/AddressTable.cpp
@@ -27,6 +27,7 @@
 
 #include "AddressTable.h"
 
+#include <cstring>
 #include <string>
 
 namespace Debugger
diff --git a/Src/Debugger/CPU/PPCDebug.cpp b/Src/Debugger/CPU/PPCDebug.cpp
index 1192b8b..d3f11ec 100644
--- a/Src/Debugger/CPU/PPCDebug.cpp
+++ b/Src/Debugger/CPU/PPCDebug.cpp
@@ -42,7 +42,7 @@
 
 namespace Debugger
 {
-	UINT32 GetSpecialReg(CCPUDebug *cpu, unsigned id) 
+	static UINT32 GetSpecialReg(CCPUDebug *cpu, unsigned id) 
 	{
 		switch (id)
 		{
@@ -52,7 +52,7 @@ namespace Debugger
 		}
 	}
 
-	bool SetSpecialReg(CCPUDebug *cpu, unsigned id, UINT32 data)
+	static bool SetSpecialReg(CCPUDebug *cpu, unsigned id, UINT32 data)
 	{
 		switch (id)
 		{
@@ -62,45 +62,45 @@ namespace Debugger
 		}
 	}
 
-	UINT8 GetCR(CCPUDebug *cpu, unsigned id)
+	static UINT8 GetCR(CCPUDebug *cpu, unsigned id)
 	{
 		return ::ppc_get_cr(id);
 	}
 
-	bool SetCR(CCPUDebug *cpu, unsigned id, UINT8 data)
+	static bool SetCR(CCPUDebug *cpu, unsigned id, UINT8 data)
 	{
 		::ppc_set_cr(id, data);
 		return true;
 	}
 
-	UINT32 GetSPR(CCPUDebug *cpu, unsigned id)
+	static UINT32 GetSPR(CCPUDebug *cpu, unsigned id)
 	{
 		return ::ppc_read_spr(id);
 	}
 
-	bool SetSPR(CCPUDebug *cpu, unsigned id, UINT32 data)
+	static bool SetSPR(CCPUDebug *cpu, unsigned id, UINT32 data)
 	{
 		::ppc_write_spr(id, data);
 		return true;
 	}
 
-	UINT32 GetGPR(CCPUDebug *cpu, unsigned id)
+	static UINT32 GetGPR(CCPUDebug *cpu, unsigned id)
 	{
 		return ::ppc_get_gpr(id);
 	}
 
-	bool SetGPR(CCPUDebug *cpu, unsigned id, UINT32 data)
+	static bool SetGPR(CCPUDebug *cpu, unsigned id, UINT32 data)
 	{
 		::ppc_set_gpr(id, data);
 		return true;
 	}
 
-	double GetFPR(CCPUDebug *cpu, unsigned id)
+	static double GetFPR(CCPUDebug *cpu, unsigned id)
 	{
 		return ::ppc_get_fpr(id);
 	}
 
-	bool SetFPR(CCPUDebug *cpu, unsigned id, double data)
+	static bool SetFPR(CCPUDebug *cpu, unsigned id, double data)
 	{
 		::ppc_set_fpr(id, data);
 		return true;
diff --git a/Src/Debugger/CPU/PPCDebug.h b/Src/Debugger/CPU/PPCDebug.h
index f84258a..3077a99 100644
--- a/Src/Debugger/CPU/PPCDebug.h
+++ b/Src/Debugger/CPU/PPCDebug.h
@@ -36,15 +36,6 @@
 
 namespace Debugger
 {
-	static UINT32 GetSpecialReg(CCPUDebug *cpu, unsigned id);
-	static bool SetSpecialReg(CCPUDebug *cpu, unsigned id, UINT32 data);
-	static UINT32 GetSPR(CCPUDebug *cpu, unsigned id);
-	static bool SetSPR(CCPUDebug *cpu, unsigned id, UINT32 data);
-	static UINT32 GetGPR(CCPUDebug *cpu, unsigned id);
-	static bool SetGPR(CCPUDebug *cpu, unsigned id, UINT32 data);
-	static double GetFPR(CCPUDebug *cpu, unsigned id);
-	static bool SetFRP(CCPUDebug *cpu, unsigned id, double data);
-
 	/*
 	 * CCPUDebug implementation for the PowerPC PPC603 emulator.
 	 */
diff --git a/Src/Debugger/Debugger.h b/Src/Debugger/Debugger.h
index 13bd67c..69df32c 100644
--- a/Src/Debugger/Debugger.h
+++ b/Src/Debugger/Debugger.h
@@ -35,11 +35,11 @@ using namespace std;
 
 #include "Types.h"
 
-#if defined(SUPERMODEL_WIN32) || defined(SUPERMODEL_UNIX) || defined(SUPERMODEL_OSX)
+//#if defined(SUPERMODEL_WIN32) || defined(SUPERMODEL_UNIX) || defined(SUPERMODEL_OSX)
 #define DEBUGGER_HASBLOCKFILE
 #define DEBUGGER_HASLOGGER
 #define DEBUGGER_HASTHREAD
-#endif
+//#endif
 
 #define DEBUGGER_STATEFILE_VERSION 0
 
@@ -51,11 +51,11 @@ using namespace std;
 #ifndef SUPERMODEL_VERSION
 #define SUPERMODEL_VERSION ""
 #endif // SUPERMODEL_VERSEION
-#include "Logger.h"
+#include "OSD/Logger.h"
 #endif // DEBUGGER_HASLOGGER
 
 #ifdef DEBUGGER_HASTHREAD
-#include "Thread.h"
+#include "OSD/Thread.h"
 #endif // DEBUGGER_HASTHREAD
 
 #ifndef stricmp
diff --git a/Src/Model3/DriveBoard.cpp b/Src/Model3/DriveBoard.cpp
index b0ff3bb..c87c6ef 100644
--- a/Src/Model3/DriveBoard.cpp
+++ b/Src/Model3/DriveBoard.cpp
@@ -459,6 +459,7 @@ void CDriveBoard::EmulateFrame(void)
 
 UINT8 CDriveBoard::Read8(UINT32 addr)
 {
+	// TODO - shouldn't end of ROM be 0x7FFF not 0x8FFF?
 	if (addr < 0x9000)        // ROM is 0x0000-0x8FFF
 		return m_rom[addr];
 	else if (addr >= 0xE000)  // RAM is 0xE000-0xFFFF