80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch 'master' of https://github.com/86Box/86Box into qt

Browse Source
This commit is contained in:
ts-korhonen
2022-02-01 21:17:31 +02:00
parent 8649294f60 63bea05141
commit 60cd5048ae
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cpu/386.c
View File

@@ -81,6 +81,7 @@ x386_log(const char *fmt, ...)
#define OP_TABLE(name) ops_ ## name #define OP_TABLE(name) ops_ ## name
#if 0
#define CLOCK_CYCLES(c) \ #define CLOCK_CYCLES(c) \
{\ {\
if (fpu_cycles > 0) {\ if (fpu_cycles > 0) {\
@@ -92,6 +93,9 @@ x386_log(const char *fmt, ...)
cycles -= (c);\ cycles -= (c);\
}\ }\
} }
#else
#define CLOCK_CYCLES(c) cycles -= (c)
#endif
#define CLOCK_CYCLES_FPU(c) cycles -= (c) #define CLOCK_CYCLES_FPU(c) cycles -= (c)
#define CONCURRENCY_CYCLES(c) fpu_cycles = (c) #define CONCURRENCY_CYCLES(c) fpu_cycles = (c)

4
src/cpu/386_dynarec.c
View File

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