Changeset 34020 in vbox

Timestamp:

Nov 12, 2010 9:12:09 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

67685

Message:

VMMR0/TRPMR0.cpp: use a 64-bit gate descriptor on 64-bit hosts (cleans up the old hack)

File:

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

trunk/src/VBox/VMM/VMMR0/TRPMR0.cpp

@@ -78 +78 @@
     PVBOXIDTE   pIdte = &((PVBOXIDTE)Idtr.pIdt)[uActiveVector];
 # else
-    PVBOXIDTE   pIdte = &((PVBOXIDTE)Idtr.pIdt)[uActiveVector * 2];
+    PVBOXIDTE64 pIdte = &((PVBOXIDTE64)Idtr.pIdt)[uActiveVector];
 # endif
     AssertMsgReturnVoid(pIdte->Gen.u1Present, ("The IDT entry (%d) is not present!\n", uActiveVector));
@@ -94 +94 @@
 # else /* 64-bit: */
     RTFAR64   pfnHandler;
-    pfnHandler.off = VBOXIDTE_OFFSET(*pIdte);
-    pfnHandler.off |= (uint64_t)(*(uint32_t *)(pIdte + 1)) << 32; //cleanup!
+    pfnHandler.off = VBOXIDTE64_OFFSET(*pIdte);
     pfnHandler.sel = pIdte->Gen.u16SegSel;
 
-    RTR0UINTREG uRSP = ~(RTR0UINTREG)0;
-    if (pIdte->au32[1] & 0x7 /*IST*/)
+    const RTR0UINTREG uRSP = ~(RTR0UINTREG)0;
+    if (pIdte->Gen.u3Ist)
     {
         trpmR0DispatchHostInterruptSimple(uActiveVector);