debugger_temp_fixes.patch

gistfile1.txt

diff --git a/apu/bapu/smp/smp.cpp b/apu/bapu/smp/smp.cpp
index d0b08cf..5992997 100644
--- a/apu/bapu/smp/smp.cpp
+++ b/apu/bapu/smp/smp.cpp
@@ -6,7 +6,7 @@
 #define SMP_CPP
 namespace SNES {
 
-#if defined(DEBUGGER)
+#if 0
   #include "debugger/debugger.cpp"
   #include "debugger/disassembler.cpp"
   SMPDebugger smp;
diff --git a/apu/bapu/smp/smp.hpp b/apu/bapu/smp/smp.hpp
index cce64a6..3608d9e 100644
--- a/apu/bapu/smp/smp.hpp
+++ b/apu/bapu/smp/smp.hpp
@@ -124,7 +124,7 @@ public:
   inline uint8  op_ror (uint8  x);
 };
 
-#if defined(DEBUGGER)
+#if 0
   #include "debugger/debugger.hpp"
   extern SMPDebugger smp;
 #else
diff --git a/debug.cpp b/debug.cpp
index b0c5bb1..1bb4a72 100644
--- a/debug.cpp
+++ b/debug.cpp
@@ -1578,8 +1578,8 @@ static void debug_process_command (char *Line)
 		printf("HC event tracing %s.\n", Settings.TraceHCEvent ? "enabled" : "disabled");
 	}
 
-	if (*Line == 'A')
-		spc_core->debug_toggle_trace();
+	/*if (*Line == 'A')
+		spc_core->debug_toggle_trace();*/
 
 /*
 	if (*Line == 'B')
diff --git a/win32/wsnes9x.cpp b/win32/wsnes9x.cpp
index 2758f4c..b22bc88 100644
--- a/win32/wsnes9x.cpp
+++ b/win32/wsnes9x.cpp
@@ -2416,7 +2416,7 @@ LRESULT CALLBACK WinProc(
 			Settings.Paused = FALSE;
 			break;
 		case ID_DEBUG_APU_TRACE:
-			spc_core->debug_toggle_trace();
+			//spc_core->debug_toggle_trace();
 			break;
 #endif
 		case IDM_ROM_INFO:
@@ -3951,7 +3951,7 @@ static void CheckMenuStates ()
 #ifdef DEBUGGER
     mii.fState = (CPU.Flags & TRACE_FLAG) ? MFS_CHECKED : MFS_UNCHECKED;
     SetMenuItemInfo (GUI.hMenu, ID_DEBUG_TRACE, FALSE, &mii);
-	mii.fState = (spc_core->debug_is_enabled()) ? MFS_CHECKED : MFS_UNCHECKED;
+	//mii.fState = (spc_core->debug_is_enabled()) ? MFS_CHECKED : MFS_UNCHECKED;
     SetMenuItemInfo (GUI.hMenu, ID_DEBUG_APU_TRACE, FALSE, &mii);
 #endif