Changeset 9656 in vbox for trunk/src/VBox

Timestamp:

Jun 12, 2008 11:56:51 AM (17 years ago)

Author:

vboxsync

Message:

Changed u1Reserved to u1Long in the selector attributes field.

Location:

trunk/src/VBox/VMM

Files:

• DBGFDisas.cpp (modified) (1 diff)
• SELM.cpp (modified) (6 diffs)
• VMMAll/EMAll.cpp (modified) (1 diff)
• VMMAll/SELMAll.cpp (modified) (5 diffs)
• VMMTests.cpp (modified) (1 diff)

trunk/src/VBox/VMM/DBGFDisas.cpp

@@ -103 +103 @@
     int rc = DISCoreOneEx(GCPtr,
                           pSelInfo->Raw.Gen.u1DefBig
-                          ? enmMode >= PGMMODE_AMD64 && pSelInfo->Raw.Gen.u1Reserved
+                          ? enmMode >= PGMMODE_AMD64 && pSelInfo->Raw.Gen.u1Long
                           ? CPUMODE_64BIT
                           : CPUMODE_32BIT

trunk/src/VBox/VMM/SELM.cpp

@@ -265 +265 @@
     pDesc->Gen.u1Present        = 1;
     pDesc->Gen.u1Available      = 0;
-    pDesc->Gen.u1Reserved       = 0;
+    pDesc->Gen.u1Long           = 0;
     pDesc->Gen.u1DefBig         = 1; /* def 32 bit */
     pDesc->Gen.u1Granularity    = 1; /* 4KB limit */
@@ -281 +281 @@
     pDesc->Gen.u1Present        = 1;
     pDesc->Gen.u1Available      = 0;
-    pDesc->Gen.u1Reserved       = 0;
+    pDesc->Gen.u1Long           = 0;
     pDesc->Gen.u1DefBig         = 1; /* big */
     pDesc->Gen.u1Granularity    = 1; /* 4KB limit */
@@ -297 +297 @@
     pDesc->Gen.u1Present        = 1;
     pDesc->Gen.u1Available      = 0;
-    pDesc->Gen.u1Reserved       = 1; /* The Long (L) attribute bit. */
+    pDesc->Gen.u1Long           = 1; /* The Long (L) attribute bit. */
     pDesc->Gen.u1DefBig         = 0; /* With L=1 this must be 0. */
     pDesc->Gen.u1Granularity    = 1; /* 4KB limit */
@@ -316 +316 @@
     pDesc->Gen.u1Present        = 1;
     pDesc->Gen.u1Available      = 0;
-    pDesc->Gen.u1Reserved       = 0;
+    pDesc->Gen.u1Long           = 0;
     pDesc->Gen.u1DefBig         = 0;
     pDesc->Gen.u1Granularity    = 0; /* byte limit */
@@ -335 +335 @@
     pDesc->Gen.u1Present        = 1;
     pDesc->Gen.u1Available      = 0;
-    pDesc->Gen.u1Reserved       = 0;
+    pDesc->Gen.u1Long           = 0;
     pDesc->Gen.u1DefBig         = 0;
     pDesc->Gen.u1Granularity    = 0; /* byte limit */
@@ -1192 +1192 @@
         pDesc->Gen.u8BaseHigh2  = RT_BYTE4(GCPtrShadowLDT);
         pDesc->Gen.u1Available  = 0;
-        pDesc->Gen.u1Reserved   = 0;
+        pDesc->Gen.u1Long       = 0;
         if (cbLdt > 0xffff)
         {

trunk/src/VBox/VMM/VMMAll/EMAll.cpp

@@ -2034 +2034 @@
     uint64_t uTicks = TMCpuTickGet(pVM);
 
+    /* Same behaviour in 32 & 64 bits mode */
     pRegFrame->eax = uTicks;
     pRegFrame->edx = (uTicks >> 32ULL);

trunk/src/VBox/VMM/VMMAll/SELMAll.cpp

@@ -88 +88 @@
 SELMDECL(RTGCPTR) SELMToFlat(PVM pVM, X86EFLAGS eflags, RTSEL Sel, CPUMSELREGHID *pHiddenSel, RTGCPTR Addr)
 {
+    Assert(!CPUMIsGuestInLongMode(pVM));    /** @todo */
     Assert(pHiddenSel || !CPUMAreHiddenSelRegsValid(pVM));
 
@@ -131 +132 @@
 SELMDECL(int) SELMToFlatEx(PVM pVM, X86EFLAGS eflags, RTSEL Sel, RTGCPTR Addr, CPUMSELREGHID *pHiddenSel, unsigned fFlags, PRTGCPTR ppvGC, uint32_t *pcb)
 {
+    Assert(!CPUMIsGuestInLongMode(pVM));    /** @todo */
     /*
      * Deal with real & v86 mode first.
@@ -450 +452 @@
                     )
             {
+                /* 64 bits mode: CS, DS, ES and SS are treated as if each segment base is 0 (Intel® 64 and IA-32 Architectures Software Developer's Manual: 3.4.2.1). */
+                if (    CPUMIsGuestInLongMode(pVM)
+                    &&  pHidCS->Attr.n.u1Long)
+                {
+                    *ppvFlat = Addr;
+                    return VINF_SUCCESS;
+                }
+
                 /*
                  * Limit check. Note that the limit in the hidden register is the 
                  * final value. The granularity bit was included in its calculation.
                  */
-                uint32_t    u32Limit = pHidCS->u32Limit;
+                uint32_t u32Limit = pHidCS->u32Limit;
                 if ((RTGCUINTPTR)Addr <= u32Limit)
                 {
@@ -615 +625 @@
 }
 
-
+#ifndef IN_RING0
 /**
  * Gets ss:esp for ring1 in main Hypervisor's TSS.
@@ -690 +700 @@
     return VINF_SUCCESS;
 }
-
+#endif
 
 /**

trunk/src/VBox/VMM/VMMTests.cpp

@@ -445 +445 @@
             pHyperCtx->reg##Hid.Attr.n.u2Dpl         = selInfo.Raw.Gen.u2Dpl;           \
             pHyperCtx->reg##Hid.Attr.n.u1DescType    = selInfo.Raw.Gen.u1DescType;      \
-            pHyperCtx->reg##Hid.Attr.n.u1Reserved    = selInfo.Raw.Gen.u1Reserved;      \
+            pHyperCtx->reg##Hid.Attr.n.u1Long        = selInfo.Raw.Gen.u1Long;          \
         }