From b3a8d0aaed1632f790b37e0fc1bb83917f0c22d0 Mon Sep 17 00:00:00 2001 From: OBattler Date: Wed, 2 Feb 2022 02:51:18 +0100 Subject: [PATCH] And more. --- src/cpu/386.c | 2 ++ src/cpu/386_dynarec.c | 2 ++ src/cpu/386_dynarec_ops.c | 3 +++ src/cpu/808x.c | 9 ++++++++- 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/cpu/386.c b/src/cpu/386.c index 6cec5ee43..6af8173eb 100644 --- a/src/cpu/386.c +++ b/src/cpu/386.c @@ -98,6 +98,8 @@ x386_log(const char *fmt, ...) #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) diff --git a/src/cpu/386_dynarec.c b/src/cpu/386_dynarec.c index c72da124b..4371efd00 100644 --- a/src/cpu/386_dynarec.c +++ b/src/cpu/386_dynarec.c @@ -283,6 +283,8 @@ static void prefetch_flush() #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) diff --git a/src/cpu/386_dynarec_ops.c b/src/cpu/386_dynarec_ops.c index c90673066..2eb3a5f00 100644 --- a/src/cpu/386_dynarec_ops.c +++ b/src/cpu/386_dynarec_ops.c @@ -68,6 +68,9 @@ static __inline void fetch_ea_16_long(uint32_t rmdat) #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) diff --git a/src/cpu/808x.c b/src/cpu/808x.c index 191ff97cd..023d89a60 100644 --- a/src/cpu/808x.c +++ b/src/cpu/808x.c @@ -89,12 +89,12 @@ static int refresh = 0, cycdiff; wait(val, 0); \ } -#if 0 #define CLOCK_CYCLES_ALWAYS(val) \ { \ wait(val, 0); \ } +#if 0 #define CLOCK_CYCLES_FPU(val) \ { \ wait(val, 0); \ @@ -119,6 +119,13 @@ static int refresh = 0, cycdiff; { \ wait(val, 0); \ } + +#define CLOCK_CYCLES_FPU(val) \ + { \ + wait(val, 0); \ + } + +#define CONCURRENCY_CYCLES(c) #endif