Conflict resolution.

.github/workflows/c-cpp.yml

@@ -57,6 +57,7 @@ jobs:
           ${{ matrix.environment.prefix }}-zlib
           ${{ matrix.environment.prefix }}-libpng
           ${{ matrix.environment.prefix }}-libvncserver
+          ${{ matrix.environment.prefix }}-winpthreads
     - uses: actions/checkout@v2
     - name: make
       run: make -fwin/makefile.mingw -j DEV_BUILD=${{ matrix.dev-build }} NEW_DYNAREC=${{ matrix.new-dynarec }} X64=${{ matrix.environment.x64 }} CLANG=${{ matrix.clang }} VNC=n

.github/workflows/cmake.yml

@@ -62,13 +62,16 @@ jobs:
         msystem: ${{ matrix.environment.msystem }}
         install: >-
           ${{ matrix.environment.prefix }}-ninja
-          ${{ matrix.environment.prefix }}-toolchain
+          ${{ matrix.environment.prefix }}-gcc
+          ${{ matrix.environment.prefix }}-clang
+          ${{ matrix.environment.prefix }}-pkg-config
           ${{ matrix.environment.prefix }}-openal
           ${{ matrix.environment.prefix }}-freetype
           ${{ matrix.environment.prefix }}-SDL2
           ${{ matrix.environment.prefix }}-zlib
           ${{ matrix.environment.prefix }}-libpng
           ${{ matrix.environment.prefix }}-libvncserver
+          ${{ matrix.environment.prefix }}-winpthreads
     - uses: actions/checkout@v2
     - name: Configure CMake
       run: >-

CMakeLists.txt

@@ -88,6 +88,10 @@ CMAKE_DEPENDENT_OPTION(VNC "VNC renderer" ON "DEV_BRANCH" OFF)
 CMAKE_DEPENDENT_OPTION(XL24 "ATI VGA Wonder XL24 (ATI-28800-6)" ON "DEV_BRANCH" OFF)
 CMAKE_DEPENDENT_OPTION(VECT486VL "HP Vectra 486VL" ON "DEV_BRANCH" OFF)
 
+if(WIN32)
+	option(PTHREAD "Use POSIX threads (pthreads) instead of Win32 threads" ON)
+endif()
+
 # HACK: Avoid a MSVC2019 compiler bug on ARM64 Debug builds
 if(MSVC_TOOLSET_VERSION GREATER_EQUAL 142 AND ARCH STREQUAL "arm64")
 	# Define a cache option in case somebody wants to disable this workaround

src/CMakeLists.txt

@@ -16,7 +16,7 @@
 # WIN32 marks us as a GUI app on Windows
 add_executable(86Box WIN32 86box.c config.c log.c random.c timer.c io.c acpi.c apm.c
 	dma.c ddma.c nmi.c pic.c pit.c port_6x.c port_92.c ppi.c pci.c mca.c usb.c
-	device.c nvr.c nvr_at.c nvr_ps2.c thread.c)
+	device.c nvr.c nvr_at.c nvr_ps2.c)
 
 if(NEW_DYNAREC)
 	add_compile_definitions(USE_NEW_DYNAREC)
@@ -44,6 +44,18 @@ if(VNC)
 	target_link_libraries(86Box vnc vncserver ws2_32)
 endif()
 
+if(NOT WIN32 OR PTHREAD)
+	target_sources(86Box PRIVATE thread.c)
+	if(WIN32 AND VCPKG_TOOLCHAIN)
+		find_package(pthreads REQUIRED)
+		target_link_libraries(86Box pthreads)
+	else()
+		set(THREADS_PREFER_PTHREAD_FLAG TRUE)
+		find_package(Threads REQUIRED)
+		target_link_libraries(86Box Threads::Threads)
+	endif()
+endif()
+
 target_link_libraries(86Box cpu chipset mch dev mem fdd game cdrom zip mo hdd
 	net print scsi sio snd vid voodoo plat ui)
 

src/codegen/codegen_ops_x86-64.h

@@ -4363,7 +4363,7 @@ static inline int FP_LOAD_REG_INT_W(int reg)
         addbyte(0xc5);
         addbyte((uint8_t)cpu_state_offset(ST));
 
-        CALL_FUNC((uintptr_t)x87_fround);
+        CALL_FUNC((uintptr_t)x87_fround16_64);
         
         addbyte(0x93); /*XCHG EBX, EAX*/
         
@@ -4393,7 +4393,7 @@ static inline int FP_LOAD_REG_INT(int reg)
         addbyte(0xc5);
         addbyte((uint8_t)cpu_state_offset(ST));
 
-        CALL_FUNC((uintptr_t)x87_fround);
+        CALL_FUNC((uintptr_t)x87_fround32_64);
         
         addbyte(0x93); /*XCHG EBX, EAX*/
         

src/cpu/x87_ops.h

@@ -152,6 +152,68 @@ static __inline double x87_pop()
         return t;
 }
 
+static __inline int16_t x87_fround16(double b)
+{
+        int16_t a, c;
+
+        switch ((cpu_state.npxc >> 10) & 3)
+        {
+                case 0: /*Nearest*/
+                a = (int16_t)floor(b);
+                c = (int16_t)floor(b + 1.0);
+                if ((b - a) < (c - b))
+                        return a;
+                else if ((b - a) > (c - b))
+                        return c;
+                else
+                        return (a & 1) ? c : a;
+                case 1: /*Down*/
+                return (int16_t)floor(b);
+                case 2: /*Up*/
+                return (int16_t)ceil(b);
+                case 3: /*Chop*/
+                return (int16_t)b;
+        }
+
+        return 0;
+}
+
+static __inline int64_t x87_fround16_64(double b)
+{
+    return (int64_t) x87_fround16(b);
+}
+
+static __inline int32_t x87_fround32(double b)
+{
+        int32_t a, c;
+
+        switch ((cpu_state.npxc >> 10) & 3)
+        {
+                case 0: /*Nearest*/
+                a = (int32_t)floor(b);
+                c = (int32_t)floor(b + 1.0);
+                if ((b - a) < (c - b))
+                        return a;
+                else if ((b - a) > (c - b))
+                        return c;
+                else
+                        return (a & 1) ? c : a;
+                case 1: /*Down*/
+                return (int32_t)floor(b);
+                case 2: /*Up*/
+                return (int32_t)ceil(b);
+                case 3: /*Chop*/
+                return (int32_t)b;
+        }
+
+        return 0;
+}
+
+static __inline int64_t x87_fround32_64(double b)
+{
+    return (int64_t) x87_fround32(b);
+}
+
 static __inline int64_t x87_fround(double b)
 {
         int64_t a, c;

src/cpu/x87_ops_loadstore.h

@@ -42,24 +42,20 @@ static int opFILDiw_a32(uint32_t fetchdat)
 
 static int opFISTiw_a16(uint32_t fetchdat)
 {
-        int64_t temp64;
         FP_ENTER();
         fetch_ea_16(fetchdat);
 	SEG_CHECK_WRITE(cpu_state.ea_seg);
-        temp64 = x87_fround(ST(0));
+        seteaw(x87_fround16(ST(0)));
-        seteaw((int16_t)temp64);
         CLOCK_CYCLES((fpu_type >= FPU_487SX) ? (x87_timings.fist_16) : (x87_timings.fist_16 * cpu_multi));
         return cpu_state.abrt;
 }
 #ifndef FPU_8087
 static int opFISTiw_a32(uint32_t fetchdat)
 {
-        int64_t temp64;
         FP_ENTER();
         fetch_ea_32(fetchdat);
 	SEG_CHECK_WRITE(cpu_state.ea_seg);
-        temp64 = x87_fround(ST(0));
+        seteaw(x87_fround16(ST(0)));
-        seteaw((int16_t)temp64);
         CLOCK_CYCLES((fpu_type >= FPU_487SX) ? (x87_timings.fist_16) : (x87_timings.fist_16 * cpu_multi));
         return cpu_state.abrt;
 }
@@ -67,12 +63,10 @@ static int opFISTiw_a32(uint32_t fetchdat)
 
 static int opFISTPiw_a16(uint32_t fetchdat)
 {
-        int64_t temp64;
         FP_ENTER();
         fetch_ea_16(fetchdat);
 	SEG_CHECK_WRITE(cpu_state.ea_seg);
-        temp64 = x87_fround(ST(0));
+        seteaw(x87_fround16(ST(0))); if (cpu_state.abrt) return 1;
-        seteaw((int16_t)temp64); if (cpu_state.abrt) return 1;
         x87_pop();
         CLOCK_CYCLES((fpu_type >= FPU_487SX) ? (x87_timings.fist_16) : (x87_timings.fist_16 * cpu_multi));
         return 0;
@@ -80,12 +74,10 @@ static int opFISTPiw_a16(uint32_t fetchdat)
 #ifndef FPU_8087
 static int opFISTPiw_a32(uint32_t fetchdat)
 {
-        int64_t temp64;
         FP_ENTER();
         fetch_ea_32(fetchdat);
 	SEG_CHECK_WRITE(cpu_state.ea_seg);
-        temp64 = x87_fround(ST(0));
+        seteaw(x87_fround16(ST(0))); if (cpu_state.abrt) return 1;
-        seteaw((int16_t)temp64); if (cpu_state.abrt) return 1;
         x87_pop();
         CLOCK_CYCLES((fpu_type >= FPU_487SX) ? (x87_timings.fist_16) : (x87_timings.fist_16 * cpu_multi));
         return 0;
@@ -240,24 +232,20 @@ static int opFILDil_a32(uint32_t fetchdat)
 
 static int opFISTil_a16(uint32_t fetchdat)
 {
-        int64_t temp64;
         FP_ENTER();
         fetch_ea_16(fetchdat);
 	SEG_CHECK_WRITE(cpu_state.ea_seg);
-        temp64 = x87_fround(ST(0));
+        seteal(x87_fround32(ST(0)));
-        seteal((int32_t)temp64);
         CLOCK_CYCLES((fpu_type >= FPU_487SX) ? (x87_timings.fist_32) : (x87_timings.fist_32 * cpu_multi));
         return cpu_state.abrt;
 }
 #ifndef FPU_8087
 static int opFISTil_a32(uint32_t fetchdat)
 {
-        int64_t temp64;
         FP_ENTER();
         fetch_ea_32(fetchdat);
 	SEG_CHECK_WRITE(cpu_state.ea_seg);
-        temp64 = x87_fround(ST(0));
+        seteal(x87_fround32(ST(0)));
-        seteal((int32_t)temp64);
         CLOCK_CYCLES((fpu_type >= FPU_487SX) ? (x87_timings.fist_32) : (x87_timings.fist_32 * cpu_multi));
         return cpu_state.abrt;
 }
@@ -265,12 +253,10 @@ static int opFISTil_a32(uint32_t fetchdat)
 
 static int opFISTPil_a16(uint32_t fetchdat)
 {
-        int64_t temp64;
         FP_ENTER();
         fetch_ea_16(fetchdat);
 	SEG_CHECK_WRITE(cpu_state.ea_seg);
-        temp64 = x87_fround(ST(0));
+        seteal(x87_fround32(ST(0))); if (cpu_state.abrt) return 1;
-        seteal((int32_t)temp64); if (cpu_state.abrt) return 1;
         x87_pop();
         CLOCK_CYCLES((fpu_type >= FPU_487SX) ? (x87_timings.fist_32) : (x87_timings.fist_32 * cpu_multi));
         return 0;
@@ -278,12 +264,10 @@ static int opFISTPil_a16(uint32_t fetchdat)
 #ifndef FPU_8087
 static int opFISTPil_a32(uint32_t fetchdat)
 {
-        int64_t temp64;
         FP_ENTER();
         fetch_ea_32(fetchdat);
 	SEG_CHECK_WRITE(cpu_state.ea_seg);
-        temp64 = x87_fround(ST(0));
+        seteal(x87_fround32(ST(0))); if (cpu_state.abrt) return 1;
-        seteal((int32_t)temp64); if (cpu_state.abrt) return 1;
         x87_pop();
         CLOCK_CYCLES((fpu_type >= FPU_487SX) ? (x87_timings.fist_32) : (x87_timings.fist_32 * cpu_multi));
         return 0;

src/floppy/fdc.c

@@ -1892,9 +1892,10 @@ fdc_is_verify(fdc_t *fdc)
 
 
 int
-fdc_data(fdc_t *fdc, uint8_t data)
+fdc_data(fdc_t *fdc, uint8_t data, int last)
 {
-    int result = 0;
+    int i, result = 0;
+    int n;
 
     if (fdc->deleted & 2) {
 	/* We're in a VERIFY command, so return with 0. */
@@ -1924,27 +1925,39 @@ fdc_data(fdc_t *fdc, uint8_t data)
 		}
 	}
     } else {
-	result = dma_channel_write(fdc->dma_ch, data);
-
 	if (fdc->tc)
 		return -1;
 
-	if (result & DMA_OVER) {
+	if (!fdc->fifo || (fdc->tfifo < 1)) {
+		dma_channel_write(fdc->dma_ch, data);
+
 		fdc->data_ready = 1;
 		fdc->stat = 0xd0;
+
+		if (result & DMA_OVER) {
 			fdc->tc = 1;
 			return -1;
 		}
-
-	if (!fdc->fifo || (fdc->tfifo < 1)) {
-		fdc->data_ready = 1;
-		fdc->stat = 0xd0;
 	} else {
-		fdc_fifo_buf_advance(fdc);
+		/* FIFO enabled */
-		if (fdc->fifobufpos == 0) {
+		fdc_fifo_buf_write(fdc, data);
+		if (last || (fdc->fifobufpos == 0)) {
 			/* We have wrapped around, means FIFO is over */
 			fdc->data_ready = 1;
 			fdc->stat = 0xd0;
+
+			n = (fdc->fifobufpos > 0) ? (fdc->fifobufpos - 1) : fdc->tfifo;
+			if (fdc->fifobufpos > 0)
+				fdc->fifobufpos = 0;
+
+			for (i = 0; i <= n; i++) {
+				result = dma_channel_write(fdc->dma_ch, fdc->fifobuf[i]);
+
+				if (result & DMA_OVER) {
+					fdc->tc = 1;
+					return -1;
+				}
+			}
 		}
 	}
     }
@@ -2057,10 +2070,10 @@ fdc_writeprotect(fdc_t *fdc)
 
 int fdc_getdata(fdc_t *fdc, int last)
 {
-    int data;
+    int i, data = 0;
 
     if ((fdc->flags & FDC_FLAG_PCJR) || !fdc->dma) {
-	if ((fdc->flags & FDC_FLAG_PCJR) || !fdc->fifo) {
+	if ((fdc->flags & FDC_FLAG_PCJR) || !fdc->fifo || (fdc->tfifo < 1)) {
 		data = fdc->dat;
 
 		if (!last)
@@ -2072,20 +2085,32 @@ int fdc_getdata(fdc_t *fdc, int last)
 			fdc->stat = 0xb0;
 	}
     } else {
+	if (!fdc->fifo || (fdc->tfifo < 1)) {
 		data = dma_channel_read(fdc->dma_ch);
 
-	if (!fdc->fifo) {
+		if (data & DMA_OVER)
+			fdc->tc = 1;
+
 		if (!last)
 			fdc->stat = 0x90;
 	} else {
-		fdc_fifo_buf_advance(fdc);
+		if (fdc->fifobufpos == 0) {
+			for (i = 0; i <= fdc->tfifo; i++) {
+				data = dma_channel_read(fdc->dma_ch);
+				fdc->fifobuf[i] = data;
+
+				if (data & DMA_OVER) {
+					fdc->tc = 1;
+					break;
+				}
+			}
+		}
+
+		data = fdc_fifo_buf_read(fdc);
 
 		if (!last && (fdc->fifobufpos == 0))
 			fdc->stat = 0x90;
 	}
-
-	if (data & DMA_OVER)
-		fdc->tc = 1;
     }
 
     return data & 0xff;

src/floppy/fdd_86f.c

@@ -1577,7 +1577,7 @@ d86f_read_sector_data(int drive, int side)
 			} else {
 				if (dev->data_find.bytes_obtained < d86f_get_data_len(drive)) {
 					if (dev->state != STATE_16_VERIFY_DATA) {
-						read_status = fdc_data(d86f_fdc, data);
+						read_status = fdc_data(d86f_fdc, data, dev->data_find.bytes_obtained == ((d86f_get_data_len(drive)) - 1));
 						if (read_status == -1)
 							dev->dma_over++;
 					}
@@ -2139,7 +2139,7 @@ d86f_turbo_read(int drive, int side)
     } else {
 	if (dev->data_find.bytes_obtained < (128UL << dev->last_sector.id.n)) {
 		if (dev->state != STATE_16_VERIFY_DATA) {
-			read_status = fdc_data(d86f_fdc, dat);
+			read_status = fdc_data(d86f_fdc, dat, dev->data_find.bytes_obtained == ((128UL << dev->last_sector.id.n) - 1));
 			if (read_status == -1)
 				dev->dma_over++;
 		}

src/include/86box/fdc.h

@@ -157,7 +157,7 @@ extern void	fdc_set_base(fdc_t *fdc, int base);
 extern void	fdc_set_irq(fdc_t *fdc, int irq);
 extern void	fdc_set_dma_ch(fdc_t *fdc, int dma_ch);
 extern int	fdc_getdata(fdc_t *fdc, int last);
-extern int	fdc_data(fdc_t *fdc, uint8_t data);
+extern int	fdc_data(fdc_t *fdc, uint8_t data, int last);
 
 extern void	fdc_sectorid(fdc_t *fdc, uint8_t track, uint8_t side,
 			     uint8_t sector, uint8_t size, uint8_t crc1,

src/unix/CMakeLists.txt

@@ -12,7 +12,6 @@ add_library(plat STATIC ${PLAT_SOURCES})
 add_library(ui STATIC unix.c unix_sdl.c unix_cdrom.c)
 target_compile_definitions(ui PUBLIC _FILE_OFFSET_BITS=64)
 target_link_libraries(ui dl)
-target_link_libraries(plat pthread)
 if (ALSA_FOUND)
     target_link_libraries(plat ALSA::ALSA)
 endif()

src/win/CMakeLists.txt

@@ -58,5 +58,9 @@ if(OPENGL)
 	target_sources(ui PRIVATE glad.c win_opengl.c win_opengl_glslp.c)
 endif()
 
+if(NOT PTHREAD)
+	target_sources(plat PRIVATE win_thread.c)
+endif()
+
 target_link_libraries(86Box advapi32 comctl32 comdlg32 gdi32 shell32 iphlpapi
 	dxguid imm32 hid setupapi uxtheme version winmm psapi)

vcpkg.json

@@ -8,6 +8,7 @@
 		"freetype",
 		"libpng",
 		"openal-soft",
-		"sdl2"
+		"sdl2",
+		"pthreads"
 	]
 }