Changeset 19141 in vbox for trunk/src/VBox/VMM/PATM/PATM.cpp

Timestamp:

Apr 23, 2009 1:52:18 PM (16 years ago)

Author:

vboxsync

Message:

Action flags breakup.
Fixed PGM saved state loading of 2.2.2 images.
Reduced hacks in PATM state loading (fixups).

File:

• trunk/src/VBox/VMM/PATM/PATM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/PATM/PATM.cpp

@@ -112 +112 @@
     Log(("PATMR3Init: Patch record size %d\n", sizeof(PATCHINFO)));
 
-    AssertReleaseMsg(PATMInterruptFlag == (VM_FF_INTERRUPT_APIC | VM_FF_INTERRUPT_PIC | VM_FF_TIMER | VM_FF_REQUEST),
-                     ("Interrupt flags out of sync!! PATMInterruptFlag=%#x expected %#x. broken assembler?\n", PATMInterruptFlag, VM_FF_INTERRUPT_APIC | VM_FF_INTERRUPT_PIC | VM_FF_TIMER | VM_FF_REQUEST));
+    /* These values can't change as they are hardcoded in patch code (old saved states!) */
+    AssertCompile(VM_FF_TIMER   == VMCPU_FF_TIMER);
+    AssertCompile(VM_FF_REQUEST == VMCPU_FF_REQUEST);
+    AssertCompile(VMCPU_FF_INTERRUPT_APIC == RT_BIT_32(0));
+    AssertCompile(VMCPU_FF_INTERRUPT_PIC == RT_BIT_32(1));
+
+    AssertReleaseMsg(PATMInterruptFlag == (VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC | VMCPU_FF_TIMER | VMCPU_FF_REQUEST),
+                     ("Interrupt flags out of sync!! PATMInterruptFlag=%#x expected %#x. broken assembler?\n", PATMInterruptFlag, VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC | VMCPU_FF_TIMER | VMCPU_FF_REQUEST));
 
     /* Allocate patch memory and GC patch state memory. */
@@ -6233 +6239 @@
         }
 #endif
-        EMSetInhibitInterruptsPC(pVM, pVCpu, pNewEip);
+        EMSetInhibitInterruptsPC(pVCpu, pNewEip);
         pVM->patm.s.pGCStateHC->GCPtrInhibitInterrupts = 0;
     }