Changeset 138 in vbox for trunk/src/VBox/VMM

Timestamp:

Jan 18, 2007 2:59:18 PM (18 years ago)

Author:

vboxsync

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

17589

Message:

64-bit

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PGMAllHandler.cpp (modified) (1 diff)
• VMMR0/HWVMXR0.cpp (modified) (3 diffs)

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

@@ -1061 +1061 @@
     if (Cpu.mode == CPUMODE_32BIT)
     {
-        uint8_t *pu8Code;
-        int rc = SELMValidateAndConvertCSAddr(pVM, pRegFrame->ss, pRegFrame->cs, &pRegFrame->csHid, (RTGCPTR)pRegFrame->eip, (PRTGCPTR)&pu8Code);
+        RTGCPTR GCPtrCode;
+        int rc = SELMValidateAndConvertCSAddr(pVM, pRegFrame->ss, pRegFrame->cs, &pRegFrame->csHid, (RTGCPTR)pRegFrame->eip, &GCPtrCode);
         if (VBOX_SUCCESS(rc))
         {
             uint32_t cbOp;
-            rc = pgmDisCoreOne(pVM, &Cpu, (RTGCUINTPTR)pu8Code, &cbOp);
+            rc = pgmDisCoreOne(pVM, &Cpu, (RTGCUINTPTR)GCPtrCode, &cbOp);
             if (VBOX_SUCCESS(rc))
             {

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

@@ -255 +255 @@
 {
     int         rc;
-    uint32_t    iGate    = VMX_EXIT_INTERRUPTION_INFO_VECTOR(intInfo);
 
 #ifdef VBOX_STRICT
+    uint32_t    iGate = VMX_EXIT_INTERRUPTION_INFO_VECTOR(intInfo);
     if (iGate == 0xE)
         Log2(("VMXR0InjectEvent: Injecting interrupt %d at %VGv error code=%08x CR2=%08x intInfo=%08x\n", iGate, pCtx->eip, errCode, pCtx->cr2, intInfo));
@@ -481 +481 @@
         rc |= VMXWriteVMCS(VMX_VMCS_HOST_GS_BASE,           0);
 #else
-        rc  = VMXWriteVMCS64(VMX_VMCS_HOST_FS_BASE,           ASMRdMsr(MSR_IA32_FS_BASE));
-        rc |= VMXWriteVMCS64(VMX_VMCS_HOST_GS_BASE,           ASMRdMsr(MSR_IA32_GS_BASE));
+        rc  = VMXWriteVMCS64(VMX_VMCS_HOST_FS_BASE,           ASMRdMsr(MSR_K8_FS_BASE));
+        rc |= VMXWriteVMCS64(VMX_VMCS_HOST_GS_BASE,           ASMRdMsr(MSR_K8_GS_BASE));
 #endif
         AssertRC(rc);
@@ -764 +764 @@
 {
     int         rc = VINF_SUCCESS;
-    RTGCUINTPTR val, valShadow;
-    RTGCUINTPTR exitReason, instrError, cbInstr, exitQualification;
-    RTGCUINTPTR intInfo, errCode, instrInfo, uInterruptState;
+    RTCCUINTREG val, valShadow;
+    RTCCUINTREG exitReason, instrError, cbInstr;
+    RTGCUINTPTR exitQualification;
+    RTGCUINTPTR intInfo = 0; /* shut up buggy gcc 4 */
+    RTGCUINTPTR errCode, instrInfo, uInterruptState;
 
     Log2(("\nE"));