Changeset 9430 in vbox for trunk/src

Timestamp:

Jun 5, 2008 3:28:07 PM (17 years ago)

Author:

vboxsync

Message:

Made the base of GDTR and IDTR 64 bits.

Location:

trunk/src/VBox

Files:

• Debugger/DBGCBuiltInSymbols.cpp (modified) (3 diffs)
• Debugger/DBGCEmulateCodeView.cpp (modified) (1 diff)
• VMM/CPUM.cpp (modified) (3 diffs)
• VMM/CPUMInternal.mac (modified) (2 diffs)
• VMM/SELM.cpp (modified) (3 diffs)
• VMM/SELMInternal.h (modified) (1 diff)
• VMM/TRPMInternal.mac (modified) (1 diff)
• VMM/VMMAll/CPUMAllRegs.cpp (modified) (2 diffs)
• VMM/testcase/tstVMStructSize.cpp (modified) (1 diff)

trunk/src/VBox/Debugger/DBGCBuiltInSymbols.cpp

@@ -82 +82 @@
 /** 8 byte. */
 #define SYMREG_SIZE_8           ( 8 << SYMREG_SIZE_SHIFT)
+/** 10 bytes. */
+#define SYMREG_SIZE_10          (10 << SYMREG_SIZE_SHIFT)
 /** 12 byte. */
 #define SYMREG_SIZE_12          (12 << SYMREG_SIZE_SHIFT)
@@ -148 +150 @@
     { "ldtr",   dbgcSymGetReg,          dbgcSymSetReg,      offsetof(CPUMCTX, ldtr)     | SYMREG_SIZE_2 },
 
-    { "gdtr",   dbgcSymGetReg,          dbgcSymSetReg,      offsetof(CPUMCTX, gdtr)     | SYMREG_SIZE_6 },
+    { "gdtr",   dbgcSymGetReg,          dbgcSymSetReg,      offsetof(CPUMCTX, gdtr)     | SYMREG_SIZE_10 },
     { "gdtr.limit", dbgcSymGetReg,      dbgcSymSetReg,      offsetof(CPUMCTX, gdtr.cbGdt)| SYMREG_SIZE_2 },
-    { "gdtr.base",  dbgcSymGetReg,      dbgcSymSetReg,      offsetof(CPUMCTX, gdtr.pGdt)| SYMREG_SIZE_4 },
-
-    { "idtr",   dbgcSymGetReg,          dbgcSymSetReg,      offsetof(CPUMCTX, idtr)     | SYMREG_SIZE_6 },
+    { "gdtr.base",  dbgcSymGetReg,      dbgcSymSetReg,      offsetof(CPUMCTX, gdtr.pGdt)| SYMREG_SIZE_8 },
+
+    { "idtr",   dbgcSymGetReg,          dbgcSymSetReg,      offsetof(CPUMCTX, idtr)     | SYMREG_SIZE_10 },
     { "idtr.limit", dbgcSymGetReg,      dbgcSymSetReg,      offsetof(CPUMCTX, idtr.cbIdt)| SYMREG_SIZE_2 },
-    { "idtr.base",  dbgcSymGetReg,      dbgcSymSetReg,      offsetof(CPUMCTX, idtr.pIdt)| SYMREG_SIZE_4 },
+    { "idtr.base",  dbgcSymGetReg,      dbgcSymSetReg,      offsetof(CPUMCTX, idtr.pIdt)| SYMREG_SIZE_8 },
 
     /* hypervisor */
@@ -213 +215 @@
     {".ldtr",   dbgcSymGetReg,          dbgcSymSetReg,      offsetof(CPUMCTX, ldtr)     | SYMREG_SIZE_2 | SYMREG_FLAGS_HYPER },
 
-    {".gdtr",   dbgcSymGetReg,          dbgcSymSetReg,      offsetof(CPUMCTX, gdtr)     | SYMREG_SIZE_6 | SYMREG_FLAGS_HYPER },
+    {".gdtr",   dbgcSymGetReg,          dbgcSymSetReg,      offsetof(CPUMCTX, gdtr)     | SYMREG_SIZE_10 | SYMREG_FLAGS_HYPER },
     {".gdtr.limit", dbgcSymGetReg,      dbgcSymSetReg,      offsetof(CPUMCTX, gdtr.cbGdt)| SYMREG_SIZE_2| SYMREG_FLAGS_HYPER },
-    {".gdtr.base",  dbgcSymGetReg,      dbgcSymSetReg,      offsetof(CPUMCTX, gdtr.pGdt)| SYMREG_SIZE_4 | SYMREG_FLAGS_HYPER },
-
-    {".idtr",   dbgcSymGetReg,          dbgcSymSetReg,      offsetof(CPUMCTX, idtr)     | SYMREG_SIZE_6 | SYMREG_FLAGS_HYPER },
+    {".gdtr.base",  dbgcSymGetReg,      dbgcSymSetReg,      offsetof(CPUMCTX, gdtr.pGdt)| SYMREG_SIZE_8 | SYMREG_FLAGS_HYPER },
+
+    {".idtr",   dbgcSymGetReg,          dbgcSymSetReg,      offsetof(CPUMCTX, idtr)     | SYMREG_SIZE_10 | SYMREG_FLAGS_HYPER },
     {".idtr.limit", dbgcSymGetReg,      dbgcSymSetReg,      offsetof(CPUMCTX, idtr.cbIdt)| SYMREG_SIZE_2| SYMREG_FLAGS_HYPER },
-    {".idtr.base",  dbgcSymGetReg,      dbgcSymSetReg,      offsetof(CPUMCTX, idtr.pIdt)| SYMREG_SIZE_4 | SYMREG_FLAGS_HYPER },
+    {".idtr.base",  dbgcSymGetReg,      dbgcSymSetReg,      offsetof(CPUMCTX, idtr.pIdt)| SYMREG_SIZE_8 | SYMREG_FLAGS_HYPER },
 
 };

trunk/src/VBox/Debugger/DBGCEmulateCodeView.cpp

@@ -1352 +1352 @@
                 "%sgs={%04x base=%VGv limit=%08x flags=%08x} %scr0=%08x %scr2=%08x\n"
                 "%sss={%04x base=%VGv limit=%08x flags=%08x} %scr3=%08x %scr4=%08x\n"
-                "%sgdtr=%08x:%04x  %sidtr=%08x:%04x  %seflags=%08x\n"
+                "%sgdtr=%VGv:%04x  %sidtr=%VGv:%04x  %seflags=%08x\n"
                 "%sldtr={%04x base=%VGv limit=%08x flags=%08x}\n"
                 "%str  ={%04x base=%VGv limit=%08x flags=%08x}\n"

trunk/src/VBox/VMM/CPUM.cpp

@@ -62 +62 @@
 *******************************************************************************/
 /** The saved state version. */
-#define CPUM_SAVED_STATE_VERSION    6
+#define CPUM_SAVED_STATE_VERSION    7
 
 
@@ -804 +804 @@
                 "%seip=%08x %sesp=%08x %sebp=%08x %siopl=%d %*s\n"
                 "%scs=%04x %sss=%04x %sds=%04x %ses=%04x %sfs=%04x %sgs=%04x %str=%04x      %seflags=%08x\n"
-                "%scr0=%08RX64 %scr2=%08RX64 %scr3=%08RX64 %scr4=%08RX64 %sgdtr=%08x:%04x %sldtr=%04x\n"
+                "%scr0=%08RX64 %scr2=%08RX64 %scr3=%08RX64 %scr4=%08RX64 %sgdtr=%VGv:%04x %sldtr=%04x\n"
                 ,
                 pszPrefix, pCtxCore->eax, pszPrefix, pCtxCore->ebx, pszPrefix, pCtxCore->ecx, pszPrefix, pCtxCore->edx, pszPrefix, pCtxCore->esi, pszPrefix, pCtxCore->edi,
@@ -824 +824 @@
                 "%sgs={%04x base=%VGv limit=%08x flags=%08x} %scr0=%08RX64 %scr2=%08RX64\n"
                 "%sss={%04x base=%VGv limit=%08x flags=%08x} %scr3=%08RX64 %scr4=%08RX64\n"
-                "%sgdtr=%08x:%04x  %sidtr=%08x:%04x  %seflags=%08x\n"
+                "%sgdtr=%VGv:%04x  %sidtr=%VGv:%04x  %seflags=%08x\n"
                 "%sldtr={%04x base=%VGv limit=%08x flags=%08x}\n"
                 "%str  ={%04x base=%VGv limit=%08x flags=%08x}\n"

trunk/src/VBox/VMM/CPUMInternal.mac

@@ -245 +245 @@
     .Hyper.dr7            resq    1
 
-    .Hyper.gdtr           resb    6           ; GDT limit + linear address
+    .Hyper.gdtr           resb    10          ; GDT limit + linear address
     .Hyper.gdtrPadding    resw    1
-    .Hyper.gdtrPadding64  resd    1
-    .Hyper.idtr           resb    6           ; IDT limit + linear address
+    .Hyper.idtr           resb    10          ; IDT limit + linear address
     .Hyper.idtrPadding    resw    1
-    .Hyper.idtrPadding64  resd    1
     .Hyper.ldtr           resw    1
     .Hyper.ldtrPadding    resw    1
@@ -361 +359 @@
     .Guest.dr7            resq    1
 
-    .Guest.gdtr           resb    6           ; GDT limit + linear address
+    .Guest.gdtr           resb    10          ; GDT limit + linear address
     .Guest.gdtrPadding    resw    1
-    .Guest.gdtrPadding64  resd    1
-    .Guest.idtr           resb    6           ; IDT limit + linear address
+    .Guest.idtr           resb    10          ; IDT limit + linear address
     .Guest.idtrPadding    resw    1
-    .Guest.idtrPadding64  resd    1
     .Guest.ldtr           resw    1
     .Guest.ldtrPadding    resw    1

trunk/src/VBox/VMM/SELM.cpp

@@ -843 +843 @@
                 else
                 {
-                    AssertReleaseMsgFailed(("Couldn't read GDT at %RX32, rc=%Vrc!\n", GDTR.pGdt, rc));
+                    AssertReleaseMsgFailed(("Couldn't read GDT at %VGv, rc=%Vrc!\n", GDTR.pGdt, rc));
                     STAM_PROFILE_STOP(&pVM->selm.s.StatUpdateFromCPUM, a);
                     return VERR_NOT_IMPLEMENTED;
@@ -1006 +1006 @@
             ||  GDTR.cbGdt != pVM->selm.s.GuestGdtr.cbGdt)
         {
-            Log(("SELMR3UpdateFromCPUM: Guest's GDT is changed to pGdt=%08X cbGdt=%08X\n", GDTR.pGdt, GDTR.cbGdt));
+            Log(("SELMR3UpdateFromCPUM: Guest's GDT is changed to pGdt=%VGv cbGdt=%08X\n", GDTR.pGdt, GDTR.cbGdt));
 
             /*
@@ -2158 +2158 @@
     VBOXGDTR    GDTR;
     CPUMGetGuestGDTR(pVM, &GDTR);
-    RTGCPTR     pGDTGC = (RTGCPTR)GDTR.pGdt;
+    RTGCPTR     pGDTGC = GDTR.pGdt;
     unsigned    cGDTs = ((unsigned)GDTR.cbGdt + 1) / sizeof(VBOXDESC);
 

trunk/src/VBox/VMM/SELMInternal.h

@@ -113 +113 @@
     RTUINT                  offLdtHyper;
 
-#if (HC_ARCH_BITS == 32 || GC_ARCH_BITS == 64) && !(HC_ARCH_BITS == 32 && GC_ARCH_BITS == 64)
-    /** TSS alignment padding. */
-    RTUINT                  auPadding[2];
-#endif
     /** TSS. (This is 16 byte aligned!)
       * @todo I/O bitmap & interrupt redirection table? */

trunk/src/VBox/VMM/TRPMInternal.mac

@@ -55 +55 @@
 
     .GCPtrIdt           RTRCPTR_RES 1
-    .GuestIdtr          resb 6
+    .GuestIdtr          resb 10
     .au8Padding         resb 2
 

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

@@ -110 +110 @@
     pVM->cpum.s.Hyper.gdtr.pGdt  = addr;
     pVM->cpum.s.Hyper.gdtrPadding = 0;
-    pVM->cpum.s.Hyper.gdtrPadding64 = 0;
 }
 
@@ -118 +117 @@
     pVM->cpum.s.Hyper.idtr.pIdt = addr;
     pVM->cpum.s.Hyper.idtrPadding = 0;
-    pVM->cpum.s.Hyper.idtrPadding64 = 0;
 }
 

trunk/src/VBox/VMM/testcase/tstVMStructSize.cpp

@@ -108 +108 @@
     CHECK_SIZE(VBOXDESC, 8);
     CHECK_SIZE(VBOXIDTE, 8);
-    CHECK_SIZE(VBOXIDTR, 6);
-    CHECK_SIZE(VBOXGDTR, 6);
+    CHECK_SIZE(VBOXIDTR, 10);
+    CHECK_SIZE(VBOXGDTR, 10);
     CHECK_SIZE(VBOXTSS, 136);
     CHECK_SIZE(X86FXSTATE, 512);