Merge remote-tracking branch 'upstream/master' into feature/mtrr

src/cpu/cpu.c

@@ -114,7 +114,7 @@ int isa_cycles, cpu_inited,
     cpu_waitstates, cpu_cache_int_enabled, cpu_cache_ext_enabled,
     cpu_isa_speed, cpu_pci_speed, cpu_isa_pci_div, cpu_agp_speed, cpu_alt_reset,
 
-    cpu_override, cpu_effective, cpu_multi, cpu_16bitbus, cpu_64bitbus, cpu_busspeed,
+    cpu_override, cpu_effective, cpu_multi, cpu_16bitbus, cpu_64bitbus,
     cpu_cyrix_alignment, CPUID,
 
     is186, is_nec,
@@ -138,7 +138,7 @@ uint8_t  _cache[2048];
 uint64_t cpu_CR4_mask, tsc = 0;
 uint64_t pmc[2] = { 0, 0 };
 
-double cpu_dmulti;
+double cpu_dmulti, cpu_busspeed;
 
 msr_t msr;
 

src/cpu/cpu.h

@@ -490,10 +490,11 @@ extern int                        cpu_override;
 extern int    cpu_isintel;
 extern int    cpu_iscyrix;
 extern int    cpu_16bitbus, cpu_64bitbus;
-extern int    cpu_busspeed, cpu_pci_speed;
+extern int    cpu_pci_speed;
 extern int    cpu_multi;
 extern double cpu_dmulti;
 extern double fpu_multi;
+extern double cpu_busspeed;
 extern int    cpu_cyrix_alignment; /*Cyrix 5x86/6x86 only has data misalignment
                                      penalties when crossing 8-byte boundaries*/
 

src/cpu/x86.c

@@ -29,6 +29,7 @@
 #include <86box/device.h>
 #include <86box/dma.h>
 #include <86box/io.h>
+#include <86box/keyboard.h>
 #include <86box/mem.h>
 #include <86box/rom.h>
 #include <86box/nmi.h>
@@ -265,9 +266,12 @@ reset_common(int hard)
     if (is286) {
         loadcs(0xF000);
         cpu_state.pc = 0xFFF0;
-        rammask      = cpu_16bitbus ? 0xFFFFFF : 0xFFFFFFFF;
-        if (is6117)
-            rammask |= 0x03000000;
+        if (hard) {
+            rammask      = cpu_16bitbus ? 0xFFFFFF : 0xFFFFFFFF;
+            if (is6117)
+                rammask |= 0x03000000;
+            mem_a20_key = mem_a20_alt = mem_a20_state = 0;
+        }
     }
     idt.base        = 0;
     cpu_state.flags = 2;
@@ -315,6 +319,10 @@ reset_common(int hard)
         cache_index                      = 0;
         memset(_tr, 0x00, sizeof(_tr));
         memset(_cache, 0x00, sizeof(_cache));
+
+        /* If we have an AT or PS/2 keyboard controller, make sure the A20 state
+           is correct. */
+        kbc_at_a20_reset();
     }
 
     if (!is286)