mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-24 20:35:32 -07:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/master' into feature/recompiler_improvements

Browse Source
This commit is contained in:
OBattler
2025-12-23 03:44:30 +01:00
parent 2f294e1dde f827cec0d9
commit 513c6f3ac3
45 changed files with 1451 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/cpu/cpu.h
View File

@@ -446,16 +446,14 @@ typedef struct {
# define CPU_STATUS_MASK 0xffff0000
#endif
#ifdef _MSC_VER
# define COMPILE_TIME_ASSERT(expr) /*nada*/
#ifdef EXTREME_DEBUG
# define COMPILE_TIME_ASSERT(expr) typedef char COMP_TIME_ASSERT[(expr) ? 1 : 0];
#else
# ifdef EXTREME_DEBUG
# define COMPILE_TIME_ASSERT(expr) typedef char COMP_TIME_ASSERT[(expr) ? 1 : 0];
# else
# define COMPILE_TIME_ASSERT(expr) /*nada*/
# endif
# define COMPILE_TIME_ASSERT(expr) /*nada*/
#endif
COMPILE_TIME_ASSERT(sizeof(cpu_state_t) <= 128)
#define cpu_state_offset(MEMBER) ((uint8_t) ((uintptr_t) &cpu_state.MEMBER - (uintptr_t) &cpu_state - 128))

30
src/cpu/x87_ops.h
View File

@@ -33,9 +33,6 @@
#endif
#include "x87_timings.h"
#ifdef _MSC_VER
# include <intrin.h>
#endif
#include "x87_ops_conv.h"
#ifdef ENABLE_FPU_LOG
@@ -390,8 +387,7 @@ x87_compare(double a, double b)
if ((fpu_type < FPU_287XL) && !(cpu_state.npxc & 0x1000) && ((a == INFINITY) || (a == -INFINITY)) && ((b == INFINITY) || (b == -INFINITY)))
eb = ea;
# if !defined(_MSC_VER) || defined(__clang__)
/* Memory barrier, to force GCC to write to the input parameters
/* Memory barrier, to force GCC to write to the input parameters
* before the compare rather than after */
__asm volatile(""
:
@@ -406,17 +402,7 @@ x87_compare(double a, double b)
"fnstsw %0\n"
: "=m"(result)
: "m"(ea), "m"(eb));
# else
_ReadWriteBarrier();
_asm
{
fld eb
fld ea
fclex
fcompp
fnstsw result
}
# endif
return result & (FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);
#else
@@ -451,7 +437,6 @@ x87_ucompare(double a, double b)
#ifdef X87_INLINE_ASM
uint32_t result;
# if !defined(_MSC_VER) || defined(__clang__)
/* Memory barrier, to force GCC to write to the input parameters
* before the compare rather than after */
__asm volatile(""
@@ -467,17 +452,6 @@ x87_ucompare(double a, double b)
"fnstsw %0\n"
: "=m"(result)
: "m"(a), "m"(b));
# else
_ReadWriteBarrier();
_asm
{
fld b
fld a
fclex
fcompp
fnstsw result
}
# endif
return result & (FPU_SW_C0 | FPU_SW_C2 | FPU_SW_C3);
#else