From 0c46c7cbfddfe86310aea5697307c721169a606e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= <dhrdlicka@users.noreply.github.com>
Date: Mon, 4 May 2020 17:17:43 +0200
Subject: [PATCH 01/12] Update bug_report.md

---
 .github/ISSUE_TEMPLATE/bug_report.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 78e124c52..0e3472957 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -25,7 +25,8 @@ If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
  - OS: [e.g. Windows 10]
- - Version [e.g. v2.06]
+ - Version [e.g. v2.06 build 2007]
+ - Build type [i.e. regular, optimized, or dev]
 
 **Additional context**
-Add any other context about the problem here.
+Add any other context about the problem here. If you are using an Optimized build, make sure to try the regular build too before filing a bug report!

From 720bfa277bbd123a4f547466e5b4f6537f3da517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= <dhrdlicka@users.noreply.github.com>
Date: Tue, 5 May 2020 21:05:56 +0200
Subject: [PATCH 02/12] Update win.c

---
 src/win/win.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/win/win.c b/src/win/win.c
index e8d2af475..9bdb91a56 100644
--- a/src/win/win.c
+++ b/src/win/win.c
@@ -362,10 +362,6 @@ WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpszArg, int nCmdShow)
     /* Set the application version ID string. */
     sprintf(emu_version, "%s v%s", EMU_NAME, EMU_VERSION);
 
-    /* Enable crash dump services. */
-    if (enable_crashdump)
-	InitCrashDump();
-
     /* First, set our (default) language. */
     set_language(0x0409);
 
@@ -389,6 +385,10 @@ WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpszArg, int nCmdShow)
 	free(argw);
 	return(1);
     }
+	
+    /* Enable crash dump services. */
+    if (enable_crashdump)
+	InitCrashDump();
 
     if (force_debug)
 	atexit(CloseConsole);

From 23739b3dc669a5fd9e92ac40e88adb541dd8ca79 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Wed, 6 May 2020 00:22:21 +0200
Subject: [PATCH 03/12] Some CPU fixes, fixes #736.

---
 src/cpu/codegen_x86-64.c | 2 +-
 src/cpu/codegen_x86.c    | 2 +-
 src/cpu_common/cpu.c     | 5 +----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/cpu/codegen_x86-64.c b/src/cpu/codegen_x86-64.c
index 051a3b414..8c3d87387 100644
--- a/src/cpu/codegen_x86-64.c
+++ b/src/cpu/codegen_x86-64.c
@@ -1083,7 +1083,7 @@ generate_call:
                 int jump_cycles = 0;
 
 		if (codegen_timing_jump_cycles != NULL)
-			codegen_timing_jump_cycles();
+			jump_cycles = codegen_timing_jump_cycles();
 
                 if (jump_cycles)
                 {
diff --git a/src/cpu/codegen_x86.c b/src/cpu/codegen_x86.c
index 8755f2cd2..85e2af2b1 100644
--- a/src/cpu/codegen_x86.c
+++ b/src/cpu/codegen_x86.c
@@ -2047,7 +2047,7 @@ generate_call:
                 int jump_cycles = 0;
 
 		if (codegen_timing_jump_cycles != NULL)
-			codegen_timing_jump_cycles();
+			jump_cycles = codegen_timing_jump_cycles();
 
                 if (jump_cycles)
                 {
diff --git a/src/cpu_common/cpu.c b/src/cpu_common/cpu.c
index 79728c50e..0c643f9d9 100644
--- a/src/cpu_common/cpu.c
+++ b/src/cpu_common/cpu.c
@@ -2210,10 +2210,7 @@ cpu_CPUID(void)
                 {
                         EAX = CPUID;
                         EBX = ECX = 0;
-                        EDX = CPUID_FPU | CPUID_VME | CPUID_PSE | CPUID_TSC | CPUID_MSR | CPUID_PAE | CPUID_CMPXCHG8B | CPUID_MTRR/* | CPUID_SEP*/ | CPUID_CMOV;
-#ifdef USE_SEP
-			EDX |= CPUID_SEP;
-#endif
+                        EDX = CPUID_FPU | CPUID_VME | CPUID_PSE | CPUID_TSC | CPUID_MSR | CPUID_PAE | CPUID_CMPXCHG8B | CPUID_MTRR | CPUID_SEP | CPUID_CMOV;
                 }
 		else if (EAX == 2)
 		{

From 3027422e88da5e0b4e11a99885cbdc2947df4d51 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Wed, 6 May 2020 00:23:07 +0200
Subject: [PATCH 04/12] PCI graphics cards now correctly use PCI timings
 instead of VLB timings.

---
 src/include/86box/vid_svga.h |  2 +-
 src/include/86box/video.h    |  3 +-
 src/video/vid_ati18800.c     |  4 +-
 src/video/vid_ati28800.c     |  4 +-
 src/video/vid_ati_mach64.c   | 54 ++++++++++++++++------
 src/video/vid_cl54xx.c       | 45 ++++++++++++++-----
 src/video/vid_et4000.c       |  6 +--
 src/video/vid_et4000w32.c    | 10 +++--
 src/video/vid_ht216.c        | 21 ++++++---
 src/video/vid_mga.c          |  4 +-
 src/video/vid_oak_oti.c      |  2 +-
 src/video/vid_paradise.c     |  6 +--
 src/video/vid_s3.c           | 86 ++++++++++++++++++++++++++----------
 src/video/vid_s3_virge.c     | 26 ++++++++---
 src/video/vid_svga.c         | 23 +++++++---
 src/video/vid_svga_render.c  |  1 +
 src/video/vid_tgui9440.c     | 10 +++--
 src/video/vid_ti_cf62011.c   |  2 +-
 src/video/vid_tvga.c         |  2 +-
 src/video/vid_vga.c          |  4 +-
 src/video/video.c            |  8 ++++
 21 files changed, 232 insertions(+), 91 deletions(-)

diff --git a/src/include/86box/vid_svga.h b/src/include/86box/vid_svga.h
index 7c3cf291b..d1495ebbd 100644
--- a/src/include/86box/vid_svga.h
+++ b/src/include/86box/vid_svga.h
@@ -143,7 +143,7 @@ typedef struct svga_t
 } svga_t;
 
 
-extern int	svga_init(svga_t *svga, void *p, int memsize, 
+extern int	svga_init(const device_t *info, svga_t *svga, void *p, int memsize, 
 			  void (*recalctimings_ex)(struct svga_t *svga),
 			  uint8_t (*video_in) (uint16_t addr, void *p),
 			  void    (*video_out)(uint16_t addr, uint8_t val, void *p),
diff --git a/src/include/86box/video.h b/src/include/86box/video.h
index 04f81c628..230d9623b 100644
--- a/src/include/86box/video.h
+++ b/src/include/86box/video.h
@@ -47,7 +47,8 @@ extern "C" {
 enum {
     VIDEO_ISA = 0,
     VIDEO_MCA,
-    VIDEO_BUS
+    VIDEO_BUS,
+    VIDEO_PCI
 };
 
 #define VIDEO_FLAG_TYPE_CGA     0
diff --git a/src/video/vid_ati18800.c b/src/video/vid_ati18800.c
index 5203c4de1..f9b2a3a8b 100644
--- a/src/video/vid_ati18800.c
+++ b/src/video/vid_ati18800.c
@@ -212,13 +212,13 @@ static void *ati18800_init(const device_t *info)
 	};
 
 	if (info->local == ATI18800_EDGE16) {
-		svga_init(&ati18800->svga, ati18800, 1 << 18, /*256kb*/
+		svga_init(info, &ati18800->svga, ati18800, 1 << 18, /*256kb*/
 			  ati18800_recalctimings,
 			  ati18800_in, ati18800_out,
 			  NULL,
 			  NULL);
 	} else {
-		svga_init(&ati18800->svga, ati18800, 1 << 19, /*512kb*/
+		svga_init(info, &ati18800->svga, ati18800, 1 << 19, /*512kb*/
 			  ati18800_recalctimings,
 			  ati18800_in, ati18800_out,
 			  NULL,
diff --git a/src/video/vid_ati28800.c b/src/video/vid_ati28800.c
index 5a02dfa82..5ffcf14e8 100644
--- a/src/video/vid_ati28800.c
+++ b/src/video/vid_ati28800.c
@@ -482,7 +482,7 @@ ati28800k_init(const device_t *info)
     rom_init(&ati28800->bios_rom, BIOS_ATIKOR_PATH, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
     loadfont(FONT_ATIKOR_PATH, 6);
 
-    svga_init(&ati28800->svga, ati28800, ati28800->memory << 10, /*Memory size, default 512KB*/
+    svga_init(info, &ati28800->svga, ati28800, ati28800->memory << 10, /*Memory size, default 512KB*/
 	     ati28800k_recalctimings,
 	     ati28800k_in, ati28800k_out,
 	     NULL,
@@ -543,7 +543,7 @@ ati28800_init(const device_t *info)
 		break;
     }
 
-    svga_init(&ati28800->svga, ati28800, ati28800->memory << 10, /*default: 512kb*/
+    svga_init(info, &ati28800->svga, ati28800, ati28800->memory << 10, /*default: 512kb*/
 	      ati28800_recalctimings,
                    ati28800_in, ati28800_out,
                    NULL,
diff --git a/src/video/vid_ati_mach64.c b/src/video/vid_ati_mach64.c
index 6e4d52e42..e2ad8b649 100644
--- a/src/video/vid_ati_mach64.c
+++ b/src/video/vid_ati_mach64.c
@@ -92,7 +92,8 @@ typedef struct mach64_t
         uint8_t regs[256];
         int index;
 
-        int type, pci;
+        int type, pci,
+	    bit32;
         
         uint8_t pci_regs[256];
         uint8_t int_line;
@@ -252,7 +253,8 @@ typedef struct mach64_t
 } mach64_t;
 
 static video_timings_t timing_mach64_isa	= {VIDEO_ISA, 3,  3,  6,   5,  5, 10};
-static video_timings_t timing_mach64_vlb_pci	= {VIDEO_BUS, 2,  2,  1,  20, 20, 21};
+static video_timings_t timing_mach64_vlb	= {VIDEO_BUS, 2,  2,  1,  20, 20, 21};
+static video_timings_t timing_mach64_pci	= {VIDEO_PCI, 2,  2,  1,  20, 20, 21};
 
 enum
 {
@@ -540,26 +542,38 @@ void mach64_updatemapping(mach64_t *mach64)
         switch (svga->gdcreg[6] & 0xc)
         {
                 case 0x0: /*128k at A0000*/
-                mem_mapping_set_handler(&mach64->svga.mapping, mach64_read, mach64_readw, mach64_readl, mach64_write, mach64_writew, mach64_writel);
+		if (mach64->bit32)
+                	mem_mapping_set_handler(&mach64->svga.mapping, mach64_read, mach64_readw, mach64_readl, mach64_write, mach64_writew, mach64_writel);
+		else
+                	mem_mapping_set_handler(&mach64->svga.mapping, mach64_read, mach64_readw, NULL, mach64_write, mach64_writew, NULL);
                 mem_mapping_set_p(&mach64->svga.mapping, mach64);
                 mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x20000);
                 mem_mapping_enable(&mach64->mmio_mapping);
                 svga->banked_mask = 0xffff;
                 break;
                 case 0x4: /*64k at A0000*/
-                mem_mapping_set_handler(&mach64->svga.mapping, mach64_read, mach64_readw, mach64_readl, mach64_write, mach64_writew, mach64_writel);
+		if (mach64->bit32)
+			mem_mapping_set_handler(&mach64->svga.mapping, mach64_read, mach64_readw, mach64_readl, mach64_write, mach64_writew, mach64_writel);
+		else
+			mem_mapping_set_handler(&mach64->svga.mapping, mach64_read, mach64_readw, NULL, mach64_write, mach64_writew, NULL);
                 mem_mapping_set_p(&mach64->svga.mapping, mach64);
                 mem_mapping_set_addr(&svga->mapping, 0xa0000, 0x10000);
                 svga->banked_mask = 0xffff;
                 break;
                 case 0x8: /*32k at B0000*/
-                mem_mapping_set_handler(&mach64->svga.mapping, svga_read, svga_readw, svga_readl, svga_write, svga_writew, svga_writel);
+		if (mach64->bit32)
+			mem_mapping_set_handler(&mach64->svga.mapping, svga_read, svga_readw, svga_readl, svga_write, svga_writew, svga_writel);
+		else
+			mem_mapping_set_handler(&mach64->svga.mapping, svga_read, svga_readw, NULL, svga_write, svga_writew, NULL);
                 mem_mapping_set_p(&mach64->svga.mapping, svga);
                 mem_mapping_set_addr(&svga->mapping, 0xb0000, 0x08000);
                 svga->banked_mask = 0x7fff;
                 break;
                 case 0xC: /*32k at B8000*/
-                mem_mapping_set_handler(&mach64->svga.mapping, svga_read, svga_readw, svga_readl, svga_write, svga_writew, svga_writel);
+		if (mach64->bit32)
+			mem_mapping_set_handler(&mach64->svga.mapping, svga_read, svga_readw, svga_readl, svga_write, svga_writew, svga_writel);
+		else
+			mem_mapping_set_handler(&mach64->svga.mapping, svga_read, svga_readw, NULL, svga_write, svga_writew, NULL);
                 mem_mapping_set_p(&mach64->svga.mapping, svga);
                 mem_mapping_set_addr(&svga->mapping, 0xb8000, 0x08000);
                 svga->banked_mask = 0x7fff;
@@ -3266,7 +3280,7 @@ static void *mach64_common_init(const device_t *info)
         mach64->vram_size = device_get_config_int("memory");
         mach64->vram_mask = (mach64->vram_size << 20) - 1;
         
-        svga_init(&mach64->svga, mach64, mach64->vram_size << 20,
+        svga_init(info, &mach64->svga, mach64, mach64->vram_size << 20,
                    mach64_recalctimings,
                    mach64_in, mach64_out,
                    NULL,
@@ -3275,10 +3289,19 @@ static void *mach64_common_init(const device_t *info)
         if (info->flags & DEVICE_PCI)
                 mem_mapping_disable(&mach64->bios_rom.mapping);
 
-        mem_mapping_add(&mach64->linear_mapping,        0,       0,       svga_read_linear, svga_readw_linear, svga_readl_linear, svga_write_linear, svga_writew_linear, svga_writel_linear, NULL, MEM_MAPPING_EXTERNAL, &mach64->svga);
-        mem_mapping_add(&mach64->mmio_linear_mapping,   0,       0,       mach64_ext_readb, mach64_ext_readw,  mach64_ext_readl,  mach64_ext_writeb, mach64_ext_writew,  mach64_ext_writel,  NULL, MEM_MAPPING_EXTERNAL,  mach64);
-        mem_mapping_add(&mach64->mmio_linear_mapping_2, 0,       0,       mach64_ext_readb, mach64_ext_readw,  mach64_ext_readl,  mach64_ext_writeb, mach64_ext_writew,  mach64_ext_writel,  NULL, MEM_MAPPING_EXTERNAL,  mach64);
-        mem_mapping_add(&mach64->mmio_mapping,          0xbc000, 0x04000, mach64_ext_readb, mach64_ext_readw,  mach64_ext_readl,  mach64_ext_writeb, mach64_ext_writew,  mach64_ext_writel,  NULL, MEM_MAPPING_EXTERNAL,  mach64);
+	mach64->bit32 = (info->flags & DEVICE_PCI) || (info->flags & DEVICE_VLB);
+
+	if (mach64->bit32) {
+	        mem_mapping_add(&mach64->linear_mapping,        0,       0,       svga_read_linear, svga_readw_linear, svga_readl_linear, svga_write_linear, svga_writew_linear, svga_writel_linear, NULL, MEM_MAPPING_EXTERNAL, &mach64->svga);
+        	mem_mapping_add(&mach64->mmio_linear_mapping,   0,       0,       mach64_ext_readb, mach64_ext_readw,  mach64_ext_readl,  mach64_ext_writeb, mach64_ext_writew,  mach64_ext_writel,  NULL, MEM_MAPPING_EXTERNAL,  mach64);
+	        mem_mapping_add(&mach64->mmio_linear_mapping_2, 0,       0,       mach64_ext_readb, mach64_ext_readw,  mach64_ext_readl,  mach64_ext_writeb, mach64_ext_writew,  mach64_ext_writel,  NULL, MEM_MAPPING_EXTERNAL,  mach64);
+        	mem_mapping_add(&mach64->mmio_mapping,          0xbc000, 0x04000, mach64_ext_readb, mach64_ext_readw,  mach64_ext_readl,  mach64_ext_writeb, mach64_ext_writew,  mach64_ext_writel,  NULL, MEM_MAPPING_EXTERNAL,  mach64);
+	} else {
+	        mem_mapping_add(&mach64->linear_mapping,        0,       0,       svga_read_linear, svga_readw_linear, NULL,  svga_write_linear, svga_writew_linear, NULL,  NULL, MEM_MAPPING_EXTERNAL, &mach64->svga);
+        	mem_mapping_add(&mach64->mmio_linear_mapping,   0,       0,       mach64_ext_readb, mach64_ext_readw,  NULL,  mach64_ext_writeb, mach64_ext_writew,  NULL,  NULL, MEM_MAPPING_EXTERNAL,  mach64);
+	        mem_mapping_add(&mach64->mmio_linear_mapping_2, 0,       0,       mach64_ext_readb, mach64_ext_readw,  NULL,  mach64_ext_writeb, mach64_ext_writew,  NULL,  NULL, MEM_MAPPING_EXTERNAL,  mach64);
+        	mem_mapping_add(&mach64->mmio_mapping,          0xbc000, 0x04000, mach64_ext_readb, mach64_ext_readw,  NULL,  mach64_ext_writeb, mach64_ext_writew,  NULL,  NULL, MEM_MAPPING_EXTERNAL,  mach64);
+	}
         mem_mapping_disable(&mach64->mmio_mapping);
 
         mach64_io_set(mach64);
@@ -3313,8 +3336,10 @@ static void *mach64gx_init(const device_t *info)
 
         if (info->flags & DEVICE_ISA)
 		video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_mach64_isa);
+        else if (info->flags & DEVICE_PCI)
+		video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_mach64_pci);
 	else
-		video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_mach64_vlb_pci);
+		video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_mach64_vlb);
 
         mach64->type = MACH64_GX;
 	mach64->pci = !!(info->flags & DEVICE_PCI);
@@ -3343,7 +3368,10 @@ static void *mach64vt2_init(const device_t *info)
         mach64_t *mach64 = mach64_common_init(info);
         svga_t *svga = &mach64->svga;
 
-	video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_mach64_vlb_pci);
+        if (info->flags & DEVICE_PCI)
+		video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_mach64_pci);
+	else
+		video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_mach64_vlb);
 
         mach64->type = MACH64_VT2;
 	mach64->pci = 1;
diff --git a/src/video/vid_cl54xx.c b/src/video/vid_cl54xx.c
index 9df438696..7ac6ac8c1 100644
--- a/src/video/vid_cl54xx.c
+++ b/src/video/vid_cl54xx.c
@@ -147,7 +147,8 @@ typedef struct gd54xx_t
 
     svga_t		svga;
 
-    int			has_bios, rev;
+    int			has_bios, rev,
+			bit32;
     rom_t		bios_rom;
 
     uint32_t		vram_size;
@@ -207,7 +208,8 @@ typedef struct gd54xx_t
 
 
 static video_timings_t timing_gd54xx_isa	= {VIDEO_ISA, 3,  3,  6,   8,  8, 12};
-static video_timings_t timing_gd54xx_vlb_pci	= {VIDEO_BUS, 4,  4,  8,  10, 10, 20};
+static video_timings_t timing_gd54xx_vlb	= {VIDEO_BUS, 4,  4,  8,  10, 10, 20};
+static video_timings_t timing_gd54xx_pci	= {VIDEO_PCI, 4,  4,  8,  10, 10, 20};
 
 
 static void 
@@ -2955,6 +2957,7 @@ static void
     gd54xx->pci = !!(info->flags & DEVICE_PCI);	
     gd54xx->vlb = !!(info->flags & DEVICE_VLB);
     gd54xx->mca = !!(info->flags & DEVICE_MCA);
+    gd54xx->bit32 = gd54xx->pci || gd54xx->vlb;
 
     gd54xx->rev = 0;
     gd54xx->has_bios = 1;
@@ -3051,35 +3054,53 @@ static void
     if (romfn)
 	rom_init(&gd54xx->bios_rom, romfn, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
 
+
     if (info->flags & DEVICE_ISA)
 	video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_gd54xx_isa);
+    else if (info->flags & DEVICE_PCI)
+	video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_gd54xx_pci);
     else
-	video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_gd54xx_vlb_pci);
+	video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_gd54xx_vlb);
 
-    svga_init(&gd54xx->svga, gd54xx, gd54xx->vram_size,
+    svga_init(info, &gd54xx->svga, gd54xx, gd54xx->vram_size,
 	      gd54xx_recalctimings, gd54xx_in, gd54xx_out,
 	      gd54xx_hwcursor_draw, NULL);
     svga->ven_write = gd54xx_write_modes45;
     if (vram <= 1)
 	svga->decode_mask = gd54xx->vram_mask;
 
-    mem_mapping_set_handler(&svga->mapping, gd54xx_read, gd54xx_readw, gd54xx_readl, gd54xx_write, gd54xx_writew, gd54xx_writel);
-    mem_mapping_set_p(&svga->mapping, gd54xx);
-    
-    mem_mapping_add(&gd54xx->mmio_mapping, 0, 0,
+    if (gd54xx->bit32) {
+	mem_mapping_set_handler(&svga->mapping, gd54xx_read, gd54xx_readw, gd54xx_readl, gd54xx_write, gd54xx_writew, gd54xx_writel);
+	mem_mapping_add(&gd54xx->mmio_mapping, 0, 0,
 			gd543x_mmio_read, gd543x_mmio_readw, gd543x_mmio_readl,
 			gd543x_mmio_writeb, gd543x_mmio_writew, gd543x_mmio_writel,
 			NULL, MEM_MAPPING_EXTERNAL, gd54xx);
-    mem_mapping_disable(&gd54xx->mmio_mapping);
-    mem_mapping_add(&gd54xx->linear_mapping, 0, 0,
+	mem_mapping_add(&gd54xx->linear_mapping, 0, 0,
 			gd54xx_readb_linear, gd54xx_readw_linear, gd54xx_readl_linear,
 			gd54xx_writeb_linear, gd54xx_writew_linear, gd54xx_writel_linear,
 			NULL, MEM_MAPPING_EXTERNAL, gd54xx);
-    mem_mapping_disable(&gd54xx->linear_mapping);
-    mem_mapping_add(&gd54xx->aperture2_mapping, 0, 0,
+	mem_mapping_add(&gd54xx->aperture2_mapping, 0, 0,
 			gd5436_aperture2_readb, gd5436_aperture2_readw, gd5436_aperture2_readl,
 			gd5436_aperture2_writeb, gd5436_aperture2_writew, gd5436_aperture2_writel,
 			NULL, MEM_MAPPING_EXTERNAL, gd54xx);
+    } else {
+	mem_mapping_set_handler(&svga->mapping, gd54xx_read, gd54xx_readw, NULL, gd54xx_write, gd54xx_writew, NULL);
+	mem_mapping_add(&gd54xx->mmio_mapping, 0, 0,
+			gd543x_mmio_read, gd543x_mmio_readw, NULL,
+			gd543x_mmio_writeb, gd543x_mmio_writew, NULL,
+			NULL, MEM_MAPPING_EXTERNAL, gd54xx);
+	mem_mapping_add(&gd54xx->linear_mapping, 0, 0,
+			gd54xx_readb_linear, gd54xx_readw_linear, NULL,
+			gd54xx_writeb_linear, gd54xx_writew_linear, NULL,
+			NULL, MEM_MAPPING_EXTERNAL, gd54xx);
+	mem_mapping_add(&gd54xx->aperture2_mapping, 0, 0,
+			gd5436_aperture2_readb, gd5436_aperture2_readw, NULL,
+			gd5436_aperture2_writeb, gd5436_aperture2_writew, NULL,
+			NULL, MEM_MAPPING_EXTERNAL, gd54xx);
+    }
+    mem_mapping_set_p(&svga->mapping, gd54xx);
+    mem_mapping_disable(&gd54xx->mmio_mapping);
+    mem_mapping_disable(&gd54xx->linear_mapping);
     mem_mapping_disable(&gd54xx->aperture2_mapping);
 
     io_sethandler(0x03c0, 0x0020, gd54xx_in, NULL, NULL, gd54xx_out, NULL, NULL, gd54xx);
diff --git a/src/video/vid_et4000.c b/src/video/vid_et4000.c
index 5b2a910b8..a468ceb52 100644
--- a/src/video/vid_et4000.c
+++ b/src/video/vid_et4000.c
@@ -495,7 +495,7 @@ et4000_init(const device_t *info)
 	case 0:		/* ISA ET4000AX */
 		dev->vram_size = device_get_config_int("memory") << 10;
 		video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_et4000_isa);
-		svga_init(&dev->svga, dev, dev->vram_size,
+		svga_init(info, &dev->svga, dev, dev->vram_size,
 			  et4000_recalctimings, et4000_in, et4000_out,
 			  NULL, NULL);
 		io_sethandler(0x03c0, 32,
@@ -505,7 +505,7 @@ et4000_init(const device_t *info)
 	case 1:		/* MCA ET4000AX */
 		dev->vram_size = 1024 << 10;
 		video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_et4000_mca);
-		svga_init(&dev->svga, dev, dev->vram_size,
+		svga_init(info, &dev->svga, dev, dev->vram_size,
 			  et4000_recalctimings, et4000_in, et4000_out,
 			  NULL, NULL);
 		io_sethandler(0x03c0, 32,
@@ -522,7 +522,7 @@ et4000_init(const device_t *info)
 		dev->port_32cb_val = 0;
 		dev->svga.ksc5601_sbyte_mask = 0x80;
 		video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_et4000_isa);
-		svga_init(&dev->svga, dev, dev->vram_size,
+		svga_init(info, &dev->svga, dev, dev->vram_size,
 			  et4000_recalctimings, et4000k_in, et4000k_out,
 			  NULL, NULL);
 		io_sethandler(0x03c0, 32,
diff --git a/src/video/vid_et4000w32.c b/src/video/vid_et4000w32.c
index 565e800a1..cf6d61fdc 100644
--- a/src/video/vid_et4000w32.c
+++ b/src/video/vid_et4000w32.c
@@ -141,7 +141,8 @@ typedef struct et4000w32p_t
 	uint32_t key;
 } et4000w32p_t;
 
-static video_timings_t timing_et4000w32 = {VIDEO_BUS, 4,  4,  4,  10, 10, 10};
+static video_timings_t timing_et4000w32_vlb = {VIDEO_BUS, 4,  4,  4,  10, 10, 10};
+static video_timings_t timing_et4000w32_pci = {VIDEO_PCI, 4,  4,  4,  10, 10, 10};
 
 void et4000w32p_recalcmapping(et4000w32p_t *et4000);
 
@@ -1286,9 +1287,12 @@ void *et4000w32p_init(const device_t *info)
         
         et4000->interleaved = (vram_size == 2) ? 1 : 0;
 
-	video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_et4000w32);
+	if (info->flags & DEVICE_PCI)
+		video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_et4000w32_pci);
+	else
+		video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_et4000w32_vlb);
 
-        svga_init(&et4000->svga, et4000, vram_size << 20,
+        svga_init(info, &et4000->svga, et4000, vram_size << 20,
                    et4000w32p_recalctimings,
                    et4000w32p_in, et4000w32p_out,
                    et4000w32p_hwcursor_draw,
diff --git a/src/video/vid_ht216.c b/src/video/vid_ht216.c
index 2adba65f8..5f271e0ea 100644
--- a/src/video/vid_ht216.c
+++ b/src/video/vid_ht216.c
@@ -93,7 +93,8 @@ uint8_t ht216_in(uint16_t addr, void *p);
 #define BIOS_G2_GC205_PATH			L"roms/video/video7/BIOS.BIN"
 #define BIOS_VIDEO7_VGA_1024I_PATH		L"roms/video/video7/Video Seven VGA 1024i - BIOS - v2.19 - 435-0062-05 - U17 - 27C256.BIN"
 
-static video_timings_t	timing_v7vga = {VIDEO_ISA, 5,  5,  9,  20, 20, 30};
+static video_timings_t	timing_v7vga_isa = {VIDEO_ISA, 3,  3,  6,   5,  5, 10};
+static video_timings_t	timing_v7vga_vlb = {VIDEO_ISA, 5,  5,  9,  20, 20, 30};
 
 
 #ifdef ENABLE_HT216_LOG
@@ -1034,9 +1035,12 @@ void
     else if (has_rom == 2)
 	rom_init(&ht216->bios_rom, BIOS_G2_GC205_PATH, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
 
-    video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_v7vga);
+    if (info->flags & DEVICE_VLB)
+	video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_v7vga_vlb);
+    else
+	video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_v7vga_isa);
 
-    svga_init(&ht216->svga, ht216, mem_size,
+    svga_init(info, &ht216->svga, ht216, mem_size,
 	      ht216_recalctimings,
 	      ht216_in, ht216_out,
 	      ht216_hwcursor_draw,
@@ -1045,9 +1049,14 @@ void
     ht216->vram_mask = mem_size - 1;
     svga->decode_mask = mem_size - 1;
 
-    mem_mapping_set_handler(&ht216->svga.mapping, ht216_read, NULL, NULL, ht216_write, ht216_writew, ht216_writel);
+    if (info->flags & DEVICE_VLB) {
+	mem_mapping_set_handler(&ht216->svga.mapping, ht216_read, NULL, NULL, ht216_write, ht216_writew, ht216_writel);
+	mem_mapping_add(&ht216->linear_mapping, 0, 0, ht216_read_linear, NULL, NULL, ht216_write_linear, ht216_writew_linear, ht216_writel_linear, NULL, MEM_MAPPING_EXTERNAL, &ht216->svga);
+    } else {
+	mem_mapping_set_handler(&ht216->svga.mapping, ht216_read, NULL, NULL, ht216_write, ht216_writew, NULL);
+	mem_mapping_add(&ht216->linear_mapping, 0, 0, ht216_read_linear, NULL, NULL, ht216_write_linear, ht216_writew_linear, NULL, NULL, MEM_MAPPING_EXTERNAL, &ht216->svga);
+    }
     mem_mapping_set_p(&ht216->svga.mapping, ht216);
-    mem_mapping_add(&ht216->linear_mapping, 0, 0, ht216_read_linear, NULL, NULL, ht216_write_linear, ht216_writew_linear, ht216_writel_linear, NULL, MEM_MAPPING_EXTERNAL, &ht216->svga);
 
     svga->bpp = 8;
     svga->miscout = 1;
@@ -1180,7 +1189,7 @@ const device_t v7_vga_1024i_device =
 const device_t ht216_32_pb410a_device =
 {
     "Headland HT216-32 (Packard Bell PB410A)",
-    DEVICE_ISA,
+    DEVICE_VLB,
     0x7861,	/*HT216-32*/
     ht216_pb410a_init,
     ht216_close,
diff --git a/src/video/vid_mga.c b/src/video/vid_mga.c
index b44043034..450f0c94f 100644
--- a/src/video/vid_mga.c
+++ b/src/video/vid_mga.c
@@ -605,7 +605,7 @@ static const uint8_t trans_masks[16][16] =
 static int8_t		dither5[256][2][2];
 static int8_t		dither6[256][2][2];
 
-static video_timings_t	timing_matrox_mystique = {VIDEO_BUS, 4,  4,  4,  10, 10, 10};
+static video_timings_t	timing_matrox_mystique = {VIDEO_PCI, 4,  4,  4,  10, 10, 10};
 
 
 static void	mystique_start_blit(mystique_t *mystique);
@@ -4931,7 +4931,7 @@ mystique_init(const device_t *info)
 
     video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_matrox_mystique);
 
-    svga_init(&mystique->svga, mystique, mystique->vram_size << 20,
+    svga_init(info, &mystique->svga, mystique, mystique->vram_size << 20,
 	      mystique_recalctimings,
 	      mystique_in, mystique_out,
 	      mystique_hwcursor_draw,
diff --git a/src/video/vid_oak_oti.c b/src/video/vid_oak_oti.c
index 39b660089..c3e5b11af 100644
--- a/src/video/vid_oak_oti.c
+++ b/src/video/vid_oak_oti.c
@@ -380,7 +380,7 @@ oti_init(const device_t *info)
 
     video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_oti);
 
-    svga_init(&oti->svga, oti, oti->vram_size << 10,
+    svga_init(info, &oti->svga, oti, oti->vram_size << 10,
 	      oti_recalctimings, oti_in, oti_out, NULL, NULL);
 
     io_sethandler(0x03c0, 32,
diff --git a/src/video/vid_paradise.c b/src/video/vid_paradise.c
index c578cc044..3b6f3acab 100644
--- a/src/video/vid_paradise.c
+++ b/src/video/vid_paradise.c
@@ -298,21 +298,21 @@ void *paradise_init(const device_t *info, uint32_t memsize)
 
 	switch(info->local) {
 		case PVGA1A:
-			svga_init(&paradise->svga, paradise, memsize, /*256kb*/
+			svga_init(info, &paradise->svga, paradise, memsize, /*256kb*/
 				   NULL,
 				   paradise_in, paradise_out,
 				   NULL,
 				   NULL);
 			break;
 		case WD90C11:
-			svga_init(&paradise->svga, paradise, 1 << 19, /*512kb*/
+			svga_init(info, &paradise->svga, paradise, 1 << 19, /*512kb*/
 				   paradise_recalctimings,
 				   paradise_in, paradise_out,
 				   NULL,
 				   NULL);
 			break;
 		case WD90C30:
-			svga_init(&paradise->svga, paradise, memsize,
+			svga_init(info, &paradise->svga, paradise, memsize,
 				   paradise_recalctimings,
 				   paradise_in, paradise_out,
 				   NULL,
diff --git a/src/video/vid_s3.c b/src/video/vid_s3.c
index 8b209530e..551229513 100644
--- a/src/video/vid_s3.c
+++ b/src/video/vid_s3.c
@@ -77,11 +77,16 @@ enum
 static video_timings_t timing_s3_86c911		= {VIDEO_ISA, 4,  4,  5,  20, 20, 35};
 static video_timings_t timing_s3_86c801		= {VIDEO_ISA, 4,  4,  5,  20, 20, 35};
 static video_timings_t timing_s3_86c805		= {VIDEO_BUS, 4,  4,  5,  20, 20, 35};
-static video_timings_t timing_s3_stealth64	= {VIDEO_BUS, 2,  2,  4,  26, 26, 42};
-static video_timings_t timing_s3_vision864	= {VIDEO_BUS, 4,  4,  5,  20, 20, 35};
-static video_timings_t timing_s3_vision964	= {VIDEO_BUS, 2,  2,  4,  20, 20, 35};
-static video_timings_t timing_s3_trio32		= {VIDEO_BUS, 4,  3,  5,  26, 26, 42};
-static video_timings_t timing_s3_trio64		= {VIDEO_BUS, 3,  2,  4,  25, 25, 40};
+static video_timings_t timing_s3_stealth64_vlb	= {VIDEO_BUS, 2,  2,  4,  26, 26, 42};
+static video_timings_t timing_s3_stealth64_pci	= {VIDEO_PCI, 2,  2,  4,  26, 26, 42};
+static video_timings_t timing_s3_vision864_vlb	= {VIDEO_BUS, 4,  4,  5,  20, 20, 35};
+static video_timings_t timing_s3_vision864_pci	= {VIDEO_PCI, 4,  4,  5,  20, 20, 35};
+static video_timings_t timing_s3_vision964_vlb	= {VIDEO_BUS, 2,  2,  4,  20, 20, 35};
+static video_timings_t timing_s3_vision964_pci	= {VIDEO_PCI, 2,  2,  4,  20, 20, 35};
+static video_timings_t timing_s3_trio32_vlb	= {VIDEO_BUS, 4,  3,  5,  26, 26, 42};
+static video_timings_t timing_s3_trio32_pci	= {VIDEO_PCI, 4,  3,  5,  26, 26, 42};
+static video_timings_t timing_s3_trio64_vlb	= {VIDEO_BUS, 3,  2,  4,  25, 25, 40};
+static video_timings_t timing_s3_trio64_pci	= {VIDEO_PCI, 3,  2,  4,  25, 25, 40};
 
 enum
 {
@@ -3304,42 +3309,66 @@ static void *s3_init(const device_t *info)
 		case S3_PARADISE_BAHAMAS64:
 			bios_fn = ROM_PARADISE_BAHAMAS64;
 			chip = S3_VISION864;
-			video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_vision864);
+			if (info->flags & DEVICE_PCI)
+				video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_vision864_pci);
+			else
+				video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_vision864_vlb);
 			break;
 		case S3_PHOENIX_VISION864:
 			bios_fn = ROM_PHOENIX_VISION864;
 			chip = S3_VISION864;
-			video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_vision864);
+			if (info->flags & DEVICE_PCI)
+				video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_vision864_pci);
+			else
+				video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_vision864_vlb);
 			break;
 		case S3_DIAMOND_STEALTH64_964:
 			bios_fn = ROM_DIAMOND_STEALTH64_964;
 			chip = S3_VISION964;
-			video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_vision964);
+			if (info->flags & DEVICE_PCI)
+				video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_vision964_pci);
+			else
+				video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_vision964_vlb);
 			break;
 		case S3_PHOENIX_TRIO32:
 			bios_fn = ROM_PHOENIX_TRIO32;
 			chip = S3_TRIO32;
-			video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_trio32);
+			if (info->flags & DEVICE_PCI)
+				video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_trio32_pci);
+			else
+				video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_trio32_vlb);
 			break;
 		case S3_PHOENIX_TRIO64:
 			bios_fn = ROM_PHOENIX_TRIO64;
 			chip = S3_TRIO64;
-			video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_trio64);
+			if (info->flags & DEVICE_PCI)
+				video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_trio64_pci);
+			else
+				video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_trio64_vlb);
 			break;
 		case S3_PHOENIX_TRIO64_ONBOARD:
 			bios_fn = NULL;
 			chip = S3_TRIO64;
-			video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_trio64);
+			if (info->flags & DEVICE_PCI)
+				video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_trio64_pci);
+			else
+				video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_trio64_vlb);
 			break;
 		case S3_DIAMOND_STEALTH64_764:
 			bios_fn = ROM_DIAMOND_STEALTH64_764;
 			chip = S3_TRIO64;
-			video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_stealth64);
+			if (info->flags & DEVICE_PCI)
+				video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_stealth64_pci);
+			else
+				video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_stealth64_vlb);
 			break;
 		case S3_NUMBER9_9FX:
 			bios_fn = ROM_NUMBER9_9FX;
 			chip = S3_TRIO64;
-			video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_trio64);
+			if (info->flags & DEVICE_PCI)
+				video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_trio64_pci);
+			else
+				video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_s3_trio64_vlb);
 			break;
 		default:
 			free(s3);
@@ -3366,24 +3395,35 @@ static void *s3_init(const device_t *info)
 	s3->pci = !!(info->flags & DEVICE_PCI);
 	s3->vlb = !!(info->flags & DEVICE_VLB);
 
-	mem_mapping_add(&s3->linear_mapping,	0,			0,
-			svga_read_linear,	svga_readw_linear,	svga_readl_linear,
-			svga_write_linear,	svga_writew_linear,	svga_writel_linear,
-			NULL,			MEM_MAPPING_EXTERNAL,	&s3->svga);
-	mem_mapping_add(&s3->mmio_mapping,	0xa0000,		0x10000,
-			s3_accel_read,		s3_accel_read_w,	s3_accel_read_l,
-			s3_accel_write,		s3_accel_write_w,	s3_accel_write_l,
-			NULL,			MEM_MAPPING_EXTERNAL,	s3);
+	if (s3->pci || s3->vlb) {
+		mem_mapping_add(&s3->linear_mapping,	0,			0,
+				svga_read_linear,	svga_readw_linear,	svga_readl_linear,
+				svga_write_linear,	svga_writew_linear,	svga_writel_linear,
+				NULL,			MEM_MAPPING_EXTERNAL,	&s3->svga);
+		mem_mapping_add(&s3->mmio_mapping,	0xa0000,		0x10000,
+				s3_accel_read,		s3_accel_read_w,	s3_accel_read_l,
+				s3_accel_write,		s3_accel_write_w,	s3_accel_write_l,
+				NULL,			MEM_MAPPING_EXTERNAL,	s3);
+	} else {
+		mem_mapping_add(&s3->linear_mapping,	0,			0,
+				svga_read_linear,	svga_readw_linear,	NULL,
+				svga_write_linear,	svga_writew_linear,	NULL,
+				NULL,			MEM_MAPPING_EXTERNAL,	&s3->svga);
+		mem_mapping_add(&s3->mmio_mapping,	0xa0000,		0x10000,
+				s3_accel_read,		s3_accel_read_w,	NULL,
+				s3_accel_write,		s3_accel_write_w,	NULL,
+				NULL,			MEM_MAPPING_EXTERNAL,	s3);
+	}
 	mem_mapping_disable(&s3->mmio_mapping);
 	
 	if (chip == S3_VISION964)
-		svga_init(&s3->svga, s3, vram_size,
+		svga_init(info, &s3->svga, s3, vram_size,
 		s3_recalctimings,
 		s3_in, s3_out,
 		NULL,
 		NULL);
 	else
-		svga_init(&s3->svga, s3, vram_size,
+		svga_init(info, &s3->svga, s3, vram_size,
 		s3_recalctimings,
 		s3_in, s3_out,
 		s3_hwcursor_draw,
diff --git a/src/video/vid_s3_virge.c b/src/video/vid_s3_virge.c
index f64556d4e..45ffce9bf 100644
--- a/src/video/vid_s3_virge.c
+++ b/src/video/vid_s3_virge.c
@@ -272,9 +272,12 @@ typedef struct virge_t
 	uint8_t subsys_stat, subsys_cntl;
 } virge_t;
 
-static video_timings_t timing_diamond_stealth3d_2000	= {VIDEO_BUS, 2,  2,  3,  28, 28, 45};
-static video_timings_t timing_diamond_stealth3d_3000	= {VIDEO_BUS, 2,  2,  4,  26, 26, 42};
-static video_timings_t timing_virge_dx			= {VIDEO_BUS, 2,  2,  3,  28, 28, 45};
+static video_timings_t timing_diamond_stealth3d_2000_vlb	= {VIDEO_BUS, 2,  2,  3,  28, 28, 45};
+static video_timings_t timing_diamond_stealth3d_2000_pci	= {VIDEO_PCI, 2,  2,  3,  28, 28, 45};
+static video_timings_t timing_diamond_stealth3d_3000_vlb	= {VIDEO_BUS, 2,  2,  4,  26, 26, 42};
+static video_timings_t timing_diamond_stealth3d_3000_pci	= {VIDEO_PCI, 2,  2,  4,  26, 26, 42};
+static video_timings_t timing_virge_dx_vlb			= {VIDEO_BUS, 2,  2,  3,  28, 28, 45};
+static video_timings_t timing_virge_dx_pci			= {VIDEO_PCI, 2,  2,  3,  28, 28, 45};
 
 static __inline void wake_fifo_thread(virge_t *virge)
 {
@@ -3902,7 +3905,7 @@ static void *s3_virge_init(const device_t *info)
 			return NULL;
 	}
 
-        svga_init(&virge->svga, virge, virge->memory_size << 20,
+        svga_init(info, &virge->svga, virge, virge->memory_size << 20,
                    s3_virge_recalctimings,
                    s3_virge_in, s3_virge_out,
                    s3_virge_hwcursor_draw,
@@ -3978,20 +3981,29 @@ static void *s3_virge_init(const device_t *info)
 		        virge->virge_id_high = 0x56;
 		        virge->virge_id_low = 0x31;
 			virge->chip = S3_VIRGE;
-			video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_diamond_stealth3d_2000);
+			if (info->flags & DEVICE_PCI)
+				video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_diamond_stealth3d_2000_pci);
+			else
+				video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_diamond_stealth3d_2000_vlb);
 			break;
 		case S3_DIAMOND_STEALTH3D_3000:
 		        virge->virge_id_high = 0x88;
 		        virge->virge_id_low = 0x3d;
 			virge->chip = S3_VIRGEVX;
-			video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_diamond_stealth3d_3000);
+			if (info->flags & DEVICE_PCI)
+				video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_diamond_stealth3d_3000_pci);
+			else
+				video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_diamond_stealth3d_3000_vlb);
 			break;
 		default:
 			virge->svga.crtc[0x6c] = 0x01;
 		        virge->virge_id_high = 0x8a;
 		        virge->virge_id_low = 0x01;
 			virge->chip = S3_VIRGEDX;
-			video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_virge_dx);
+			if (info->flags & DEVICE_PCI)
+				video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_virge_dx_pci);
+			else
+				video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_virge_dx_vlb);
 			break;
 	}
 
diff --git a/src/video/vid_svga.c b/src/video/vid_svga.c
index f694f2377..0a21ad1a3 100644
--- a/src/video/vid_svga.c
+++ b/src/video/vid_svga.c
@@ -27,6 +27,7 @@
 #include <wchar.h>
 #include <86box/86box.h>
 #include "cpu.h"
+#include <86box/device.h>
 #include <86box/machine.h>
 #include <86box/timer.h>
 #include <86box/io.h>
@@ -861,7 +862,7 @@ svga_poll(void *p)
 
 
 int
-svga_init(svga_t *svga, void *p, int memsize, 
+svga_init(const device_t *info, svga_t *svga, void *p, int memsize, 
 	  void (*recalctimings_ex)(struct svga_t *svga),
 	  uint8_t (*video_in) (uint16_t addr, void *p),
 	  void    (*video_out)(uint16_t addr, uint8_t val, void *p),
@@ -911,10 +912,22 @@ svga_init(svga_t *svga, void *p, int memsize,
     svga->dac_hwcursor.xsize = svga->dac_hwcursor.ysize = 32;
     svga->dac_hwcursor.yoff = 32;
 
-    mem_mapping_add(&svga->mapping, 0xa0000, 0x20000,
-		    svga_read, svga_readw, svga_readl,
-		    svga_write, svga_writew, svga_writel,
-		    NULL, MEM_MAPPING_EXTERNAL, svga);
+    if ((info->flags & DEVICE_PCI) || (info->flags & DEVICE_VLB)) {
+	    mem_mapping_add(&svga->mapping, 0xa0000, 0x20000,
+			    svga_read, svga_readw, svga_readl,
+			    svga_write, svga_writew, svga_writel,
+			    NULL, MEM_MAPPING_EXTERNAL, svga);
+    } else if ((info->flags & DEVICE_ISA) && (info->flags & DEVICE_AT)) {
+	    mem_mapping_add(&svga->mapping, 0xa0000, 0x20000,
+			    svga_read, svga_readw, NULL,
+			    svga_write, svga_writew, NULL,
+			    NULL, MEM_MAPPING_EXTERNAL, svga);
+    } else {
+	    mem_mapping_add(&svga->mapping, 0xa0000, 0x20000,
+			    svga_read, NULL, NULL,
+			    svga_write, NULL, NULL,
+			    NULL, MEM_MAPPING_EXTERNAL, svga);
+    }
 
     timer_add(&svga->timer, svga_poll, svga, 1);
 
diff --git a/src/video/vid_svga_render.c b/src/video/vid_svga_render.c
index c470d5d43..11605fec4 100644
--- a/src/video/vid_svga_render.c
+++ b/src/video/vid_svga_render.c
@@ -21,6 +21,7 @@
 #include <string.h>
 #include <wchar.h>
 #include <86box/86box.h>
+#include <86box/device.h>
 #include <86box/mem.h>
 #include <86box/timer.h>
 #include <86box/video.h>
diff --git a/src/video/vid_tgui9440.c b/src/video/vid_tgui9440.c
index 10fd099ca..718def535 100644
--- a/src/video/vid_tgui9440.c
+++ b/src/video/vid_tgui9440.c
@@ -210,7 +210,8 @@ typedef struct tgui_t
         volatile int write_blitter;
 } tgui_t;
 
-video_timings_t timing_tgui = {VIDEO_BUS, 4,  8, 16,   4,  8, 16};
+video_timings_t timing_tgui_vlb = {VIDEO_BUS, 4,  8, 16,   4,  8, 16};
+video_timings_t timing_tgui_pci = {VIDEO_PCI, 4,  8, 16,   4,  8, 16};
 
 void tgui_recalcmapping(tgui_t *tgui);
 
@@ -1663,9 +1664,12 @@ static void *tgui_init(const device_t *info)
 
         rom_init(&tgui->bios_rom, (wchar_t *) bios_fn, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
 
-	video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_tgui);
+	if (info->flags & DEVICE_PCI)
+		video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_tgui_pci);
+	else
+		video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_tgui_vlb);
 
-        svga_init(&tgui->svga, tgui, tgui->vram_size,
+        svga_init(info, &tgui->svga, tgui, tgui->vram_size,
                    tgui_recalctimings,
                    tgui_in, tgui_out,
                    tgui_hwcursor_draw,
diff --git a/src/video/vid_ti_cf62011.c b/src/video/vid_ti_cf62011.c
index 1a0619c5d..964b0ed9b 100644
--- a/src/video/vid_ti_cf62011.c
+++ b/src/video/vid_ti_cf62011.c
@@ -248,7 +248,7 @@ vid_init(const device_t *info)
 
     video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_ti_cf62011);
 
-    svga_init(&ti->svga, ti,
+    svga_init(info, &ti->svga, ti,
 	      ti->vram_size<<10,
 	      NULL, vid_in, vid_out, NULL, NULL);
 
diff --git a/src/video/vid_tvga.c b/src/video/vid_tvga.c
index b5f456772..3c149a145 100644
--- a/src/video/vid_tvga.c
+++ b/src/video/vid_tvga.c
@@ -327,7 +327,7 @@ static void *tvga_init(const device_t *info)
 	
         rom_init(&tvga->bios_rom, (wchar_t *) bios_fn, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
         
-        svga_init(&tvga->svga, tvga, tvga->vram_size,
+        svga_init(info, &tvga->svga, tvga, tvga->vram_size,
                    tvga_recalctimings,
                    tvga_in, tvga_out,
                    NULL,
diff --git a/src/video/vid_vga.c b/src/video/vid_vga.c
index f66b004d6..4411be1b6 100644
--- a/src/video/vid_vga.c
+++ b/src/video/vid_vga.c
@@ -115,7 +115,7 @@ static void *vga_init(const device_t *info)
 
 	video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_vga);
 
-        svga_init(&vga->svga, vga, 1 << 18, /*256kb*/
+        svga_init(info, &vga->svga, vga, 1 << 18, /*256kb*/
                    NULL,
                    vga_in, vga_out,
                    NULL,
@@ -141,7 +141,7 @@ void *ps1vga_init(const device_t *info)
 	else
 		video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_ps1_svga_isa);
 
-        svga_init(&vga->svga, vga, 1 << 18, /*256kb*/
+        svga_init(info, &vga->svga, vga, 1 << 18, /*256kb*/
                    NULL,
                    vga_in, vga_out,
                    NULL,
diff --git a/src/video/video.c b/src/video/video.c
index 5f3950bf7..4a168d41c 100644
--- a/src/video/video.c
+++ b/src/video/video.c
@@ -60,6 +60,7 @@
 #define HAVE_STDARG_H
 #include <86box/86box.h>
 #include "cpu.h"
+#include <86box/device.h>
 #include <86box/io.h>
 #include <86box/mem.h>
 #include <86box/rom.h>
@@ -642,6 +643,13 @@ video_update_timing(void)
 	video_timing_write_b = ISA_CYCLES(vid_timings->write_b);
 	video_timing_write_w = ISA_CYCLES(vid_timings->write_w);
 	video_timing_write_l = ISA_CYCLES(vid_timings->write_l);
+    } else if (vid_timings->type == VIDEO_PCI) {
+	video_timing_read_b = (int)(pci_timing * vid_timings->read_b);
+	video_timing_read_w = (int)(pci_timing * vid_timings->read_w);
+	video_timing_read_l = (int)(pci_timing * vid_timings->read_l);
+	video_timing_write_b = (int)(pci_timing * vid_timings->write_b);
+	video_timing_write_w = (int)(pci_timing * vid_timings->write_w);
+	video_timing_write_l = (int)(pci_timing * vid_timings->write_l);
     } else {
 	video_timing_read_b = (int)(bus_timing * vid_timings->read_b);
 	video_timing_read_w = (int)(bus_timing * vid_timings->read_w);

From 989f7bfb510171400d36de86ba902b06c463d07d Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Wed, 6 May 2020 00:23:53 +0200
Subject: [PATCH 05/12] Fixed a long-standing bug in config.c, should reduce
 crashes on hard reset after settings changes.

---
 src/config.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/config.c b/src/config.c
index 1267cd91c..419bcc324 100644
--- a/src/config.c
+++ b/src/config.c
@@ -103,6 +103,8 @@ typedef struct {
     }					\
 					\
     (next)->next = (old)->next;		\
+    if ((next) == (head))		\
+	(head)->next = (old)->next;	\
 }
 
 

From 867ca0cd64323ca16f04e742e21762e240ecfdf7 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Wed, 6 May 2020 00:25:06 +0200
Subject: [PATCH 06/12] Split PIIX rev. 02 (with faulty bus mastering) from the
 normal rev. 00, made the PB640 use it, and made rev. 00 initialize with IDE
 enabled which allows for DOS IDE DMA drivers on P54TP4XE and PowerMate V.

---
 src/include/86box/piix.h      |  1 +
 src/intel_piix.c              | 29 +++++++++++++++++++++++++++--
 src/machine/m_at_socket4_5.c  |  4 ----
 src/machine/m_at_socket7_s7.c |  6 ++----
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/include/86box/piix.h b/src/include/86box/piix.h
index 9f6724fae..025410b1a 100644
--- a/src/include/86box/piix.h
+++ b/src/include/86box/piix.h
@@ -18,6 +18,7 @@
  */
 
 extern const device_t piix_device;
+extern const device_t piix_rev02_device;
 extern const device_t piix3_device;
 extern const device_t piix4_device;
 extern const device_t piix4e_device;
diff --git a/src/intel_piix.c b/src/intel_piix.c
index 4a9a80f1e..a33eeeecc 100644
--- a/src/intel_piix.c
+++ b/src/intel_piix.c
@@ -993,12 +993,14 @@ piix_reset_hard(piix_t *dev)
     	fregs[0x08] = dev->rev;
     fregs[0x09] = 0x00;
     fregs[0x0a] = 0x01; fregs[0x0b] = 0x06;
-    fregs[0x0e] = (dev->type > 1) ? 0x80 : 0x00;
+    fregs[0x0e] = ((dev->type > 1) || (dev->rev != 2)) ? 0x80 : 0x00;
     fregs[0x4c] = 0x4d;
     fregs[0x4e] = 0x03;
     fregs[0x60] = fregs[0x61] = fregs[0x62] = fregs[0x63] = 0x80;
     fregs[0x64] = (dev->type > 3) ? 0x10 : 0x00;
     fregs[0x69] = 0x02;
+    if ((dev->type == 1) && (dev->rev != 2))
+	fregs[0x6a] = 0x04;
     fregs[0x70] = (dev->type < 4) ? 0x80 : 0x00;
     fregs[0x71] = (dev->type < 3) ? 0x80 : 0x00;
     if (dev->type <= 4) {
@@ -1041,7 +1043,10 @@ piix_reset_hard(piix_t *dev)
 	fregs[0x3c] = 0x0e;
 	fregs[0x3d] = 0x01;
     }
-    dev->max_func = 0;		/* It starts with IDE disabled, then enables it. */
+    if ((dev->type == 1) && (dev->rev == 2))
+	dev->max_func = 0;		/* It starts with IDE disabled, then enables it. */
+    else
+	dev->max_func = 1;
 
     /* Function 2: USB */
     if (dev->type > 1) {
@@ -1180,6 +1185,12 @@ static void
 
     dev->bm[0] = device_add_inst(&sff8038i_device, 1);
     dev->bm[1] = device_add_inst(&sff8038i_device, 2);
+    if ((dev->type == 1) && (dev->rev == 2)) {
+	/* PIIX rev. 02 has faulty bus mastering on real hardware,
+	   so set our devices IDE devices to force ATA-3 (no DMA). */
+	ide_board_set_force_ata3(0, 1);
+	ide_board_set_force_ata3(1, 1);
+    }
 
     if (dev->type >= 3)
 	dev->usb = device_add(&usb_device);
@@ -1300,6 +1311,20 @@ const device_t piix_device =
     NULL
 };
 
+const device_t piix_rev02_device =
+{
+    "Intel 82371FB (PIIX) (Faulty BusMastering!!)",
+    DEVICE_PCI,
+    0x122e0121,
+    piix_init, 
+    piix_close, 
+    piix_reset,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+};
+
 const device_t piix3_device =
 {
     "Intel 82371SB (PIIX3)",
diff --git a/src/machine/m_at_socket4_5.c b/src/machine/m_at_socket4_5.c
index 81dcb13ac..a73cba1d9 100644
--- a/src/machine/m_at_socket4_5.c
+++ b/src/machine/m_at_socket4_5.c
@@ -244,8 +244,6 @@ machine_at_p54tp4xe_init(const machine_t *model)
     device_add(&keyboard_ps2_pci_device);
     device_add(&i430fx_device);
     device_add(&piix_device);
-    ide_board_set_force_ata3(0, 1);
-    ide_board_set_force_ata3(1, 1);
     device_add(&fdc37c665_device);
     device_add(&intel_flash_bxt_device);
 
@@ -438,8 +436,6 @@ machine_at_powermate_v_init(const machine_t *model)
     device_add(&keyboard_ps2_ami_pci_device);
     device_add(&i430fx_device);
     device_add(&piix_device);
-    ide_board_set_force_ata3(0, 1);
-    ide_board_set_force_ata3(1, 1);
     device_add(&fdc37c665_device);
     device_add(&intel_flash_bxt_device);
 
diff --git a/src/machine/m_at_socket7_s7.c b/src/machine/m_at_socket7_s7.c
index 24a6d533c..d18132a49 100644
--- a/src/machine/m_at_socket7_s7.c
+++ b/src/machine/m_at_socket7_s7.c
@@ -124,14 +124,12 @@ machine_at_pb640_init(const machine_t *model)
     pci_register_slot(0x0B, PCI_CARD_NORMAL, 3, 2, 1, 4);
     pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
     device_add(&i430fx_pb640_device);
-    device_add(&piix_device);
-    ide_board_set_force_ata3(0, 1);
-    ide_board_set_force_ata3(1, 1);
+    device_add(&piix_rev02_device);
 
     if (gfxcard == VID_INTERNAL)
 	device_add(&gd5440_onboard_pci_device);
 
-    device_add(&keyboard_ps2_ami_pci_device);
+    device_add(&keyboard_ps2_intel_ami_pci_device);
     device_add(&pc87306_device);
     device_add(&intel_flash_bxt_ami_device);
 

From df3dce487fad7acb6553dda3c3873d28eede16dc Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Wed, 6 May 2020 00:26:07 +0200
Subject: [PATCH 07/12] Fixed a bug in the code for clearing the network
 queues, should reduce crashes even further.

---
 src/network/network.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/network/network.c b/src/network/network.c
index 5f4c6dbaf..cd6f00df8 100644
--- a/src/network/network.c
+++ b/src/network/network.c
@@ -275,14 +275,15 @@ network_queue_advance(int tx)
 static void
 network_queue_clear(int tx)
 {
-    netpkt_t *temp = first_pkt[tx];
+    netpkt_t *temp = first_pkt[tx], *temp2;
 
     if (temp == NULL)
 	return;
 
     do {
+	temp2 = temp->next;
 	free(temp);
-	temp = temp->next;
+	temp = temp2;
     } while (temp != NULL);
 
     first_pkt[tx] = last_pkt[tx] = NULL;

From 9c6cfc9a15181bcb0e8c38de9d0413a9b76b4d73 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Wed, 6 May 2020 00:27:05 +0200
Subject: [PATCH 08/12] Optimized builds are now compiled with -fp-contact=fast
 for a slight performance improvement.

---
 src/win/Makefile.mingw     | 2 +-
 src/win/Makefile_ndr.mingw | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw
index e57efc9bd..381e446fb 100644
--- a/src/win/Makefile.mingw
+++ b/src/win/Makefile.mingw
@@ -320,7 +320,7 @@ else
  ifeq ($(OPTIM), y)
   AOPTIM	:= -mtune=native
   ifndef COPTIM
-   COPTIM	:= -O3 -flto=$(FLTO)
+   COPTIM	:= -O3 -ffp-contract=fast -flto=$(FLTO)
   endif
  else
   ifndef COPTIM
diff --git a/src/win/Makefile_ndr.mingw b/src/win/Makefile_ndr.mingw
index 1967963ea..e33767ad4 100644
--- a/src/win/Makefile_ndr.mingw
+++ b/src/win/Makefile_ndr.mingw
@@ -317,7 +317,7 @@ else
  ifeq ($(OPTIM), y)
   AOPTIM	:= -mtune=native
   ifndef COPTIM
-   COPTIM	:= -O3 -flto=$(FLTO)
+   COPTIM	:= -O3 -ffp-contract=fast -flto=$(FLTO)
   endif
  else
   ifndef COPTIM

From 3dd3396a2c2a947abb6bd6d64ae7421a142a8ef5 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Wed, 6 May 2020 03:41:46 +0200
Subject: [PATCH 09/12] Backported the codegen_accumulate functionality to the
 old recompiler, so Windows 98 first edition on i686 CPU's can stay fixed
 without i686 timings getting messed up.

---
 src/cpu/codegen_accumulate.h        | 13 +++++
 src/cpu/codegen_accumulate_x86-64.c | 50 ++++++++++++++++++
 src/cpu/codegen_accumulate_x86.c    | 49 ++++++++++++++++++
 src/cpu/codegen_x86-64.c            | 68 +++++-------------------
 src/cpu/codegen_x86.c               | 80 ++++++-----------------------
 src/win/Makefile.mingw              |  4 +-
 6 files changed, 141 insertions(+), 123 deletions(-)
 create mode 100644 src/cpu/codegen_accumulate.h
 create mode 100644 src/cpu/codegen_accumulate_x86-64.c
 create mode 100644 src/cpu/codegen_accumulate_x86.c

diff --git a/src/cpu/codegen_accumulate.h b/src/cpu/codegen_accumulate.h
new file mode 100644
index 000000000..8f9f6c95b
--- /dev/null
+++ b/src/cpu/codegen_accumulate.h
@@ -0,0 +1,13 @@
+enum
+{
+        ACCREG_ins    = 0,
+        ACCREG_cycles = 1,
+        
+        ACCREG_COUNT
+};
+
+struct ir_data_t;
+
+void codegen_accumulate(int acc_reg, int delta);
+void codegen_accumulate_flush(void);
+void codegen_accumulate_reset();
diff --git a/src/cpu/codegen_accumulate_x86-64.c b/src/cpu/codegen_accumulate_x86-64.c
new file mode 100644
index 000000000..415b04401
--- /dev/null
+++ b/src/cpu/codegen_accumulate_x86-64.c
@@ -0,0 +1,50 @@
+#include <stdint.h>
+#include <stdio.h>
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/mem.h>
+
+#include "codegen.h"
+#include "codegen_accumulate.h"
+
+static struct
+{
+        int count;
+        uintptr_t dest_reg;
+} acc_regs[] =
+{
+        [ACCREG_ins]    = {0, (uintptr_t) &(ins)},
+        [ACCREG_cycles] = {0, (uintptr_t) &(cycles)},
+};
+
+void codegen_accumulate(int acc_reg, int delta)
+{
+        acc_regs[acc_reg].count += delta;
+}
+
+void codegen_accumulate_flush(void)
+{
+        int c;
+        
+        for (c = 0; c < ACCREG_COUNT; c++)
+        {
+                if (acc_regs[c].count)
+		{
+                        addbyte(0x81); /*ADD $acc_regs[c].count,acc_regs[c].dest*/
+                        addbyte(0x04);
+                        addbyte(0x25);
+                        addlong((uint32_t) acc_regs[c].dest_reg);
+                        addlong(codegen_block_full_ins);
+                }
+
+                acc_regs[c].count = 0;
+        }
+}
+
+void codegen_accumulate_reset()
+{
+        int c;
+
+        for (c = 0; c < ACCREG_COUNT; c++)
+                acc_regs[c].count = 0;
+}
diff --git a/src/cpu/codegen_accumulate_x86.c b/src/cpu/codegen_accumulate_x86.c
new file mode 100644
index 000000000..2b99d4c66
--- /dev/null
+++ b/src/cpu/codegen_accumulate_x86.c
@@ -0,0 +1,49 @@
+#include <stdint.h>
+#include <stdio.h>
+#include <86box/86box.h>
+#include "cpu.h"
+#include <86box/mem.h>
+
+#include "codegen.h"
+#include "codegen_accumulate.h"
+
+static struct
+{
+        int count;
+        uintptr_t dest_reg;
+} acc_regs[] =
+{
+        [ACCREG_ins]    = {0, (uintptr_t) &(ins)},
+        [ACCREG_cycles] = {0, (uintptr_t) &(cycles)},
+};
+
+void codegen_accumulate(int acc_reg, int delta)
+{
+        acc_regs[acc_reg].count += delta;
+}
+
+void codegen_accumulate_flush(void)
+{
+        int c;
+        
+        for (c = 0; c < ACCREG_COUNT; c++)
+        {
+                if (acc_regs[c].count)
+		{
+                        addbyte(0x81); /*ADD $acc_regs[c].count,acc_regs[c].dest*/
+                        addbyte(0x05);
+                        addlong((uint32_t) acc_regs[c].dest_reg);
+                        addlong(acc_regs[c].count);
+                }
+
+                acc_regs[c].count = 0;
+        }
+}
+
+void codegen_accumulate_reset()
+{
+        int c;
+
+        for (c = 0; c < ACCREG_COUNT; c++)
+                acc_regs[c].count = 0;
+}
diff --git a/src/cpu/codegen_x86-64.c b/src/cpu/codegen_x86-64.c
index 8c3d87387..f674df1e4 100644
--- a/src/cpu/codegen_x86-64.c
+++ b/src/cpu/codegen_x86-64.c
@@ -16,6 +16,7 @@
 #include "386_common.h"
 
 #include "codegen.h"
+#include "codegen_accumulate.h"
 #include "codegen_ops.h"
 #include "codegen_ops_x86-64.h"
 
@@ -466,31 +467,10 @@ void codegen_block_end()
 void codegen_block_end_recompile(codeblock_t *block)
 {
         codegen_timing_block_end();
+        codegen_accumulate(ACCREG_cycles, -codegen_block_cycles);
+
+        codegen_accumulate_flush();
 
-        if (codegen_block_cycles)
-        {
-                addbyte(0x81); /*SUB $codegen_block_cycles, cyclcs*/
-                addbyte(0x6d);
-                addbyte((uint8_t)cpu_state_offset(_cycles));
-                addlong((uint32_t)codegen_block_cycles);
-        }
-        if (codegen_block_ins)
-        {
-                addbyte(0x81); /*ADD $codegen_block_ins,ins*/
-                addbyte(0x45);
-                addbyte((uint8_t)cpu_state_offset(cpu_recomp_ins));
-                addlong(codegen_block_ins);
-        }
-#if 0
-        if (codegen_block_full_ins)
-        {
-                addbyte(0x81); /*ADD $codegen_block_ins,ins*/
-                addbyte(0x04);
-                addbyte(0x25);
-                addlong((uint32_t)&cpu_recomp_full_ins);
-                addlong(codegen_block_full_ins);
-        }
-#endif
         addbyte(0x48); /*ADDL $40,%rsp*/
         addbyte(0x83);
         addbyte(0xC4);
@@ -1068,6 +1048,10 @@ void codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t
         
 generate_call:
         codegen_timing_opcode(opcode, fetchdat, op_32, op_pc);
+
+        codegen_accumulate(ACCREG_ins, 1);
+        codegen_accumulate(ACCREG_cycles, -codegen_block_cycles);
+        codegen_block_cycles = 0;
         
         if ((op_table == x86_dynarec_opcodes &&
               ((opcode & 0xf0) == 0x70 || (opcode & 0xfc) == 0xe0 || opcode == 0xc2 ||
@@ -1086,39 +1070,10 @@ generate_call:
 			jump_cycles = codegen_timing_jump_cycles();
 
                 if (jump_cycles)
-                {
-                        addbyte(0x81); /*SUB $jump_cycles, cyclcs*/
-                        addbyte(0x6d);
-                        addbyte((uint8_t)cpu_state_offset(_cycles));
-                        addlong((uint32_t)jump_cycles);
-                }
-
-                /*Opcode is likely to cause block to exit, update cycle count*/
-                if (codegen_block_cycles)
-                {
-                        addbyte(0x81); /*SUB $codegen_block_cycles, cyclcs*/
-                        addbyte(0x6d);
-                        addbyte((uint8_t)cpu_state_offset(_cycles));
-                        addlong((uint32_t)codegen_block_cycles);
-                        codegen_block_cycles = 0;
-                }
-                if (codegen_block_ins)
-                {
-                        addbyte(0x81); /*ADD $codegen_block_ins,ins*/
-                        addbyte(0x45);
-                        addbyte((uint8_t)cpu_state_offset(cpu_recomp_ins));
-                        addlong(codegen_block_ins);
-                        codegen_block_ins = 0;
-                }
-
+                        codegen_accumulate(ACCREG_cycles, -jump_cycles);
+                codegen_accumulate_flush();
                 if (jump_cycles)
-                {
-                        addbyte(0x81); /*SUB $jump_cycles, cyclcs*/
-                        addbyte(0x6d);
-                        addbyte((uint8_t)cpu_state_offset(_cycles));
-                        addlong((uint32_t)jump_cycles);
-                        jump_cycles = 0;
-                }
+                        codegen_accumulate(ACCREG_cycles, jump_cycles);
         }
 
         if ((op_table == x86_dynarec_opcodes_REPNE || op_table == x86_dynarec_opcodes_REPE) && !op_table[opcode | op_32])
@@ -1186,6 +1141,7 @@ generate_call:
                 addlong((uint32_t)(uintptr_t)op_ea_seg);
         }
 
+        codegen_accumulate_flush();
 
         addbyte(0xC7); /*MOVL [pc],new_pc*/
         addbyte(0x45);
diff --git a/src/cpu/codegen_x86.c b/src/cpu/codegen_x86.c
index 85e2af2b1..222e7c2c7 100644
--- a/src/cpu/codegen_x86.c
+++ b/src/cpu/codegen_x86.c
@@ -54,6 +54,7 @@
 #include "386_common.h"
 
 #include "codegen.h"
+#include "codegen_accumulate.h"
 #include "codegen_ops.h"
 #include "codegen_ops_x86.h"
 
@@ -1502,6 +1503,8 @@ void codegen_block_start_recompile(codeblock_t *block)
 
         codegen_flat_ds = !(cpu_cur_status & CPU_STATUS_NOTFLATDS);
         codegen_flat_ss = !(cpu_cur_status & CPU_STATUS_NOTFLATSS);       
+
+        codegen_accumulate_reset();
 }
 
 void codegen_block_remove()
@@ -1585,30 +1588,10 @@ void codegen_block_end()
 void codegen_block_end_recompile(codeblock_t *block)
 {
         codegen_timing_block_end();
+        codegen_accumulate(ACCREG_cycles, -codegen_block_cycles);
+
+        codegen_accumulate_flush();
 
-        if (codegen_block_cycles)
-        {
-                addbyte(0x81); /*SUB $codegen_block_cycles, cyclcs*/
-                addbyte(0x6d);
-                addbyte((uint8_t)cpu_state_offset(_cycles));
-                addlong(codegen_block_cycles);
-        }
-        if (codegen_block_ins)
-        {
-                addbyte(0x81); /*ADD $codegen_block_ins,ins*/
-                addbyte(0x45);
-                addbyte((uint8_t)cpu_state_offset(cpu_recomp_ins));
-                addlong(codegen_block_ins);
-        }
-#if 0
-        if (codegen_block_full_ins)
-        {
-                addbyte(0x81); /*ADD $codegen_block_ins,ins*/
-                addbyte(0x05);
-                addlong((uint32_t)&cpu_recomp_full_ins);
-                addlong(codegen_block_full_ins);
-        }
-#endif
         addbyte(0x83); /*ADDL $16,%esp*/
         addbyte(0xC4);
         addbyte(0x10);
@@ -2033,6 +2016,10 @@ void codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t
 generate_call:
         codegen_timing_opcode(opcode, fetchdat, op_32, op_pc);
 
+        codegen_accumulate(ACCREG_ins, 1);
+        codegen_accumulate(ACCREG_cycles, -codegen_block_cycles);
+        codegen_block_cycles = 0;
+
         if ((op_table == x86_dynarec_opcodes &&
               ((opcode & 0xf0) == 0x70 || (opcode & 0xfc) == 0xe0 || opcode == 0xc2 ||
               (opcode & 0xfe) == 0xca || (opcode & 0xfc) == 0xcc || (opcode & 0xfc) == 0xe8 ||
@@ -2050,49 +2037,10 @@ generate_call:
 			jump_cycles = codegen_timing_jump_cycles();
 
                 if (jump_cycles)
-                {
-                        addbyte(0x81); /*SUB $jump_cycles, cycles*/
-                        addbyte(0x6d);
-                        addbyte((uint8_t)cpu_state_offset(_cycles));
-                        addlong(jump_cycles);
-                }
-
-                /*Opcode is likely to cause block to exit, update cycle count*/
-                if (codegen_block_cycles)
-                {
-                        addbyte(0x81); /*SUB $codegen_block_cycles, cycles*/
-                        addbyte(0x6d);
-                        addbyte((uint8_t)cpu_state_offset(_cycles));
-                        addlong(codegen_block_cycles);
-                        codegen_block_cycles = 0;
-                }
-                if (codegen_block_ins)
-                {
-                        addbyte(0x81); /*ADD $codegen_block_ins,ins*/
-                        addbyte(0x45);
-                        addbyte((uint8_t)cpu_state_offset(cpu_recomp_ins));
-                        addlong(codegen_block_ins);
-                        codegen_block_ins = 0;
-                }
-#if 0
-                if (codegen_block_full_ins)
-                {
-                        addbyte(0x81); /*ADD $codegen_block_ins,ins*/
-                        addbyte(0x05);
-                        addlong((uint32_t)&cpu_recomp_full_ins);
-                        addlong(codegen_block_full_ins);
-                        codegen_block_full_ins = 0;
-                }
-#endif
-
+                        codegen_accumulate(ACCREG_cycles, -jump_cycles);
+                codegen_accumulate_flush();
                 if (jump_cycles)
-                {
-                        addbyte(0x81); /*SUB $jump_cycles, cycles*/
-                        addbyte(0x6d);
-                        addbyte((uint8_t)cpu_state_offset(_cycles));
-                        addlong(jump_cycles);
-                        jump_cycles = 0;
-                }
+                        codegen_accumulate(ACCREG_cycles, jump_cycles);
         }
 
         if ((op_table == x86_dynarec_opcodes_REPNE || op_table == x86_dynarec_opcodes_REPE) && !op_table[opcode | op_32])
@@ -2164,6 +2112,8 @@ generate_call:
                 addlong((uint32_t)op_ea_seg);
         }
 
+        codegen_accumulate_flush();
+
         addbyte(0xC7); /*MOVL pc,new_pc*/
         addbyte(0x45);
         addbyte((uint8_t)cpu_state_offset(pc));
diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw
index 381e446fb..cebd6d8d3 100644
--- a/src/win/Makefile.mingw
+++ b/src/win/Makefile.mingw
@@ -353,9 +353,9 @@ endif
 # Optional modules.
 ifeq ($(DYNAREC), y)
 ifeq ($(X64), y)
-PLATCG		:= codegen_x86-64.o
+PLATCG		:= codegen_x86-64.o codegen_accumulate_x86-64.o
 else
-PLATCG		:= codegen_x86.o
+PLATCG		:= codegen_x86.o codegen_accumulate_x86.o
 endif
 
 OPTS		+= -DUSE_DYNAREC

From 8cda5aee20e8d8eb4be70ddecd2b44ce89b036aa Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Wed, 6 May 2020 03:43:37 +0200
Subject: [PATCH 10/12] PIT counters' null_count variables are now set to 1 on
 counter reload to make sure the readouts after counter reload are correct,
 fixes MR BIOS'es on interpreter (still broken on the recompiler because of
 another issue specifically related to the PIT on the recompiler), among other
 things.

---
 src/pit.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pit.c b/src/pit.c
index 91691d5bc..b04f23001 100644
--- a/src/pit.c
+++ b/src/pit.c
@@ -368,7 +368,7 @@ ctr_latch_status(ctr_t *ctr)
 static void
 ctr_latch_count(ctr_t *ctr)
 {
-    int count = (ctr->latch || (ctr->state == 1)) ? ctr->l : ctr->count;
+    int count = (ctr->latch || ctr->null_count || (ctr->state == 1)) ? ctr->l : ctr->count;
 
     switch (ctr->rm & 0x03) {
 	case 0x00:
@@ -575,6 +575,8 @@ pit_write(uint16_t addr, uint8_t val, void *priv)
 	case 1:
 	case 2:		/* the actual timers */
 		ctr = &dev->counters[t];
+		/* Reloading timer count, so set null_count to 1. */
+		ctr->null_count = 1;
 
 		switch (ctr->wm) {
 			case 0:
@@ -642,7 +644,7 @@ pit_read(uint16_t addr, void *priv)
 			break;
 		}
 
-		count = (ctr->state == 1) ? ctr->l : ctr->count;
+		count = (ctr->null_count || (ctr->state == 1)) ? ctr->l : ctr->count;
 
 		if (ctr->latched) {
 			ret = (ctr->rl) >> ((ctr->rm & 0x80) ? 8 : 0);

From 0821f7ea4119af996ed40ed92c71b434329ad325 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Wed, 6 May 2020 04:09:33 +0200
Subject: [PATCH 11/12] Fixed the accumulate function on the 64-bit recompiler.

---
 src/cpu/codegen_accumulate_x86-64.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cpu/codegen_accumulate_x86-64.c b/src/cpu/codegen_accumulate_x86-64.c
index 415b04401..9b089df02 100644
--- a/src/cpu/codegen_accumulate_x86-64.c
+++ b/src/cpu/codegen_accumulate_x86-64.c
@@ -34,7 +34,7 @@ void codegen_accumulate_flush(void)
                         addbyte(0x04);
                         addbyte(0x25);
                         addlong((uint32_t) acc_regs[c].dest_reg);
-                        addlong(codegen_block_full_ins);
+                        addlong(acc_regs[c].count);
                 }
 
                 acc_regs[c].count = 0;

From cb6bedf70f1f09e8e959ef0bde51a23a1c519dbd Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Wed, 6 May 2020 05:35:45 +0200
Subject: [PATCH 12/12] Some fixes to board readout registers, TC430HX now
 properly works without a sound card.

---
 src/intel_piix.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/intel_piix.c b/src/intel_piix.c
index a33eeeecc..885af6645 100644
--- a/src/intel_piix.c
+++ b/src/intel_piix.c
@@ -896,8 +896,6 @@ board_write(uint16_t port, uint8_t val, void *priv)
 
     if (port == 0x0078)
 	dev->board_config[0] = val;
-    else if (port == 0x0079)
-	dev->board_config[1] = val;
     else if (port == 0x00e0)
 	dev->cur_readout_reg = val;
     else if (port == 0x00e1)
@@ -1266,7 +1264,6 @@ static void
     io_sethandler(0x00e0, 0x0002, board_read, NULL, NULL, board_write, NULL, NULL, dev);
 
     dev->board_config[0] = 0xff;
-    dev->board_config[0] = 0x00;
     /* Register 0x0079: */
     /* Bit 7: 0 = Clear password, 1 = Keep password. */
     /* Bit 6: 0 = NVRAM cleared by jumper, 1 = NVRAM normal. */
@@ -1277,6 +1274,7 @@ static void
     /*		60 MHz: Switch 7 = On, Switch 8 = Off. */
     /*		66 MHz: Switch 7 = Off, Switch 8 = On. */
     /* Bit 2: 0 = On-board audio absent, 1 = On-board audio present. */
+    /* Bit 1: 0 = Soft-off capable power supply present, 1 = Soft-off capable power supply absent. */
     /* Bit 0: 0 = 1.5x multiplier, 1 = 2x multiplier (Switch 6). */
     /* NOTE: A bit is read as 1 if switch is off, and as 0 if switch is on. */
     dev->board_config[1] = 0xe0;