#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
#define PICODRIVE_HACK\r
// Options //\r
\r
-\r
+#ifndef FAMEC_NO_GOTOS\r
+// computed gotos is a GNU extension\r
+#ifndef __GNUC__\r
+#define FAMEC_NO_GOTOS\r
+#endif\r
+// as of 3.3, clang takes over 3h to compile this in computed goto mode..\r
+#ifdef __clang__\r
+#define FAMEC_NO_GOTOS\r
+#endif\r
+#endif\r
+ \r
#undef INLINE\r
#ifdef _MSC_VER\r
#define INLINE\r
#define m68kcontext (*g_m68kcontext)\r
\r
#ifdef FAMEC_NO_GOTOS\r
-static u32 Opcode;\r
-static s32 cycles_needed;\r
-static u16 *PC;\r
-static uptr BasePC;\r
-static u32 flag_C;\r
-static u32 flag_V;\r
-static u32 flag_NotZ;\r
-static u32 flag_N;\r
-static u32 flag_X;\r
+#define Opcode m68kcontext.Opcode\r
+#define cycles_needed m68kcontext.cycles_needed\r
+#define PC m68kcontext.PC\r
+#define BasePC m68kcontext.BasePC\r
+#define flag_C m68kcontext.flag_C\r
+#define flag_V m68kcontext.flag_V\r
+#define flag_NotZ m68kcontext.flag_NotZ\r
+#define flag_N m68kcontext.flag_N\r
+#define flag_X m68kcontext.flag_X\r
#endif\r
\r
-#ifdef FAMEC_EMULATE_TRACE\r
-static u32 flag_T;\r
-#endif\r
-static u32 flag_S;\r
-static u32 flag_I;\r
+#define flag_T m68kcontext.flag_T\r
+#define flag_S m68kcontext.flag_S\r
+#define flag_I m68kcontext.flag_I\r
\r
static u32 initialised = 0;\r
\r
#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
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
//u32 oldSR = GET_SR;\r
\r
m68kcontext.io_cycle_counter -= exception_cycle_table[vect];\r
+#ifdef FAMEC_EMULATE_TRACE\r
+ m68kcontext.execinfo &= ~FM68K_EMULATE_TRACE;\r
+#endif\r
\r
PRE_IO\r
\r
\r
/* adjust SR */\r
flag_S = M68K_SR_S;\r
+ flag_T = 0;\r
\r
#ifndef FAMEC_32BIT_PC\r
newPC&=M68K_ADR_MASK\r
// 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
}\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
#ifdef FAMEC_EMULATE_TRACE\r
if (m68kcontext.execinfo & FM68K_EMULATE_TRACE)\r
{\r
- m68kcontext.io_cycle_counter = cycles_needed;\r
+ m68kcontext.io_cycle_counter += cycles_needed;\r
cycles_needed = 0;\r
m68kcontext.execinfo &= ~FM68K_EMULATE_TRACE;\r
m68kcontext.execinfo |= FM68K_DO_TRACE;\r
SET_PC(execute_exception(M68K_TRACE_EX, GET_PC, GET_SR));\r
- flag_T=0;\r
if (m68kcontext.io_cycle_counter > 0)\r
{\r
//NEXT\r
if (cycles_needed != 0)\r
{\r
u32 line;\r
- m68kcontext.io_cycle_counter = cycles_needed;\r
+ m68kcontext.io_cycle_counter += cycles_needed;\r
cycles_needed = 0;\r
+ //if (m68kcontext.io_cycle_counter <= 0) goto famec_End;\r
line=interrupt_chk__();\r
if (line>0)\r
{\r
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
notaz.gp2x.de / picodrive.git / blobdiff