From a3036b0c9d0eda3f7b3d3b988c90b8295a6a9f9b Mon Sep 17 00:00:00 2001
From: gbeauche <>
Date: Sat, 11 Oct 2003 16:43:42 +0000
Subject: [PATCH] Really enable flight_recorder with predecode cache on

---
 SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-config.hpp | 4 ----
 SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-cpu.hpp    | 6 +++---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-config.hpp b/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-config.hpp
index 631bf727..8fa8fdd7 100644
--- a/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-config.hpp
+++ b/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-config.hpp
@@ -177,10 +177,6 @@
 #undef PPC_NO_STATIC_II_INDEX_TABLE
 #endif
 
-#if defined(PPC_FLIGHT_RECORDER) && !defined(PPC_NO_DECODE_CACHE)
-#define PPC_NO_DECODE_CACHE
-#endif
-
 #if defined(PPC_EXECUTE_DUMP_STATE) && !defined(PPC_NO_DECODE_CACHE)
 #define PPC_NO_DECODE_CACHE
 #endif
diff --git a/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-cpu.hpp b/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-cpu.hpp
index ac51cae3..c387f81f 100644
--- a/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-cpu.hpp
+++ b/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-cpu.hpp
@@ -342,7 +342,7 @@ inline void powerpc_cpu::do_execute()
 #ifdef PPC_EXECUTE_DUMP_STATE
 		fprintf(stderr, "[%08x]-> %08x\n", pc(), opcode);
 #endif
-#if FLIGHT_RECORDER
+#if PPC_FLIGHT_RECORDER
 		if (is_logging())
 			record_step(opcode);
 #endif
@@ -367,11 +367,11 @@ inline void powerpc_cpu::do_execute()
 			ii = decode(opcode);
 			di->opcode = opcode;
 			di->execute = ii->execute;
-#if FLIGHT_RECORDER
+#if PPC_FLIGHT_RECORDER
 			if (is_logging()) {
 				di++;
 				di->opcode = opcode;
-				di->execute = record_step;
+				di->execute = &powerpc_cpu::record_step;
 			}
 #endif
 			if (++di >= decode_cache_end_p) {