Changeset 10665 in vbox for trunk/src/VBox

Timestamp:

Jul 15, 2008 2:41:57 PM (16 years ago)

Author:

vboxsync

Message:

Fixed apicHasPendingInterrupt.

File:

• trunk/src/VBox/Devices/PC/DevAPIC.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/PC/DevAPIC.cpp

@@ -509 +509 @@
 }
 
+static int apic_get_ppr_zero_tpr(APICState *s)
+{
+    int isrv;
+
+    isrv = get_highest_priority_int(s->isr);
+    if (isrv < 0)
+        isrv = 0;
+    return isrv;
+}
+
 static int apic_get_arb_pri(APICState *s)
 {
@@ -544 +554 @@
 
 #ifdef VBOX
+
+/* Check if the APIC has a pending interrupt/if a TPR change would active one. */
+PDMBOTHCBDECL(bool) apicHasPendingIrq(PPDMDEVINS pDevIns)
+{
+    int irrv, ppr;
+
+    APICState *s = PDMINS2DATA(pDevIns, APICState *);
+    if (!s) 
+        return false;
+
+    irrv = get_highest_priority_int(s->irr);
+    if (irrv < 0)
+        return false;
+
+    ppr = apic_get_ppr_zero_tpr(s);
+    if (ppr && (irrv & 0xf0) <= (ppr & 0xf0))
+        return false;
+
+    return true;
+}
+
 static void apic_update_tpr(APICState *s, uint32_t val)
 {
@@ -762 +793 @@
     return intno;
 }
-
-/* Check if the APIC has a pending interrupt/if a TPR change would active one. */
-PDMBOTHCBDECL(bool) apicHasPendingIrq(PPDMDEVINS pDevIns)
-{
-    int irrv;
-
-    APICState *s = PDMINS2DATA(pDevIns, APICState *);
-    if (!s) 
-        return false;
-
-    irrv = get_highest_priority_int(s->irr);
-    return irrv >= 0;
-}
-
 
 static uint32_t apic_get_current_count(APICState *s)