Merge remote-tracking branch 'origin/master' into usb-bochs

Cacodemon345 · May 26, 2024 · 7078e90 · 7078e90
2 parents 79385a7 + e61c620
commit 7078e90
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/chipset/ali1543.c b/src/chipset/ali1543.c
@@ -413,6 +413,7 @@ ali1533_write(int func, int addr, uint8_t val, void *priv)
         case 0x74: /* USB IRQ Routing - we cheat and use MIRQ4 */
             dev->pci_conf[addr] = val & 0xdf;
             /* TODO: MIRQ level/edge control - if bit 4 = 1, it's level */
+            pci_set_mirq_level(PCI_MIRQ4, !(val & 0x10));
             pci_set_mirq_routing(PCI_MIRQ4, ali1533_irq_routing[val & 0x0f]);
             break;
 

diff --git a/src/cpu/x86_ops_mov_ctrl.h b/src/cpu/x86_ops_mov_ctrl.h
@@ -82,7 +82,7 @@ opMOV_r_CRx_a32(uint32_t fetchdat)
 static int
 opMOV_r_DRx_a16(uint32_t fetchdat)
 {
-    if (((CPL > 0) || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1)) {
+    if ((CPL > 0) && (cr0 & 1)) {
         x86gpf(NULL, 0);
         return 1;
     }
@@ -126,7 +126,7 @@ opMOV_r_DRx_a16(uint32_t fetchdat)
 static int
 opMOV_r_DRx_a32(uint32_t fetchdat)
 {
-    if (((CPL > 0) || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1)) {
+    if ((CPL > 0) && (cr0 & 1)) {
         x86gpf(NULL, 0);
         return 1;
     }
@@ -286,7 +286,7 @@ opMOV_CRx_r_a32(uint32_t fetchdat)
 static int
 opMOV_DRx_r_a16(uint32_t fetchdat)
 {
-    if (((CPL > 0) || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1)) {
+    if ((CPL > 0) && (cr0 & 1)) {
         x86gpf(NULL, 0);
         return 1;
     }
@@ -334,7 +334,7 @@ opMOV_DRx_r_a16(uint32_t fetchdat)
 static int
 opMOV_DRx_r_a32(uint32_t fetchdat)
 {
-    if (((CPL > 0) || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1)) {
+    if ((CPL > 0) && (cr0 & 1)) {
         x86gpf(NULL, 0);
         return 1;
     }

diff --git a/src/cpu/x86_ops_mov_ctrl_2386.h b/src/cpu/x86_ops_mov_ctrl_2386.h
@@ -82,7 +82,7 @@ opMOV_r_CRx_a32(uint32_t fetchdat)
 static int
 opMOV_r_DRx_a16(uint32_t fetchdat)
 {
-    if (((CPL > 0) || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1)) {
+    if ((CPL > 0) && (cr0 & 1)) {
         x86gpf(NULL, 0);
         return 1;
     }
@@ -124,7 +124,7 @@ opMOV_r_DRx_a16(uint32_t fetchdat)
 static int
 opMOV_r_DRx_a32(uint32_t fetchdat)
 {
-    if (((CPL > 0) || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1)) {
+    if ((CPL > 0) && (cr0 & 1)) {
         x86gpf(NULL, 0);
         return 1;
     }
@@ -282,7 +282,7 @@ opMOV_CRx_r_a32(uint32_t fetchdat)
 static int
 opMOV_DRx_r_a16(uint32_t fetchdat)
 {
-    if (((CPL > 0) || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1)) {
+    if ((CPL > 0) && (cr0 & 1)) {
         x86gpf(NULL, 0);
         return 1;
     }
@@ -325,7 +325,7 @@ opMOV_DRx_r_a16(uint32_t fetchdat)
 static int
 opMOV_DRx_r_a32(uint32_t fetchdat)
 {
-    if (((CPL > 0) || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1)) {
+    if ((CPL > 0) && (cr0 & 1)) {
         x86gpf(NULL, 0);
         return 1;
     }