Changeset 41907 in vbox for trunk

Timestamp:

Jun 25, 2012 1:08:53 AM (13 years ago)

Author:

vboxsync

Message:

32-bit build fixes

Location:

trunk/src/VBox/VMM/VMMSwitcher

Files:

• LegacyandAMD64.mac (modified) (1 diff)
• PAEand32Bit.mac (modified) (5 diffs)

trunk/src/VBox/VMM/VMMSwitcher/LegacyandAMD64.mac

@@ -383 +383 @@
     DEBUG_CHAR('7')
     mov     rsp, 0
-    mov     eax, [rdx + CPUMCPU.Hyper.ss]
+    mov     eax, [rdx + CPUMCPU.Hyper.ss.Sel]
     mov     ss, ax
     mov     esp, [rdx + CPUMCPU.Hyper.esp]

trunk/src/VBox/VMM/VMMSwitcher/PAEand32Bit.mac

@@ -387 +387 @@
     ; Setup stack.
     DEBUG_CHAR('3')
-    mov     eax, [edx + CPUMCPU.Hyper.ss]
+    mov     eax, [edx + CPUMCPU.Hyper.ss.Sel]
     mov     ss, ax
     mov     esp, [edx + CPUMCPU.Hyper.esp]
@@ -396 +396 @@
     and     dword [0ffffffffh], ~0200h      ; clear busy flag (2nd type2 bit)
     DEBUG_CHAR('5')
-    ltr     word [edx + CPUMCPU.Hyper.tr]
+    ltr     word [edx + CPUMCPU.Hyper.tr.Sel]
     DEBUG_CHAR('6')
 
     ; Activate the ldt (now we can safely crash).
-    lldt    [edx + CPUMCPU.Hyper.ldtr]
+    lldt    [edx + CPUMCPU.Hyper.ldtr.Sel]
     DEBUG_CHAR('7')
 
@@ -654 +654 @@
     mov     eax, [esp + 4 + CPUMCTXCORE.edi]
     mov     [edx + CPUMCPU.Guest.edi], eax
-    mov     eax, dword [esp + 4 + CPUMCTXCORE.es]
-    mov     dword [edx + CPUMCPU.Guest.es], eax
-    mov     eax, dword [esp + 4 + CPUMCTXCORE.cs]
-    mov     dword [edx + CPUMCPU.Guest.cs], eax
-    mov     eax, dword [esp + 4 + CPUMCTXCORE.ss]
-    mov     dword [edx + CPUMCPU.Guest.ss], eax
-    mov     eax, dword [esp + 4 + CPUMCTXCORE.ds]
-    mov     dword [edx + CPUMCPU.Guest.ds], eax
-    mov     eax, dword [esp + 4 + CPUMCTXCORE.fs]
-    mov     dword [edx + CPUMCPU.Guest.fs], eax
-    mov     eax, dword [esp + 4 + CPUMCTXCORE.gs]
-    mov     dword [edx + CPUMCPU.Guest.gs], eax
+    mov     eax, dword [esp + 4 + CPUMCTXCORE.es.Sel]
+    mov     dword [edx + CPUMCPU.Guest.es.Sel], eax
+    mov     eax, dword [esp + 4 + CPUMCTXCORE.cs.Sel]
+    mov     dword [edx + CPUMCPU.Guest.cs.Sel], eax
+    mov     eax, dword [esp + 4 + CPUMCTXCORE.ss.Sel]
+    mov     dword [edx + CPUMCPU.Guest.ss.Sel], eax
+    mov     eax, dword [esp + 4 + CPUMCTXCORE.ds.Sel]
+    mov     dword [edx + CPUMCPU.Guest.ds.Sel], eax
+    mov     eax, dword [esp + 4 + CPUMCTXCORE.fs.Sel]
+    mov     dword [edx + CPUMCPU.Guest.fs.Sel], eax
+    mov     eax, dword [esp + 4 + CPUMCTXCORE.gs.Sel]
+    mov     dword [edx + CPUMCPU.Guest.gs.Sel], eax
     mov     eax, [esp + 4 + CPUMCTXCORE.eflags]
     mov     dword [edx + CPUMCPU.Guest.eflags], eax
@@ -734 +734 @@
     mov     [edx + CPUMCPU.Hyper.esp], eax
     ; selectors
-    mov     eax, [ecx + CPUMCTXCORE.ss]
-    mov     [edx + CPUMCPU.Hyper.ss], eax
-    mov     eax, [ecx + CPUMCTXCORE.gs]
-    mov     [edx + CPUMCPU.Hyper.gs], eax
-    mov     eax, [ecx + CPUMCTXCORE.fs]
-    mov     [edx + CPUMCPU.Hyper.fs], eax
-    mov     eax, [ecx + CPUMCTXCORE.es]
-    mov     [edx + CPUMCPU.Hyper.es], eax
-    mov     eax, [ecx + CPUMCTXCORE.ds]
-    mov     [edx + CPUMCPU.Hyper.ds], eax
-    mov     eax, [ecx + CPUMCTXCORE.cs]
-    mov     [edx + CPUMCPU.Hyper.cs], eax
+    mov     eax, [ecx + CPUMCTXCORE.ss.Sel]
+    mov     [edx + CPUMCPU.Hyper.ss.Sel], eax
+    mov     eax, [ecx + CPUMCTXCORE.gs.Sel]
+    mov     [edx + CPUMCPU.Hyper.gs.Sel], eax
+    mov     eax, [ecx + CPUMCTXCORE.fs.Sel]
+    mov     [edx + CPUMCPU.Hyper.fs.Sel], eax
+    mov     eax, [ecx + CPUMCTXCORE.es.Sel]
+    mov     [edx + CPUMCPU.Hyper.es.Sel], eax
+    mov     eax, [ecx + CPUMCTXCORE.ds.Sel]
+    mov     [edx + CPUMCPU.Hyper.ds.Sel], eax
+    mov     eax, [ecx + CPUMCTXCORE.cs.Sel]
+    mov     [edx + CPUMCPU.Hyper.cs.Sel], eax
     ; flags
     mov     eax, [ecx + CPUMCTXCORE.eflags]
@@ -808 +808 @@
 vmmGCGuestToHostAsm_SkipHyperRegs:
     ; str     [edx + CPUMCPU.Hyper.tr] - double fault only, and it won't be right then either.
-    sldt    [edx + CPUMCPU.Hyper.ldtr]
+    sldt    [edx + CPUMCPU.Hyper.ldtr.Sel]
 
     ; No need to save CRx here. They are set dynamically according to Guest/Host requirements.