Changeset 62287 in vbox for trunk/src/recompiler/VBoxRecompiler.c

Timestamp:

Jul 15, 2016 6:44:49 PM (8 years ago)

Author:

vboxsync

Message:

REM: Killed the REMR3NotifyPendingInterrupt interface. Misguided hack for something TRPM should be doing and couldn't because REMR3State wasn't doing it's job wrt TRPM_HARDWARE_INT.

File:

• trunk/src/recompiler/VBoxRecompiler.c (modified) (11 diffs)

trunk/src/recompiler/VBoxRecompiler.c

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -112 +112 @@
 static DECLCALLBACK(int) remR3Save(PVM pVM, PSSMHANDLE pSSM);
 static DECLCALLBACK(int) remR3Load(PVM pVM, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass);
+static DECLCALLBACK(int) remR3LoadDone(PVM pVM, PSSMHANDLE pSSM);
 static void     remR3StateUpdate(PVM pVM, PVMCPU pVCpu);
 static int      remR3InitPhysRamSizeAndDirtyMap(PVM pVM, bool fGuarded);
@@ -352 +353 @@
 
     /* Nothing is pending by default */
-    pVM->rem.s.u32PendingInterrupt = REM_NO_PENDING_IRQ;
+    pVM->rem.s.uStateLoadPendingInterrupt = REM_NO_PENDING_IRQ;
 
     /*
@@ -372 +373 @@
                                NULL, NULL, NULL,
                                NULL, remR3Save, NULL,
-                               NULL, remR3Load, NULL);
+                               NULL, remR3Load, remR3LoadDone);
     if (RT_FAILURE(rc))
         return rc;
@@ -637 +638 @@
     /* Remember if we've entered raw mode (vital for ring 1 checks in e.g. iret emulation). */
     SSMR3PutU32(pSSM, !!(pRem->Env.state & CPU_RAW_RING0));
-    SSMR3PutU32(pSSM, pVM->rem.s.u32PendingInterrupt);
+    SSMR3PutU32(pSSM, REM_NO_PENDING_IRQ);
 
     return SSMR3PutU32(pSSM, ~0);       /* terminator */
@@ -732 +733 @@
     }
 
-    rc = SSMR3GetUInt(pSSM, &pVM->rem.s.u32PendingInterrupt);
-    if (RT_FAILURE(rc))
-        return rc;
+    rc = SSMR3GetUInt(pSSM, &pVM->rem.s.uStateLoadPendingInterrupt);
+    AssertRCReturn(rc, rc);
+    AssertLogRelMsgReturn(   pVM->rem.s.uStateLoadPendingInterrupt == REM_NO_PENDING_IRQ
+                          || pVM->rem.s.uStateLoadPendingInterrupt < 256,
+                          ("uStateLoadPendingInterrupt=%#x\n", pVM->rem.s.uStateLoadPendingInterrupt),
+                          VERR_SSM_UNEXPECTED_DATA);
 
     /* check the terminator. */
@@ -769 +773 @@
 }
 
+
+/**
+ * @callback_method_impl{FNSSMINTLOADDONE,
+ *    For pushing misdesigned pending-interrupt mess to TRPM where it belongs. }
+ */
+static DECLCALLBACK(int) remR3LoadDone(PVM pVM, PSSMHANDLE pSSM)
+{
+    if (pVM->rem.s.uStateLoadPendingInterrupt != REM_NO_PENDING_IRQ)
+    {
+        int rc = TRPMAssertTrap(&pVM->aCpus[0], pVM->rem.s.uStateLoadPendingInterrupt, TRPM_HARDWARE_INT);
+        AssertLogRelMsgReturn(rc, ("uStateLoadPendingInterrupt=%#x rc=%Rrc\n", pVM->rem.s.uStateLoadPendingInterrupt, rc), rc);
+        pVM->rem.s.uStateLoadPendingInterrupt = REM_NO_PENDING_IRQ;
+    }
+    return VINF_SUCCESS;
+}
 
 
@@ -1119 +1138 @@
         pVM->rem.s.Env.interrupt_request = CPU_INTERRUPT_SINGLE_INSTR;
 #endif
-        if (   VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_UPDATE_APIC | VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC)
-            || pVM->rem.s.u32PendingInterrupt != REM_NO_PENDING_IRQ)
+        if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_UPDATE_APIC | VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC))
             pVM->rem.s.Env.interrupt_request |= CPU_INTERRUPT_HARD;
         RTLogPrintf("remR3RunLoggingStep: interrupt_request=%#x halted=%d exception_index=%#x\n",
@@ -2520 +2538 @@
         APICUpdatePendingInterrupts(pVCpu);
 #endif
-    if (    pVM->rem.s.u32PendingInterrupt != REM_NO_PENDING_IRQ
-        ||  VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC))
-    {
+    if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC))
         pVM->rem.s.Env.interrupt_request |= CPU_INTERRUPT_HARD;
-    }
 
     /*
@@ -4242 +4257 @@
 
 /* -+- FF notifications -+- */
-
-
-/**
- * Notification about a pending interrupt.
- *
- * @param   pVM             VM Handle.
- * @param   pVCpu           VMCPU Handle.
- * @param   u8Interrupt     Interrupt
- * @thread  The emulation thread.
- */
-REMR3DECL(void) REMR3NotifyPendingInterrupt(PVM pVM, PVMCPU pVCpu, uint8_t u8Interrupt)
-{
-    Assert(pVM->rem.s.u32PendingInterrupt == REM_NO_PENDING_IRQ);
-    pVM->rem.s.u32PendingInterrupt = u8Interrupt;
-}
-
-/**
- * Notification about a pending interrupt.
- *
- * @returns Pending interrupt or REM_NO_PENDING_IRQ
- * @param   pVM             VM Handle.
- * @param   pVCpu           VMCPU Handle.
- * @thread  The emulation thread.
- */
-REMR3DECL(uint32_t) REMR3QueryPendingInterrupt(PVM pVM, PVMCPU pVCpu)
-{
-    return pVM->rem.s.u32PendingInterrupt;
-}
 
 /**
@@ -4521 +4508 @@
      */
     /* Note! We assume we will go directly to the recompiler to handle the pending interrupt! */
-    /** @todo r=bird: In the long run we should just do the interrupt handling in EM/CPUM/TRPM/somewhere and
-     * if we cannot execute the interrupt handler in raw-mode just reschedule to REM. Once that is done we
-     * remove this kludge. */
-    if (env->pVM->rem.s.u32PendingInterrupt != REM_NO_PENDING_IRQ)
-    {
-        rc = VINF_SUCCESS;
-        Assert(env->pVM->rem.s.u32PendingInterrupt <= 255);
-        u8Interrupt = env->pVM->rem.s.u32PendingInterrupt;
-        env->pVM->rem.s.u32PendingInterrupt = REM_NO_PENDING_IRQ;
-    }
-    else
-        rc = PDMGetInterrupt(env->pVCpu, &u8Interrupt);
-
+    rc = PDMGetInterrupt(env->pVCpu, &u8Interrupt);
     LogFlow(("cpu_get_pic_interrupt: u8Interrupt=%d rc=%Rrc pc=%04x:%08llx ~flags=%08llx\n",
              u8Interrupt, rc, env->segs[R_CS].selector, (uint64_t)env->eip, (uint64_t)env->eflags));