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

2022-06-28 12:11:21 -04:00
parent 8d6fec4f0d 1ea3634efc
commit 4f08c464f2
123 changed files with 225159 additions and 991 deletions
--- a/src/cpu/x86.c
+++ b/src/cpu/x86.c
@@ -343,7 +343,7 @@ softresetx86(void)
    if (soft_reset_mask)
 	return;

-    if (ibm8514_enabled)
+    if (ibm8514_enabled || xga_enabled)
        vga_on = 1;

    reset_common(0);
--- a/src/cpu/x87_ops.h
+++ b/src/cpu/x87_ops.h
@@ -387,9 +387,9 @@ static __inline uint16_t x87_ucompare(double a, double b)
 #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 ("" : : : "memory");
+        __asm volatile ("" : : : "memory");

-        asm(
+        __asm(
                "fldl %2\n"
                "fldl %1\n"
                "fclex\n"