Changeset 46314 in vbox

Timestamp:

May 29, 2013 2:27:46 PM (12 years ago)

Author:

vboxsync

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

86080

Message:

VMM/HM: AMD-V bits. Get rid of unnecessary pragma packs and use 'u' instead of 'au64[1]' of the structure sizing.

Location:

trunk

Files:

• include/VBox/vmm/hm_svm.h (modified) (9 diffs)
• src/VBox/VMM/VMMR0/HWSVMR0.cpp (modified) (20 diffs)

trunk/include/VBox/vmm/hm_svm.h

@@ -457 +457 @@
  * SVM Event injection structure (EVENTINJ and EXITINTINFO).
  */
-#pragma pack(1)
 typedef union
 {
@@ -469 +468 @@
         uint32_t    u32ErrorCode        : 32;
     } n;
-    uint64_t    au64[1];
+    uint64_t    u;
 } SVMEVENT;
-#pragma pack()
 
 
@@ -477 +475 @@
  * SVM Interrupt control structure (Virtual Interrupt Control).
  */
-#pragma pack(1)
 typedef union
 {
@@ -494 +491 @@
         uint32_t    u24Reserved         : 24;
     } n;
-    uint64_t    au64[1];
+    uint64_t    u;
 } SVMINTCTRL;
-#pragma pack()
-
 
 /**
  * SVM TLB control structure.
  */
-#pragma pack(1)
 typedef union
 {
@@ -511 +505 @@
         uint32_t    u24Reserved         : 24;
     } n;
-    uint64_t    au64[1];
+    uint64_t    u;
 } SVMTLBCTRL;
-#pragma pack()
-
 
 /**
  * SVM IOIO exit structure (EXITINFO1 for IOIO intercepts).
  */
-#pragma pack(1)
 typedef union
 {
@@ -537 +528 @@
         uint32_t    u16Port             : 16;
     } n;
-    uint32_t    au32[1];
+    uint32_t    u;
 } SVMIOIOEXIT;
-#pragma pack()
 
 /**
  * SVM nested paging structure.
  */
-#pragma pack(1)
 typedef union
 {
@@ -551 +540 @@
         uint32_t    u1NestedPaging      : 1;             /**< enabled/disabled */
     } n;
-    uint64_t    au64[1];
+    uint64_t    u;
 } SVMNPCTRL;
-#pragma pack()
 
 /**
  * SVM AVIC.
  */
-#pragma pack(1)
 typedef union
 {
@@ -569 +556 @@
     uint64_t    u;
 } SVMAVIC;
-#pragma pack()
 
 /**
  * SVM AVIC PHYSICAL_TABLE pointer.
  */
-#pragma pack(1)
 typedef union
 {
@@ -586 +571 @@
     uint64_t    u;
 } SVMAVICPHYS;
-#pragma pack()
 
 /**

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

@@ -524 +524 @@
 {
 #ifdef VBOX_STRICT
-    Log(("SVM: Set pending event: intInfo=%016llx\n", pEvent->au64[0]));
+    Log(("SVM: Set pending event: intInfo=%016llx\n", pEvent->u));
 #endif
 
@@ -531 +531 @@
 
     /* Set pending event state. */
-    pVCpu->hm.s.Event.u64IntrInfo  = pEvent->au64[0];
-    pVCpu->hm.s.Event.fPending = true;
+    pVCpu->hm.s.Event.u64IntrInfo = pEvent->u;
+    pVCpu->hm.s.Event.fPending    = true;
 }
 
@@ -553 +553 @@
     {
         Log(("SVM: Inject int %d at %RGv error code=%02x CR2=%RGv intInfo=%08x\n", pEvent->n.u8Vector,
-             (RTGCPTR)pCtx->rip, pEvent->n.u32ErrorCode, (RTGCPTR)pCtx->cr2, pEvent->au64[0]));
+             (RTGCPTR)pCtx->rip, pEvent->n.u32ErrorCode, (RTGCPTR)pCtx->cr2, pEvent->u));
     }
     else if (pEvent->n.u8Vector < 0x20)
@@ -566 +566 @@
 
     /* Set event injection state. */
-    pVmcb->ctrl.EventInject.au64[0] = pEvent->au64[0];
+    pVmcb->ctrl.EventInject.u = pEvent->u;
 }
 
@@ -594 +594 @@
              (RTGCPTR)pCtx->rip));
         STAM_COUNTER_INC(&pVCpu->hm.s.StatIntReinject);
-        Event.au64[0] = pVCpu->hm.s.Event.u64IntrInfo;
+        Event.u = pVCpu->hm.s.Event.u64IntrInfo;
         hmR0SvmInjectEvent(pVCpu, pVmcb, pCtx, &Event);
 
@@ -688 +688 @@
         RTGCUINT    u32ErrorCode;
 
-        Event.au64[0] = 0;
+        Event.u = 0;
 
         /* If a new event is pending, then dispatch it now. */
@@ -1598 +1598 @@
         Log(("ctrl.ExitIntInfo.u1Valid          %x\n",      pVmcb->ctrl.ExitIntInfo.n.u1Valid));
         Log(("ctrl.ExitIntInfo.u32ErrorCode     %x\n",      pVmcb->ctrl.ExitIntInfo.n.u32ErrorCode));
-        Log(("ctrl.NestedPaging                 %RX64\n",   pVmcb->ctrl.NestedPaging.au64));
+        Log(("ctrl.NestedPaging                 %RX64\n",   pVmcb->ctrl.NestedPaging.u));
         Log(("ctrl.EventInject.u8Vector         %x\n",      pVmcb->ctrl.EventInject.n.u8Vector));
         Log(("ctrl.EventInject.u3Type           %x\n",      pVmcb->ctrl.EventInject.n.u3Type));
@@ -1790 +1790 @@
 
     /* Check if an injected event was interrupted prematurely. */
-    pVCpu->hm.s.Event.u64IntrInfo = pVmcb->ctrl.ExitIntInfo.au64[0];
+    pVCpu->hm.s.Event.u64IntrInfo = pVmcb->ctrl.ExitIntInfo.u;
     if (    pVmcb->ctrl.ExitIntInfo.n.u1Valid
             /* we don't care about 'int xx' as the instruction will be restarted. */
@@ -1799 +1799 @@
 #ifdef LOG_ENABLED
         SVMEVENT Event;
-        Event.au64[0] = pVCpu->hm.s.Event.u64IntrInfo;
+        Event.u = pVCpu->hm.s.Event.u64IntrInfo;
 
         if (    exitCode == SVM_EXIT_EXCEPTION_E
@@ -1848 +1848 @@
     RTTraceBufAddMsgF(pVM->CTX_SUFF(hTraceBuf), "vmexit %08x at %04:%08RX64 %RX64 %RX64 %RX64",
                       exitCode, pCtx->cs.Sel, pCtx->rip,
-                      pVmcb->ctrl.u64ExitInfo1, pVmcb->ctrl.u64ExitInfo2, pVmcb->ctrl.ExitIntInfo.au64[0]);
+                      pVmcb->ctrl.u64ExitInfo1, pVmcb->ctrl.u64ExitInfo2, pVmcb->ctrl.ExitIntInfo.u);
 #endif
 #if ARCH_BITS == 64 /* for the time being */
     VBOXVMM_R0_HMSVM_VMEXIT(pVCpu, pCtx, exitCode, pVmcb->ctrl.u64ExitInfo1, pVmcb->ctrl.u64ExitInfo2,
-                            pVmcb->ctrl.ExitIntInfo.au64[0], UINT64_MAX);
+                            pVmcb->ctrl.ExitIntInfo.u, UINT64_MAX);
 #endif
     STAM_PROFILE_ADV_STOP_START(&pVCpu->hm.s.StatExit1, &pVCpu->hm.s.StatExit2, x);
@@ -1888 +1888 @@
 
                 /* Reinject the exception. */
-                Event.au64[0]    = 0;
+                Event.u          = 0;
                 Event.n.u3Type   = SVM_EVENT_EXCEPTION; /* trap or fault */
                 Event.n.u1Valid  = 1;
@@ -1922 +1922 @@
             STAM_COUNTER_INC(&pVCpu->hm.s.StatExitGuestNM);
 
-            Event.au64[0]    = 0;
+            Event.u          = 0;
             Event.n.u3Type   = SVM_EVENT_EXCEPTION;
             Event.n.u1Valid  = 1;
@@ -1949 +1949 @@
                 pCtx->cr2 = uFaultAddress;
 
-                Event.au64[0]               = 0;
+                Event.u                     = 0;
                 Event.n.u3Type              = SVM_EVENT_EXCEPTION;
                 Event.n.u1Valid             = 1;
@@ -2023 +2023 @@
                 pCtx->cr2 = uFaultAddress;
 
-                Event.au64[0]               = 0;
+                Event.u                     = 0;
                 Event.n.u3Type              = SVM_EVENT_EXCEPTION;
                 Event.n.u1Valid             = 1;
@@ -2054 +2054 @@
             Log(("Trap %x at %RGv\n", vector, (RTGCPTR)pCtx->rip));
 
-            Event.au64[0]    = 0;
+            Event.u          = 0;
             Event.n.u3Type   = SVM_EVENT_EXCEPTION;
             Event.n.u1Valid  = 1;
@@ -2071 +2071 @@
         case X86_XCPT_NP:   /* Segment not present exception. */
         {
-            Event.au64[0]    = 0;
+            Event.u          = 0;
             Event.n.u3Type   = SVM_EVENT_EXCEPTION;
             Event.n.u1Valid  = 1;
@@ -2449 +2449 @@
         SVMIOIOEXIT   IoExitInfo;
 
-        IoExitInfo.au32[0] = pVmcb->ctrl.u64ExitInfo1;
-        unsigned uIdx      = (IoExitInfo.au32[0] >> 4) & 0x7;
+        IoExitInfo.u       = (uint32_t)pVmcb->ctrl.u64ExitInfo1;
+        unsigned uIdx      = (IoExitInfo.u >> 4) & 0x7;
         uint32_t uIOSize   = g_aIOSize[uIdx];
         uint32_t uAndVal   = g_aIOOpAnd[uIdx];
@@ -2578 +2578 @@
                             Log(("Inject IO debug trap at %RGv\n", (RTGCPTR)pCtx->rip));
 
-                            Event.au64[0]    = 0;
+                            Event.u          = 0;
                             Event.n.u3Type   = SVM_EVENT_EXCEPTION; /* trap or fault */
                             Event.n.u1Valid  = 1;
@@ -2678 +2678 @@
         SVMEVENT Event;
 
-        Event.au64[0]    = 0;
+        Event.u          = 0;
         Event.n.u3Type   = SVM_EVENT_EXCEPTION;
         Event.n.u1Valid  = 1;
@@ -2736 +2736 @@
         {
             SVMEVENT Event;
-            Event.au64[0] = pVCpu->hm.s.Event.u64IntrInfo;
+            Event.u = pVCpu->hm.s.Event.u64IntrInfo;
 
             /* Caused by an injected interrupt. */