Current WIP code.

2020-02-29 19:12:23 +01:00
parent 3b6cc393eb
commit 490c04fcae
882 changed files with 37763 additions and 9455 deletions
--- a/src/win/Makefile.mingw
+++ b/src/win/Makefile.mingw
@@ -8,7 +8,7 @@
 #
 #		Makefile for Win32 (MinGW32) environment.
 #
-# Version:	@(#)Makefile.mingw	1.0.142	2020/01/18
+# Version:	@(#)Makefile.mingw	1.0.143	2020/01/25
 #
 # Authors:	Miran Grca, <mgrca8@gmail.com>
 #               Fred N. van Kempen, <decwiz@yahoo.com>
@@ -266,7 +266,7 @@ endif
 #########################################################################
 #		Nothing should need changing from here on..		#
 #########################################################################
-VPATH		:= $(EXPATH) . cpu \
+VPATH		:= $(EXPATH) . cpu cpu_common \
 		   cdrom chipset disk floppy game machine \
 		   printer \
 		   sound \
@@ -300,6 +300,17 @@ DEPFILE		:= win/.depends

 # Set up the correct toolchain flags.
 OPTS		:= $(EXTRAS) $(STUFF)
+ifeq ($(WX), y)
+OPTS		+= -I. \
+		   -Icpu -Icpu_common \
+		   -Icdrom -Ichipset -Idisk -Ifloppy -Igame -Imachine -Inetwork \
+		   -Iprinter -Isound -Iscsi -Ivideo -Ilang
+else
+OPTS		+= -iquote . \
+		   -iquote cpu -iquote cpu_common \
+		   -iquote cdrom -iquote chipset -iquote disk -iquote floppy -iquote game -iquote machine -iquote network \
+		   -iquote printer -iquote sound -iquote scsi -iquote video -iquote lang
+endif
 ifdef EXFLAGS
 OPTS		+= $(EXFLAGS)
 endif
@@ -338,7 +349,7 @@ else
  endif
 endif
 endif
-AFLAGS		:= -msse2 -mfpmath=sse
+AFLAGS		:= -msse2 -mfpmath=387
 ifeq ($(ARM), y)
 DFLAGS	  := -march=armv7-a
 AOPTIM	  :=
@@ -539,8 +550,9 @@ endif

 # Final versions of the toolchain flags.
 CFLAGS		:= $(WX_FLAGS) $(OPTS) $(DFLAGS) $(COPTIM) $(AOPTIM) \
-		   $(AFLAGS) -fomit-frame-pointer -mstackrealign -Wall \
+		   $(AFLAGS) -pipe -fomit-frame-pointer -mstackrealign -Wall \
 		   -fno-strict-aliasing
+# -funroll-loops

 # Add freetyp2 references through pkgconfig
 CFLAGS          := $(CFLAGS)  `pkg-config.exe --cflags freetype2`
@@ -559,7 +571,8 @@ INTELOBJ	:= intel_flash.o \
 		    intel_sio.o intel_piix.o

 CPUOBJ		:= cpu.o cpu_table.o \
-		    808x.o 386.o \
+		    808x.o \
+		    386.o 386_common.o \
 		    386_dynarec.o \
 		    x86seg.o x87.o \
 		    $(DYNARECOBJ)
@@ -588,7 +601,9 @@ DEVOBJ		:= bugger.o ibm_5161.o isamem.o isartc.o lpt.o $(SERIAL) \
 		    sio_acc3221.o \
 		    sio_fdc37c66x.o sio_fdc37c669.o \
 		    sio_fdc37c93x.o \
-		    sio_pc87306.o sio_w83877f.o \
+		    sio_pc87306.o \
+		    sio_w83787f.o \
+		    sio_w83877f.o sio_w83977f.o \
 		    sio_um8669f.o \
 		   keyboard.o \
 		    keyboard_xt.o keyboard_at.o \
@@ -788,7 +803,7 @@ all:		$(PROG).exe pcap_if.exe

 $(PROG).exe:	$(OBJ) 86Box.res
 		@echo Linking $(PROG).exe ..
-		@$(CC) -o $(PROG).exe $(OBJ) 86Box.res $(LIBS)
+		@$(CC) -o $(PROG).exe $(OBJ) 86Box.res $(LIBS) -pipe
 ifneq ($(DEBUG), y)
 		@$(STRIP) $(PROG).exe
 endif
--- a/src/win/Makefile_ndr.mingw
+++ b/src/win/Makefile_ndr.mingw
@@ -8,7 +8,7 @@
 #
 #		Makefile for Win32 (MinGW32) environment.
 #
-# Version:	@(#)Makefile.mingw	1.0.141	2020/01/14
+# Version:	@(#)Makefile.mingw	1.0.142	2020/01/25
 #
 # Authors:	Miran Grca, <mgrca8@gmail.com>
 #               Fred N. van Kempen, <decwiz@yahoo.com>
@@ -266,7 +266,7 @@ endif
 #########################################################################
 #		Nothing should need changing from here on..		#
 #########################################################################
-VPATH		:= $(EXPATH) . cpu_new \
+VPATH		:= $(EXPATH) . cpu_new cpu_common \
 		   cdrom chipset disk floppy game machine \
 		   printer \
 		   sound \
@@ -300,6 +300,17 @@ DEPFILE		:= win/.depends

 # Set up the correct toolchain flags.
 OPTS		:= $(EXTRAS) $(STUFF)
+ifeq ($(WX), y)
+OPTS		+= -I. \
+		   -Icpu_new -Icpu_common \
+		   -Icdrom -Ichipset -Idisk -Ifloppy -Igame -Imachine -Inetwork \
+		   -Iprinter -Isound -Iscsi -Ivideo -Ilang
+else
+OPTS		+= -iquote . \
+		   -iquote cpu_new -iquote cpu_common \
+		   -iquote cdrom -iquote chipset -iquote disk -iquote floppy -iquote game -iquote machine -iquote network \
+		   -iquote printer -iquote sound -iquote scsi -iquote video -iquote lang
+endif
 ifdef EXFLAGS
 OPTS		+= $(EXFLAGS)
 endif
@@ -558,14 +569,15 @@ CXXFLAGS	:= $(CFLAGS)
 #		Create the (final) list of objects to build.		#
 #########################################################################
 MAINOBJ		:= pc.o config.o random.o timer.o io.o apm_new.o dma.o nmi.o \
-		   pic.o pit.o port_92.o ppi.o pci.o mca.o mcr.o mem_new.o \
+		   pic.o pit.o port_92.o ppi.o pci.o mca.o mcr.o mem.o \
 		   rom.o device.o nvr.o nvr_at.o nvr_ps2.o sst_flash.o via_vt82c586b.o $(VNCOBJ) $(RDPOBJ)

 INTELOBJ	:= intel_flash.o \
 		    intel_sio.o intel_piix.o

 CPUOBJ		:= cpu.o cpu_table.o \
-		    808x.o 386.o 386_common.o \
+		    808x.o \
+		    386.o 386_common.o \
 		    386_dynarec.o \
 		    x86seg.o x87.o \
 		    $(DYNARECOBJ)
@@ -575,7 +587,7 @@ CHIPSETOBJ	:= acc2168.o acer_m3a.o ali1429.o headland.o \
 		    sis_85c471.o sis_85c496.o \
 		    via_mvp3.o wd76c10.o

-MCHOBJ		:= machine.o machine_table_new.o \
+MCHOBJ		:= machine.o machine_table.o \
 		    m_xt.o m_xt_compaq.o \
 		    m_xt_t1000.o m_xt_t1000_vid.o \
 		    m_xt_xi8088.o m_xt_zenith.o \
@@ -594,7 +606,9 @@ DEVOBJ		:= bugger.o ibm_5161.o isamem.o isartc.o lpt.o $(SERIAL) \
 		    sio_acc3221.o \
 		    sio_fdc37c66x.o sio_fdc37c669.o \
 		    sio_fdc37c93x.o \
-		    sio_pc87306.o sio_w83877f.o \
+		    sio_pc87306.o \
+		    sio_w83787f.o \
+		    sio_w83877f.o sio_w83977f.o \
 		    sio_um8669f.o \
 		   keyboard.o \
 		    keyboard_xt.o keyboard_at.o \
--- a/src/win/win.c
+++ b/src/win/win.c
@@ -30,18 +30,18 @@
 #include <time.h>
 #include <wchar.h>
 #define HAVE_STDARG_H
-#include "../86box.h"
-#include "../config.h"
-#include "../device.h"
-#include "../keyboard.h"
-#include "../mouse.h"
-#include "../video/video.h"
+#include "86box.h"
+#include "config.h"
+#include "device.h"
+#include "keyboard.h"
+#include "mouse.h"
+#include "video.h"
 #define GLOBAL
-#include "../plat.h"
-#include "../plat_midi.h"
-#include "../ui.h"
+#include "plat.h"
+#include "plat_midi.h"
+#include "ui.h"
 #ifdef USE_VNC
-# include "../vnc.h"
+# include "vnc.h"
 #endif
 # include "win_d2d.h"
 # include "win_sdl.h"
--- a/src/win/win_about.c
+++ b/src/win/win_about.c
@@ -26,8 +26,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "../86box.h"
-#include "../plat.h"
+#include "86box.h"
+#include "plat.h"
 #include "win.h"


--- a/src/win/win_cdrom.c
+++ b/src/win/win_cdrom.c
@@ -27,14 +27,14 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "../config.h"
-#include "../disk/hdd.h"
-#include "../scsi/scsi_device.h"
-#include "../cdrom/cdrom.h"
-#include "../disk/zip.h"
-#include "../scsi/scsi_disk.h"
-#include "../plat.h"
-#include "../ui.h"
+#include "config.h"
+#include "hdd.h"
+#include "scsi_device.h"
+#include "cdrom.h"
+#include "zip.h"
+#include "scsi_disk.h"
+#include "plat.h"
+#include "ui.h"
 #include "win.h"


--- a/src/win/win_crashdump.c
+++ b/src/win/win_crashdump.c
@@ -25,8 +25,8 @@
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
-#include "../86box.h"
-#include "../plat.h"
+#include "86box.h"
+#include "plat.h"
 #include "win.h"


--- a/src/win/win_d2d.c
+++ b/src/win/win_d2d.c
@@ -27,12 +27,12 @@
 #undef BITMAP

 #define HAVE_STDARG_H
-#include "../86box.h"
-#include "../device.h"
-#include "../video/video.h"
-#include "../plat.h"
-#include "../plat_dynld.h"
-#include "../ui.h"
+#include "86box.h"
+#include "device.h"
+#include "video.h"
+#include "plat.h"
+#include "plat_dynld.h"
+#include "ui.h"
 #include "win.h"
 #include "win_d2d.h"

--- a/src/win/win_devconf.c
+++ b/src/win/win_devconf.c
@@ -21,12 +21,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#include "../86box.h"
-#include "../config.h"
-#include "../device.h"
-#include "../plat.h"
-#include "../plat_midi.h"
-#include "../ui.h"
+#include "86box.h"
+#include "config.h"
+#include "device.h"
+#include "plat.h"
+#include "plat_midi.h"
+#include "ui.h"
 #include "win.h"
 #include <windowsx.h>

--- a/src/win/win_dialog.c
+++ b/src/win/win_dialog.c
@@ -27,10 +27,10 @@
 #include <string.h>
 #include <wchar.h>
 #define HAVE_STDARG_H
-#include "../86box.h"
-#include "../device.h"
-#include "../plat.h"
-#include "../ui.h"
+#include "86box.h"
+#include "device.h"
+#include "plat.h"
+#include "ui.h"
 #include "win.h"


--- a/src/win/win_discord.c
+++ b/src/win/win_discord.c
@@ -22,15 +22,11 @@
 #include <stringapiset.h>
 #include <time.h>
 #define HAVE_STDARG_H
-#include "../86box.h"
-#ifdef USE_NEW_DYNAREC
- #include "../cpu_new/cpu.h"
-#else
- #include "../cpu/cpu.h"
-#endif
-#include "../machine/machine.h"
-#include "../plat.h"
-#include "../plat_dynld.h"
+#include "86box.h"
+#include "cpu.h"
+#include "machine.h"
+#include "plat.h"
+#include "plat_dynld.h"
 #include "win_discord.h"
 #include "discord_game_sdk.h"

--- a/src/win/win_dynld.c
+++ b/src/win/win_dynld.c
@@ -22,8 +22,8 @@
 #include <wchar.h>
 #include <windows.h>
 #define HAVE_STDARG_H
-#include "../86box.h"
-#include "../plat_dynld.h"
+#include "86box.h"
+#include "plat_dynld.h"


 #ifdef ENABLE_DYNLD_LOG
--- a/src/win/win_joystick.cpp
+++ b/src/win/win_joystick.cpp
@@ -23,10 +23,10 @@
 #include <stdint.h>
 #include <stdio.h>
 #define HAVE_STDARG_H
-#include "../86box.h"
-#include "../device.h"
-#include "../plat.h"
-#include "../game/gameport.h"
+#include "86box.h"
+#include "device.h"
+#include "plat.h"
+#include "gameport.h"
 #include "win.h"


--- a/src/win/win_joystick_xinput.cpp
+++ b/src/win/win_joystick_xinput.cpp
@@ -24,10 +24,10 @@
 #include <stdint.h>
 #include <stdio.h>
 #define HAVE_STDARG_H
-#include "../86box.h"
-#include "../device.h"
-#include "../plat.h"
-#include "../game/gameport.h"
+#include "86box.h"
+#include "device.h"
+#include "plat.h"
+#include "gameport.h"
 #include "win.h"

 #define XINPUT_MAX_JOYSTICKS 4
--- a/src/win/win_jsconf.c
+++ b/src/win/win_jsconf.c
@@ -7,11 +7,11 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
-#include "../86box.h"
-#include "../config.h"
-#include "../device.h"
-#include "../game/gameport.h"
-#include "../plat.h"
+#include "86box.h"
+#include "config.h"
+#include "device.h"
+#include "gameport.h"
+#include "plat.h"
 #include "win.h"


--- a/src/win/win_keyboard.c
+++ b/src/win/win_keyboard.c
@@ -24,10 +24,10 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "../86box.h"
-#include "../device.h"
-#include "../keyboard.h"
-#include "../plat.h"
+#include "86box.h"
+#include "device.h"
+#include "keyboard.h"
+#include "plat.h"
 #include "win.h"


--- a/src/win/win_midi.c
+++ b/src/win/win_midi.c
@@ -4,11 +4,11 @@
 #include <stdio.h>
 #include <string.h>
 #include <wchar.h>
-#include "../86box.h"
-#include "../config.h"
-#include "../sound/midi.h"
-#include "../plat.h"
-#include "../plat_midi.h"
+#include "86box.h"
+#include "config.h"
+#include "midi.h"
+#include "plat.h"
+#include "plat_midi.h"


 typedef struct
--- a/src/win/win_mouse.c
+++ b/src/win/win_mouse.c
@@ -22,9 +22,9 @@
 #include <windowsx.h>
 #include <stdio.h>
 #include <stdint.h>
-#include "../86box.h"
-#include "../mouse.h"
-#include "../plat.h"
+#include "86box.h"
+#include "mouse.h"
+#include "plat.h"
 #include "win.h"

 int mouse_capture;
--- a/src/win/win_new_floppy.c
+++ b/src/win/win_new_floppy.c
@@ -25,12 +25,12 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "../86box.h"
-#include "../plat.h"
-#include "../random.h"
-#include "../ui.h"
-#include "../scsi/scsi_device.h"
-#include "../disk/zip.h"
+#include "86box.h"
+#include "plat.h"
+#include "random.h"
+#include "ui.h"
+#include "scsi_device.h"
+#include "zip.h"
 #include "win.h"


--- a/src/win/win_opendir.c
+++ b/src/win/win_opendir.c
@@ -25,8 +25,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "../86box.h"
-#include "../plat.h"
+#include "86box.h"
+#include "plat.h"
 #include "plat_dir.h"


--- a/src/win/win_sdl.c
+++ b/src/win/win_sdl.c
@@ -62,12 +62,12 @@
 /* This #undef is needed because a SDL include header redefines HAVE_STDARG_H. */
 #undef HAVE_STDARG_H
 #define HAVE_STDARG_H
-#include "../86box.h"
-#include "../device.h"
-#include "../plat.h"
-#include "../plat_dynld.h"
-#include "../video/video.h"
-#include "../ui.h"
+#include "86box.h"
+#include "device.h"
+#include "plat.h"
+#include "plat_dynld.h"
+#include "video.h"
+#include "ui.h"
 #include "win.h"
 #include "win_sdl.h"

--- a/src/win/win_settings.c
+++ b/src/win/win_settings.c
@@ -30,38 +30,36 @@
 #include <stdio.h>
 #include <string.h>
 #include <wchar.h>
-#include "../86box.h"
-#include "../config.h"
-#include "../cpu/cpu.h"
-#include "../mem.h"
-#include "../rom.h"
-#include "../device.h"
-#include "../timer.h"
-#include "../nvr.h"
-#include "../machine/machine.h"
-#include "../game/gameport.h"
-#include "../isamem.h"
-#include "../isartc.h"
-#include "../lpt.h"
-#include "../mouse.h"
-#include "../scsi/scsi.h"
-#include "../scsi/scsi_device.h"
-#include "../cdrom/cdrom.h"
-#include "../disk/hdd.h"
-#include "../disk/hdc.h"
-#include "../disk/hdc_ide.h"
-#include "../disk/zip.h"
-#include "../floppy/fdd.h"
-#include "../network/network.h"
-#include "../sound/sound.h"
-#include "../sound/midi.h"
-#include "../sound/snd_mpu401.h"
-#include "../sound/snd_gus.h"
-#include "../video/video.h"
-#include "../video/vid_voodoo.h"
-#include "../plat.h"
-#include "../plat_midi.h"
-#include "../ui.h"
+#include "86box.h"
+#include "config.h"
+#include "cpu.h"
+#include "mem.h"
+#include "rom.h"
+#include "device.h"
+#include "timer.h"
+#include "nvr.h"
+#include "machine.h"
+#include "gameport.h"
+#include "isamem.h"
+#include "isartc.h"
+#include "lpt.h"
+#include "mouse.h"
+#include "scsi.h"
+#include "scsi_device.h"
+#include "cdrom.h"
+#include "hdd.h"
+#include "hdc.h"
+#include "hdc_ide.h"
+#include "zip.h"
+#include "fdd.h"
+#include "network.h"
+#include "sound.h"
+#include "midi.h"
+#include "snd_mpu401.h"
+#include "video.h"
+#include "plat.h"
+#include "plat_midi.h"
+#include "ui.h"
 #include "win.h"


--- a/src/win/win_snd_gain.c
+++ b/src/win/win_snd_gain.c
@@ -25,10 +25,10 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "../86box.h"
-#include "../config.h"
-#include "../plat.h"
-#include "../sound/sound.h"
+#include "86box.h"
+#include "config.h"
+#include "plat.h"
+#include "sound.h"
 #include "win.h"


--- a/src/win/win_stbar.c
+++ b/src/win/win_stbar.c
@@ -28,27 +28,27 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "../86box.h"
-#include "../config.h"
-#include "../cpu/cpu.h"
-#include "../device.h"
-#include "../machine/machine.h"
-#include "../timer.h"
-#include "../disk/hdd.h"
-#include "../disk/hdc.h"
-#include "../floppy/fdd.h"
-#include "../floppy/fdd_86f.h"
-#include "../scsi/scsi.h"
-#include "../scsi/scsi_device.h"
-#include "../cdrom/cdrom.h"
-#include "../disk/zip.h"
-#include "../cdrom/cdrom_image.h"
-#include "../scsi/scsi_disk.h"
-#include "../network/network.h"
-#include "../video/video.h"
-#include "../sound/sound.h"
-#include "../plat.h"
-#include "../ui.h"
+#include "86box.h"
+#include "config.h"
+#include "cpu.h"
+#include "device.h"
+#include "machine.h"
+#include "timer.h"
+#include "hdd.h"
+#include "hdc.h"
+#include "fdd.h"
+#include "fdd_86f.h"
+#include "scsi.h"
+#include "scsi_device.h"
+#include "cdrom.h"
+#include "zip.h"
+#include "cdrom_image.h"
+#include "scsi_disk.h"
+#include "network.h"
+#include "video.h"
+#include "sound.h"
+#include "plat.h"
+#include "ui.h"
 #include "win.h"

 #ifndef GWL_WNDPROC
--- a/src/win/win_thread.c
+++ b/src/win/win_thread.c
@@ -27,8 +27,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "../86box.h"
-#include "../plat.h"
+#include "86box.h"
+#include "plat.h"


 typedef struct {
--- a/src/win/win_ui.c
+++ b/src/win/win_ui.c
@@ -28,16 +28,16 @@
 #include <stdlib.h>
 #include <time.h>
 #include <wchar.h>
-#include "../86box.h"
-#include "../config.h"
-#include "../device.h"
-#include "../keyboard.h"
-#include "../mouse.h"
-#include "../video/video.h"
-#include "../video/vid_ega.h"		// for update_overscan
-#include "../plat.h"
-#include "../plat_midi.h"
-#include "../ui.h"
+#include "86box.h"
+#include "config.h"
+#include "device.h"
+#include "keyboard.h"
+#include "mouse.h"
+#include "video.h"
+#include "vid_ega.h"		// for update_overscan
+#include "plat.h"
+#include "plat_midi.h"
+#include "ui.h"
 #include "win.h"
 #ifdef USE_DISCORD
 # include "win_discord.h"