--- BasiliskII/src/uae_cpu/newcpu.h	2002/10/01 09:39:55	1.11
+++ BasiliskII/src/uae_cpu/newcpu.h	2005/06/04 16:47:14	1.14
@@ -26,18 +26,6 @@ extern int movem_next[256];
 
 extern int broken_in;
 
-/* Control flow information */
-#define CFLOW_NORMAL		0
-#define CFLOW_BRANCH		1
-#define CFLOW_JUMP			2
-#define CFLOW_RETURN		3
-#define CFLOW_TRAP			4
-#define CFLOW_SPCFLAGS		32	/* some spcflags are set */
-#define CFLOW_EXEC_RETURN	64	/* must exit from the execution loop */
-
-#define cpuop_rettype		void
-#define cpuop_return(v)		do { (v); return; } while (0)
-
 #ifdef X86_ASSEMBLY
 /* This hack seems to force all register saves (pushl %reg) to be moved to the
    begining of the function, thus making it possible to cpuopti to remove them
@@ -49,9 +37,9 @@ extern int broken_in;
 #endif
 
 #define cpuop_begin()		do { cpuop_tag("begin"); } while (0)
-#define cpuop_end(cflow)	do { cpuop_tag("end"); cpuop_return(cflow); } while (0)
+#define cpuop_end()			do { cpuop_tag("end"); } while (0)
 
-typedef cpuop_rettype REGPARAM2 cpuop_func (uae_u32) REGPARAM;
+typedef void REGPARAM2 cpuop_func (uae_u32) REGPARAM;
  
 struct cputbl {
     cpuop_func *handler;
@@ -71,7 +59,7 @@ struct comptbl {
 };
 #endif
 
-extern cpuop_rettype REGPARAM2 op_illg (uae_u32) REGPARAM;
+extern void REGPARAM2 op_illg (uae_u32) REGPARAM;
 
 typedef char flagtype;
 
@@ -294,12 +282,12 @@ extern struct cputbl op_smalltbl_3_ff[];
 extern struct cputbl op_smalltbl_4_ff[];
 
 #if FLIGHT_RECORDER
-extern void m68k_record_step(uaecptr);
+extern void m68k_record_step(uaecptr) REGPARAM;
 #endif
 extern void m68k_do_execute(void);
 extern void m68k_execute(void);
 #if USE_JIT
-#ifdef X86_ASSEMBLY
+#if defined(X86_ASSEMBLY) || defined(X86_64_ASSEMBLY)
 /* This is generated code */
 extern void (*m68k_compile_execute)(void);
 #else