Merge branch '86Box:master' into nec-v20

src/cpu/386.c

@@ -81,6 +81,7 @@ x386_log(const char *fmt, ...)
 
 #define OP_TABLE(name) ops_ ## name
 
+#if 0
 #define CLOCK_CYCLES(c) \
 	{\
 		if (fpu_cycles > 0) {\
@@ -95,6 +96,12 @@ x386_log(const char *fmt, ...)
 
 #define CLOCK_CYCLES_FPU(c) cycles -= (c)
 #define CONCURRENCY_CYCLES(c) fpu_cycles = (c)
+#else
+#define CLOCK_CYCLES(c) cycles -= (c)
+#define CLOCK_CYCLES_FPU(c) cycles -= (c)
+#define CONCURRENCY_CYCLES(c)
+#endif
+
 #define CLOCK_CYCLES_ALWAYS(c) cycles -= (c)
 
 #include "x86_ops.h"

src/cpu/386_dynarec.c

@@ -267,6 +267,7 @@ static void prefetch_flush()
 
 
 #define OP_TABLE(name) ops_ ## name
+#if 0
 #define CLOCK_CYCLES(c) \
 	{\
 		if (fpu_cycles > 0) {\
@@ -280,6 +281,11 @@ static void prefetch_flush()
 	}
 #define CLOCK_CYCLES_FPU(c) cycles -= (c)
 #define CONCURRENCY_CYCLES(c) fpu_cycles = (c)
+#else
+#define CLOCK_CYCLES(c) cycles -= (c)
+#define CLOCK_CYCLES_FPU(c) cycles -= (c)
+#define CONCURRENCY_CYCLES(c)
+#endif
 #define CLOCK_CYCLES_ALWAYS(c) cycles -= (c)
 
 

src/cpu/386_dynarec_ops.c

@@ -65,8 +65,13 @@ static __inline void fetch_ea_16_long(uint32_t rmdat)
 #define OP_TABLE(name) dynarec_ops_ ## name
 
 #define CLOCK_CYCLES(c)
+#if 0
 #define CLOCK_CYCLES_FPU(c)
 #define CONCURRENCY_CYCLES(c) fpu_cycles = (c)
+#else
+#define CLOCK_CYCLES_FPU(c)
+#define CONCURRENCY_CYCLES(c)
+#endif
 #define CLOCK_CYCLES_ALWAYS(c) cycles -= (c)
 
 #include "386_ops.h"

src/cpu/808x.c

@@ -94,6 +94,7 @@ static int refresh = 0, cycdiff;
 		wait(val, 0);	\
 	}
 
+#if 0
 #define CLOCK_CYCLES_FPU(val)		\
 	{			\
 		wait(val, 0);	\
@@ -113,6 +114,19 @@ static int refresh = 0, cycdiff;
 	}
 
 #define CONCURRENCY_CYCLES(c) fpu_cycles = (c)
+#else
+#define CLOCK_CYCLES(val)		\
+	{			\
+		wait(val, 0);	\
+	}
+
+#define CLOCK_CYCLES_FPU(val)		\
+	{			\
+		wait(val, 0);	\
+	}
+
+#define CONCURRENCY_CYCLES(c)
+#endif
 
 
 typedef	int (*OpFn)(uint32_t fetchdat);

src/cpu/cpu.h

@@ -357,7 +357,11 @@ typedef struct {
     uint8_t	ssegs, ismmx,
 		abrt, _smi_line;
 
+#ifdef FPU_CYCLES
     int		_cycles, _fpu_cycles, _in_smm;
+#else
+    int		_cycles, _in_smm;
+#endif
 
     uint16_t	npxs, npxc;
 
@@ -460,7 +464,9 @@ COMPILE_TIME_ASSERT(sizeof(cpu_state_t) <= 128)
 #define DI	cpu_state.regs[7].w
 
 #define cycles	cpu_state._cycles
+#ifdef FPU_CYCLES
 #define fpu_cycles	cpu_state._fpu_cycles
+#endif
 
 #define cpu_rm	cpu_state.rm_data.rm_mod_reg.rm
 #define cpu_mod	cpu_state.rm_data.rm_mod_reg.mod