Finish migrating to new mem handling. Make carthw db external.

[picodrive.git] / cpu / musashi / m68kconf.h

diff --git a/cpu/musashi/m68kconf.h b/cpu/musashi/m68kconf.h
index ced542d..e2bddaf 100644 (file)
--- a/cpu/musashi/m68kconf.h
+++ b/cpu/musashi/m68kconf.h
@@ -75,7 +75,7 @@
  * and m68k_read_pcrelative_xx() for PC-relative addressing.\r
  * If off, all read requests from the CPU will be redirected to m68k_read_xx()\r
  */\r
-#define M68K_SEPARATE_READS         OPT_ON\r
+#define M68K_SEPARATE_READS         OPT_OFF\r
 \r
 /* If ON, the CPU will call m68k_write_32_pd() when it executes move.l with a\r
  * predecrement destination EA mode instead of m68k_write_32().\r
@@ -102,7 +102,7 @@
 \r
 /* If ON, the CPU will monitor the trace flags and take trace exceptions\r
  */\r
-#define M68K_EMULATE_TRACE          OPT_OFF\r
+#define M68K_EMULATE_TRACE          OPT_ON\r
 \r
 \r
 /* If ON, CPU will call the output reset callback when it encounters a reset\r
@@ -126,6 +126,13 @@
 #define M68K_RTE_CALLBACK()         your_rte_handler_function()\r
 \r
 \r
+/* If ON, CPU will call the callback when it encounters a tas\r
+ * instruction.\r
+ */\r
+#define M68K_TAS_HAS_CALLBACK       OPT_ON\r
+#define M68K_TAS_CALLBACK()         your_tas_handler_function()\r
+\r
+\r
 /* If ON, CPU will call the set fc callback on every memory access to\r
  * differentiate between user/supervisor, program/data access like a real\r
  * 68000 would.  This should be enabled and the callback should be set if you\r
@@ -148,7 +155,8 @@
  * instruction.\r
  */\r
 #define M68K_INSTRUCTION_HOOK       OPT_OFF\r
-#define M68K_INSTRUCTION_CALLBACK() your_instruction_hook_function()\r
+//#define M68K_INSTRUCTION_HOOK       OPT_SPECIFY_HANDLER\r
+#define M68K_INSTRUCTION_CALLBACK() instruction_hook()\r
 \r
 \r
 /* If ON, the CPU will emulate the 4-byte prefetch queue of a real 68000 */\r