famec: remove unused dual code

diff --git a/cpu/fame/fame.h b/cpu/fame/fame.h
index 111af88..2f9d850 100644 (file)
--- a/cpu/fame/fame.h
+++ b/cpu/fame/fame.h
@@ -152,7 +152,7 @@ extern M68K_CONTEXT *g_m68kcontext;
 /* General purpose functions */\r
 void fm68k_init(void);\r
 int  fm68k_reset(void);\r
-int  fm68k_emulate(int n, int dualcore, int idle_mode);\r
+int  fm68k_emulate(int n, int idle_mode);\r
 int  fm68k_would_interrupt(void); // to be called from fm68k_emulate()\r
 \r
 unsigned fm68k_get_pc(M68K_CONTEXT *context);\r

diff --git a/cpu/fame/famec.c b/cpu/fame/famec.c
index 6891526..2f10540 100644 (file)
--- a/cpu/fame/famec.c
+++ b/cpu/fame/famec.c
@@ -647,7 +647,7 @@ void fm68k_init(void)
 #endif\r
 \r
     if (!initialised)\r
-           fm68k_emulate(0, 0, 0);\r
+           fm68k_emulate(0, 0);\r
 \r
 #ifdef FAMEC_DEBUG\r
        puts("FAME initialized.");\r
@@ -666,7 +666,7 @@ void fm68k_init(void)
 int fm68k_reset(void)\r
 {\r
        if (!initialised)\r
-               fm68k_emulate(0, 0, 0);\r
+               fm68k_emulate(0, 0);\r
 \r
        // Si la CPU esta en ejecucion, salir con M68K_RUNNING\r
        if (m68kcontext.execinfo & M68K_RUNNING)\r
@@ -794,7 +794,7 @@ static FAMEC_EXTRA_INLINE u32 execute_exception_group_0(s32 vect, s32 addr, u16
 // main exec function\r
 //////////////////////\r
 \r
-int fm68k_emulate(s32 cycles, int dualcore, int idle_mode)\r
+int fm68k_emulate(s32 cycles, int idle_mode)\r
 {\r
 #ifndef FAMEC_NO_GOTOS\r
        u32 Opcode;\r
@@ -814,10 +814,8 @@ int fm68k_emulate(s32 cycles, int dualcore, int idle_mode)
        }\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
        // won't emulate double fault\r
@@ -962,58 +960,7 @@ famec_End:
        printf("pc: 0x%08x\n",m68kcontext.pc);\r
 #endif\r
 \r
-#ifdef PICODRIVE_HACK\r
-       if (!dualcore)\r
-#endif\r
-               return cycles - m68kcontext.io_cycle_counter;\r
-\r
-#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
-               if (dualcore == 1)\r
-               {\r
-                       dualcore = (488<<16); // ~ cycn in Pico.c\r
-                       // adjust for first iteration\r
-                       g_m68kcontext = &PicoCpuFS68k;\r
-                       cycles = m68kcontext.io_cycle_counter = 0;\r
-               }\r
-               if (g_m68kcontext == &PicoCpuFS68k)\r
-               {\r
-                       SekCycleCntS68k += cycles - m68kcontext.io_cycle_counter;\r
-                       // end?\r
-                       dualcore -= PS_STEP_M68K;\r
-                       if (dualcore < 0) return 0;\r
-                       // become main 68k\r
-                       g_m68kcontext = &PicoCpuFM68k;\r
-                       if ((cycles = SekCycleAim-SekCycleCnt-(dualcore>>16)) > 0)\r
-                       {\r
-                               if ((m68kcontext.execinfo & FM68K_HALTED) && m68kcontext.interrupts[0] <= (M68K_PPL))\r
-                                    SekCycleCnt += cycles; // halted\r
-                               else goto famec_restart;\r
-                               //else { printf("go main %i\n", cycles); goto famec_restart; }\r
-                       }\r
-                       cycles = m68kcontext.io_cycle_counter = 0;\r
-               }\r
-               if (g_m68kcontext == &PicoCpuFM68k)\r
-               {\r
-                       int cycn_s68k = (dualcore + dualcore/2 + dualcore/8) >> 16;\r
-                       SekCycleCnt += cycles - m68kcontext.io_cycle_counter;\r
-                       // become sub 68k\r
-                       g_m68kcontext = &PicoCpuFS68k;\r
-                       if ((cycles = SekCycleAimS68k-SekCycleCntS68k-cycn_s68k) > 0)\r
-                       {\r
-                               if ((m68kcontext.execinfo & FM68K_HALTED) && m68kcontext.interrupts[0] <= (M68K_PPL))\r
-                                    SekCycleCntS68k += cycles; // halted\r
-                               else goto famec_restart;\r
-                       }\r
-                       cycles = m68kcontext.io_cycle_counter = 0;\r
-               }\r
-       }\r
-#endif\r
+       return cycles - m68kcontext.io_cycle_counter;\r
 \r
 init_jump_table:\r
 {\r

diff --git a/pico/cd/mcd.c b/pico/cd/mcd.c
index 3f6afa5..8451a1c 100644 (file)
--- a/pico/cd/mcd.c
+++ b/pico/cd/mcd.c
@@ -107,7 +107,7 @@ static __inline void SekRunS68k(unsigned int to)
   m68k_set_context(&PicoCpuMM68k);
 #elif defined(EMU_F68K)
   g_m68kcontext = &PicoCpuFS68k;
-  SekCycleCntS68k += fm68k_emulate(cyc_do, 0, 0) - cyc_do;
+  SekCycleCntS68k += fm68k_emulate(cyc_do, 0) - cyc_do;
   g_m68kcontext = &PicoCpuFM68k;
 #endif
 }

diff --git a/pico/pico_cmn.c b/pico/pico_cmn.c
index c84c221..341255a 100644 (file)
--- a/pico/pico_cmn.c
+++ b/pico/pico_cmn.c
@@ -39,7 +39,7 @@ static void SekSyncM68k(void)
 #elif defined(EMU_M68K)
     SekCycleCnt += m68k_execute(cyc_do) - cyc_do;
 #elif defined(EMU_F68K)
-    SekCycleCnt += fm68k_emulate(cyc_do, 0, 0) - cyc_do;
+    SekCycleCnt += fm68k_emulate(cyc_do, 0) - cyc_do;
 #endif
   }
 

diff --git a/pico/sek.c b/pico/sek.c
index 91aa7ce..86a351f 100644 (file)
--- a/pico/sek.c
+++ b/pico/sek.c
@@ -176,7 +176,7 @@ void SekStepM68k(void)
 #elif defined(EMU_M68K)\r
   SekCycleCnt+=m68k_execute(1);\r
 #elif defined(EMU_F68K)\r
-  SekCycleCnt+=fm68k_emulate(1, 0, 0);\r
+  SekCycleCnt+=fm68k_emulate(1, 0);\r
 #endif\r
 }\r
 \r
@@ -317,7 +317,7 @@ void SekInitIdleDet(void)
   CycloneInitIdle();\r
 #endif\r
 #ifdef EMU_F68K\r
-  fm68k_emulate(0, 0, 1);\r
+  fm68k_emulate(0, 1);\r
 #endif\r
 }\r
 \r
@@ -425,7 +425,7 @@ void SekFinishIdleDet(void)
   CycloneFinishIdle();\r
 #endif\r
 #ifdef EMU_F68K\r
-  fm68k_emulate(0, 0, 2);\r
+  fm68k_emulate(0, 2);\r
 #endif\r
   while (idledet_count > 0)\r
   {\r