Changeset 9411 in vbox for trunk/src/VBox/VMM/VMMSwitcher

Timestamp:

Jun 5, 2008 11:41:38 AM (17 years ago)

Author:

vboxsync

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

31649

Message:

Use a union for esp & rsp, so they are in-sync.

Location:

trunk/src/VBox/VMM/VMMSwitcher

Files:

• AMD64ToPAE.asm (modified) (1 diff)
• PAEand32Bit.mac (modified) (1 diff)

trunk/src/VBox/VMM/VMMSwitcher/AMD64ToPAE.asm

@@ -453 +453 @@
     lidt    [edx + CPUM.Hyper.idtr]
 
-    ; Setup stack
+    ; Setup stack; use the lss_esp, ss pair for lss
     DEBUG_CHAR('3')
-    lss     esp, [edx + CPUM.Hyper.esp]
+    mov     eax, [edx + CPUM.Hyper.esp]
+    mov     [edx + CPUM.Hyper.lss_esp], eax
+    lss     esp, [edx + CPUM.Hyper.lss_esp]
 
     ; Restore TSS selector; must mark it as not busy before using ltr (!)

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

@@ -289 +289 @@
     mov     fs, eax
 
-    ; Setup stack
+    ; Setup stack; use the lss_esp, ss pair for lss
     DEBUG_CHAR('3')
+    mov     eax, [edx + CPUM.Hyper.esp]
+    mov     [edx + CPUM.Hyper.lss_esp], eax
     lss     esp, [edx + CPUM.Hyper.esp]