X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=cpu%2Ffame%2Ffamec.c;h=6891526014c5e14e8edb8c34269ea15643856a40;hb=9a1f192a146e9b9752ec1a760745b1261fe9bdec;hp=613f58f2776b54ecd60ac1b348cfb8bc037db067;hpb=fcf94fcc20e7bdd527a28fe8e1b265862b616016;p=picodrive.git

diff --git a/cpu/fame/famec.c b/cpu/fame/famec.c
index 613f58f..6891526 100644
--- a/cpu/fame/famec.c
+++ b/cpu/fame/famec.c
@@ -11,6 +11,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-Wunused-variable"
+#endif
+
 #include "fame.h"
 
 
@@ -20,7 +24,7 @@
 #define FAMEC_CHECK_BRANCHES
 #define FAMEC_EXTRA_INLINE
 // #define FAMEC_DEBUG
-#define FAMEC_NO_GOTOS
+// #define FAMEC_NO_GOTOS
 #define FAMEC_ADR_BITS  24
 // #define FAMEC_FETCHBITS 8
 #define FAMEC_DATABITS  8
@@ -70,12 +74,17 @@
 #undef s32
 #endif
 
+#ifdef uptr
+#undef uptr
+#endif
+
 #define u8	unsigned char
 #define s8	signed char
 #define u16	unsigned short
 #define s16	signed short
 #define u32	unsigned int
 #define s32	signed int
+#define uptr	unsigned long
 
 /*
 typedef unsigned char	u8;
@@ -287,7 +296,7 @@ typedef signed int	s32;
 #define M68K_PPL (m68kcontext.sr >> 8) & 7
 
 #define GET_PC                  \
-	((u32)PC - BasePC)
+	(u32)((uptr)PC - BasePC)
 
 
 #ifdef FAMEC_CHECK_BRANCHES
@@ -519,22 +528,20 @@ M68K_CONTEXT *g_m68kcontext;
 #define m68kcontext (*g_m68kcontext)
 
 #ifdef FAMEC_NO_GOTOS
-static u32 Opcode;
-static s32 cycles_needed;
-static u16 *PC;
-static u32 BasePC;
-static u32 flag_C;
-static u32 flag_V;
-static u32 flag_NotZ;
-static u32 flag_N;
-static u32 flag_X;
+#define Opcode m68kcontext.Opcode
+#define cycles_needed m68kcontext.cycles_needed
+#define PC m68kcontext.PC
+#define BasePC m68kcontext.BasePC
+#define flag_C m68kcontext.flag_C
+#define flag_V m68kcontext.flag_V
+#define flag_NotZ m68kcontext.flag_NotZ
+#define flag_N m68kcontext.flag_N
+#define flag_X m68kcontext.flag_X
 #endif
 
-#ifdef FAMEC_EMULATE_TRACE
-static u32 flag_T;
-#endif
-static u32 flag_S;
-static u32 flag_I;
+#define flag_T m68kcontext.flag_T
+#define flag_S m68kcontext.flag_S
+#define flag_I m68kcontext.flag_I
 
 static u32 initialised = 0;
 
@@ -697,7 +704,7 @@ int fm68k_reset(void)
 u32 fm68k_get_pc(M68K_CONTEXT *context)
 {
 #ifdef FAMEC_NO_GOTOS
-	return (context->execinfo & M68K_RUNNING)?(u32)PC-BasePC:context->pc;
+	return (context->execinfo & M68K_RUNNING)?(uptr)PC-BasePC:context->pc;
 #else
 	return context->pc; // approximate PC in this mode
 #endif
@@ -776,8 +783,6 @@ static FAMEC_EXTRA_INLINE u32 execute_exception_group_0(s32 vect, s32 addr, u16
 }
 
 
-static void setup_jumptable(void);
-
 #ifdef FAMEC_NO_GOTOS
 
 #define OPCODE(N_OP) static void OP_##N_OP(void)
@@ -795,7 +800,7 @@ int fm68k_emulate(s32 cycles, int dualcore, int idle_mode)
 	u32 Opcode;
 	s32 cycles_needed;
 	u16 *PC;
-	u32 BasePC;
+	uptr BasePC;
 	u32 flag_C;
 	u32 flag_V;
 	u32 flag_NotZ;
@@ -922,6 +927,7 @@ famec_Exec:
 			u32 line;
 			m68kcontext.io_cycle_counter = cycles_needed;
 			cycles_needed = 0;
+			if (m68kcontext.io_cycle_counter <= 0) goto famec_End;
 			line=interrupt_chk__();
 			if (line>0)
 			{