removed forgotten printf

[picodrive.git] / cpu / fame / famec.c

diff --git a/cpu/fame/famec.c b/cpu/fame/famec.c
index 6b147b2..aa0a9d8 100644 (file)
--- a/cpu/fame/famec.c
+++ b/cpu/fame/famec.c
@@ -4,7 +4,7 @@
 /* Autor: Oscar Orallo Pelaez                                               */\r
 /* Fecha de comienzo: 03-10-2006                                            */\r
 /* Ultima actualizacion: 08-10-2006                                         */\r
-/* Based on the excellent FAMEC emulator by Stèphane Dallongueville          */\r
+/* Based on the excellent C68K emulator by Stèphane Dallongueville          */\r
 /****************************************************************************/\r
 \r
 #include <stdio.h>\r
@@ -20,7 +20,7 @@
 #define FAMEC_CHECK_BRANCHES\r
 #define FAMEC_EXTRA_INLINE\r
 // #define FAMEC_DEBUG\r
-//#define FAMEC_NO_GOTOS\r
+#define FAMEC_NO_GOTOS\r
 #define FAMEC_ADR_BITS  24\r
 // #define FAMEC_FETCHBITS 8\r
 #define FAMEC_DATABITS  8\r
@@ -33,7 +33,9 @@
 \r
 \r
 #undef INLINE\r
-#ifndef INLINE\r
+#ifdef _MSC_VER\r
+#define INLINE\r
+#else\r
 #define INLINE __inline__\r
 #endif\r
 \r
@@ -280,11 +282,18 @@ typedef signed int        s32;
        ((u32)PC - BasePC)\r
 \r
 \r
+#ifdef FAMEC_CHECK_BRANCHES\r
+#define FORCE_ALIGNMENT(pc)\r
+#else\r
+#define FORCE_ALIGNMENT(pc) pc&=~1;\r
+#endif\r
+\r
 #ifndef FAMEC_32BIT_PC\r
 \r
 #define SET_PC(A)               \\r
 { \\r
     u32 pc = A; \\r
+    FORCE_ALIGNMENT(pc); \\r
     BasePC = m68kcontext.Fetch[(pc >> M68K_FETCHSFT) & M68K_FETCHMASK];    \\r
     PC = (u16*)((pc & M68K_ADR_MASK) + BasePC);        \\r
 }\r
@@ -294,6 +303,7 @@ typedef signed int  s32;
 #define SET_PC(A)               \\r
 { \\r
     u32 pc = A; \\r
+    FORCE_ALIGNMENT(pc); \\r
     BasePC = m68kcontext.Fetch[(pc >> M68K_FETCHSFT) & M68K_FETCHMASK];    \\r
     BasePC -= pc & 0xFF000000;    \\r
     PC = (u16*)(pc + BasePC); \\r
@@ -493,8 +503,6 @@ typedef signed int  s32;
 #endif\r
 \r
 \r
-static int init_jump_table(void);\r
-\r
 // global variable\r
 ///////////////////\r
 \r
@@ -624,7 +632,7 @@ void fm68k_init(void)
 #endif\r
 \r
     if (!initialised)\r
-           fm68k_emulate(0, 0);\r
+           fm68k_emulate(0, 0, 0);\r
 \r
 #ifdef FAMEC_DEBUG\r
        puts("FAME initialized.");\r
@@ -643,7 +651,7 @@ void fm68k_init(void)
 int fm68k_reset(void)\r
 {\r
        if (!initialised)\r
-               fm68k_emulate(0, 0);\r
+               fm68k_emulate(0, 0, 0);\r
 \r
        // Si la CPU esta en ejecucion, salir con M68K_RUNNING\r
        if (m68kcontext.execinfo & M68K_RUNNING)\r
@@ -734,7 +742,9 @@ static FAMEC_EXTRA_INLINE u32 execute_exception(s32 vect, u32 oldPC, u32 oldSR)
 #ifndef FAMEC_32BIT_PC\r
        newPC&=M68K_ADR_MASK\r
 #endif\r
+#ifdef FAMEC_CHECK_BRANCHES\r
        newPC&=~1; // don't crash on games with bad vector tables\r
+#endif\r
 \r
        // SET_PC(newPC)\r
 \r
@@ -771,7 +781,7 @@ static void setup_jumptable(void);
 // main exec function\r
 //////////////////////\r
 \r
-int fm68k_emulate(s32 cycles, int dualcore)\r
+int fm68k_emulate(s32 cycles, int dualcore, int idle_mode)\r
 {\r
 #ifndef FAMEC_NO_GOTOS\r
        u32 Opcode;\r
@@ -787,16 +797,13 @@ int fm68k_emulate(s32 cycles, int dualcore)
 \r
        if (!initialised)\r
        {\r
-#ifdef FAMEC_NO_GOTOS\r
-               init_jump_table();\r
-               return 0;\r
-#else\r
                goto init_jump_table;\r
-#endif\r
        }\r
 \r
 #ifdef PICODRIVE_HACK\r
        if (dualcore) goto dualcore_mode;\r
+       if      (idle_mode == 1) goto idle_install;\r
+       else if (idle_mode == 2) goto idle_remove;\r
 famec_restart:\r
 #endif\r
 \r
@@ -904,9 +911,10 @@ famec_Exec:
 #endif\r
                if (cycles_needed != 0)\r
                {\r
+                       u32 line;\r
                        m68kcontext.io_cycle_counter = cycles_needed;\r
                        cycles_needed = 0;\r
-                       s32 line=interrupt_chk__();\r
+                       line=interrupt_chk__();\r
                        if (line>0)\r
                        {\r
                                if (m68kcontext.iack_handler != NULL)\r
@@ -948,6 +956,7 @@ famec_End:
 #ifdef PICODRIVE_HACK\r
 dualcore_mode:\r
 \r
+       while (1)\r
        {\r
                extern int SekCycleAim, SekCycleCnt, SekCycleAimS68k, SekCycleCntS68k;\r
                #define PS_STEP_M68K ((488<<16)/20) // ~24\r
@@ -989,21 +998,11 @@ dualcore_mode:
                        }\r
                        cycles = m68kcontext.io_cycle_counter = 0;\r
                }\r
-               goto dualcore_mode;\r
        }\r
 #endif\r
 \r
-\r
-\r
-#ifdef FAMEC_NO_GOTOS\r
-}\r
-\r
-static int init_jump_table(void)\r
-{{\r
-#else\r
 init_jump_table:\r
 {\r
-#endif\r
        u32 i, j;\r
 \r
        for(i = 0x0000; i <= 0xFFFF; i += 0x0001)\r
@@ -5019,6 +5018,49 @@ init_jump_table:
 \r
        initialised = 1;\r
        return 0;\r
-}}\r
+}\r
+\r
+#ifdef PICODRIVE_HACK\r
+\r
+#define INSTALL_IDLE(fake_op_base,real_op,detector,idle_handler,normal_handler) \\r
+       JumpTable[fake_op_base] = CAST_OP(idle_handler); \\r
+       JumpTable[fake_op_base|0x0200] = CAST_OP(normal_handler); \\r
+       JumpTable[real_op] = CAST_OP(detector)\r
+\r
+#define UNDO_IDLE(fake_op_base,real_op,normal_handler) \\r
+       JumpTable[fake_op_base] = JumpTable[fake_op_base|0x0200] = CAST_OP(0x4AFC); \\r
+       JumpTable[real_op] = CAST_OP(normal_handler)\r
+\r
+idle_install:\r
+       // printf("install..\n");\r
+       INSTALL_IDLE(0x71fa, 0x66fa, idle_detector_bcc8, 0x6601_idle, 0x6601);\r
+       INSTALL_IDLE(0x71f8, 0x66f8, idle_detector_bcc8, 0x6601_idle, 0x6601);\r
+       INSTALL_IDLE(0x71f6, 0x66f6, idle_detector_bcc8, 0x6601_idle, 0x6601);\r
+       INSTALL_IDLE(0x71f2, 0x66f2, idle_detector_bcc8, 0x6601_idle, 0x6601);\r
+       INSTALL_IDLE(0x75fa, 0x67fa, idle_detector_bcc8, 0x6701_idle, 0x6701);\r
+       INSTALL_IDLE(0x75f8, 0x67f8, idle_detector_bcc8, 0x6701_idle, 0x6701);\r
+       INSTALL_IDLE(0x75f6, 0x67f6, idle_detector_bcc8, 0x6701_idle, 0x6701);\r
+       INSTALL_IDLE(0x75f2, 0x67f2, idle_detector_bcc8, 0x6701_idle, 0x6701);\r
+       INSTALL_IDLE(0x7dfe, 0x60fe, idle_detector_dead, 0x6001_idle, 0x6001);\r
+       INSTALL_IDLE(0x7dfc, 0x60fc, idle_detector_dead, 0x6001_idle, 0x6001);\r
+       return 0;\r
+\r
+idle_remove:\r
+       // printf("remove..\n");\r
+       UNDO_IDLE(0x71fa, 0x66fa, 0x6601);\r
+       UNDO_IDLE(0x71f8, 0x66f8, 0x6601);\r
+       UNDO_IDLE(0x71f6, 0x66f6, 0x6601);\r
+       UNDO_IDLE(0x71f2, 0x66f2, 0x6601);\r
+       UNDO_IDLE(0x75fa, 0x67fa, 0x6701);\r
+       UNDO_IDLE(0x75f8, 0x67f8, 0x6701);\r
+       UNDO_IDLE(0x75f6, 0x67f6, 0x6701);\r
+       UNDO_IDLE(0x75f2, 0x67f2, 0x6701);\r
+       UNDO_IDLE(0x7dfe, 0x60fe, 0x6001);\r
+       UNDO_IDLE(0x7dfc, 0x60fc, 0x6001);\r
+       return 0;\r
+\r
+#endif\r
+}\r
 \r
+void *get_jumptab(void) { return JumpTable; }\r
 \r