X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=cpu%2Ffame%2Ffamec.c;h=616027c2a58031972308c015ae58b19b41296e29;hb=4d5dfee86139e1596228db111ce2f30c22c93ddd;hp=aa0a9d87dae4e5a967e315cfd0cf8879a049fb03;hpb=528ab61b71a4e80b12fc810cb71f176270945170;p=picodrive.git

diff --git a/cpu/fame/famec.c b/cpu/fame/famec.c
index aa0a9d8..616027c 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"
 
 
@@ -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;
@@ -262,6 +271,10 @@ typedef signed int	s32;
     goto famec_Exec;
 #endif
 
+#define RET0() \
+    m68kcontext.io_cycle_counter = -6; \
+    goto famec_End;
+
 #else
 
 #define NEXT \
@@ -274,12 +287,16 @@ typedef signed int	s32;
     m68kcontext.io_cycle_counter -= (A);  \
     return;
 
+#define RET0() \
+    m68kcontext.io_cycle_counter = -6; \
+    return;
+
 #endif
 
 #define M68K_PPL (m68kcontext.sr >> 8) & 7
 
 #define GET_PC                  \
-	((u32)PC - BasePC)
+	(u32)((uptr)PC - BasePC)
 
 
 #ifdef FAMEC_CHECK_BRANCHES
@@ -514,7 +531,7 @@ M68K_CONTEXT *g_m68kcontext;
 static u32 Opcode;
 static s32 cycles_needed;
 static u16 *PC;
-static u32 BasePC;
+static uptr BasePC;
 static u32 flag_C;
 static u32 flag_V;
 static u32 flag_NotZ;
@@ -689,7 +706,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
@@ -768,8 +785,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)
@@ -787,7 +802,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;
@@ -5041,8 +5056,8 @@ idle_install:
 	INSTALL_IDLE(0x75f8, 0x67f8, idle_detector_bcc8, 0x6701_idle, 0x6701);
 	INSTALL_IDLE(0x75f6, 0x67f6, idle_detector_bcc8, 0x6701_idle, 0x6701);
 	INSTALL_IDLE(0x75f2, 0x67f2, idle_detector_bcc8, 0x6701_idle, 0x6701);
-	INSTALL_IDLE(0x7dfe, 0x60fe, idle_detector_dead, 0x6001_idle, 0x6001);
-	INSTALL_IDLE(0x7dfc, 0x60fc, idle_detector_dead, 0x6001_idle, 0x6001);
+	INSTALL_IDLE(0x7dfe, 0x60fe, idle_detector_bcc8, 0x6001_idle, 0x6001);
+	INSTALL_IDLE(0x7dfc, 0x60fc, idle_detector_bcc8, 0x6001_idle, 0x6001);
 	return 0;
 
 idle_remove: