Changeset 23297 in vbox for trunk/src/VBox/VMM/VMMGC

Timestamp:

Sep 24, 2009 4:38:01 PM (16 years ago)

Author:

vboxsync

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

52790

Message:

Zero out the high parts of all registers in the RC trap handler.

File:

• trunk/src/VBox/VMM/VMMGC/TRPMGCHandlersA.asm (modified) (4 diffs)

trunk/src/VBox/VMM/VMMGC/TRPMGCHandlersA.asm

@@ -265 +265 @@
     mov     eax, [esp + 14h + ESPOFF]           ; esp
     mov     [esp + CPUMCTXCORE.esp], eax
-%if GC_ARCH_BITS == 64
-    ; zero out the high dword
-    mov     dword [esp + CPUMCTXCORE.esp + 4], 0
-%endif
     mov     eax, [esp + 18h + ESPOFF]           ; ss
     mov     dword [esp + CPUMCTXCORE.ss], eax
@@ -276 +272 @@
     mov     eax, [esp + 08h + ESPOFF]           ; eip
     mov     [esp + CPUMCTXCORE.eip], eax
-%if GC_ARCH_BITS == 64
-    ; zero out the high dword
-    mov     dword [esp + CPUMCTXCORE.eip + 4], 0
-%endif
     mov     eax, [esp + 10h + ESPOFF]           ; eflags
     mov     [esp + CPUMCTXCORE.eflags], eax
+
+%if GC_ARCH_BITS == 64    
+    ; zero out the high dwords
+    mov     dword [esp + CPUMCTXCORE.eax + 4], 0
+    mov     dword [esp + CPUMCTXCORE.ecx + 4], 0
+    mov     dword [esp + CPUMCTXCORE.edx + 4], 0
+    mov     dword [esp + CPUMCTXCORE.ebx + 4], 0
+    mov     dword [esp + CPUMCTXCORE.esi + 4], 0
+    mov     dword [esp + CPUMCTXCORE.edi + 4], 0
+    mov     dword [esp + CPUMCTXCORE.ebp + 4], 0
+    mov     dword [esp + CPUMCTXCORE.esp + 4], 0
+    mov     dword [esp + CPUMCTXCORE.eip + 4], 0
+%endif
 
     mov     eax, es
@@ -764 +769 @@
     mov     eax, [esp + 04h + ESPOFF]           ; eip
     mov     [esp + CPUMCTXCORE.eip], eax
-%if GC_ARCH_BITS == 64
-    ; zero out the high dword
-    mov     dword [esp + CPUMCTXCORE.eip + 4], 0
-%endif
     mov     eax, dword [esp + 08h + ESPOFF]     ; cs
     mov     [esp + CPUMCTXCORE.cs], eax
@@ -775 +776 @@
     mov     eax, [esp + 10h + ESPOFF]           ; esp
     mov     [esp + CPUMCTXCORE.esp], eax
-%if GC_ARCH_BITS == 64
-    ; zero out the high dword
-    mov     dword [esp + CPUMCTXCORE.esp + 4], 0
-%endif
     mov     eax, dword [esp + 14h + ESPOFF]     ; ss
     mov     [esp + CPUMCTXCORE.ss], eax
+
+%if GC_ARCH_BITS == 64    
+    ; zero out the high dwords
+    mov     dword [esp + CPUMCTXCORE.eax + 4], 0
+    mov     dword [esp + CPUMCTXCORE.ecx + 4], 0
+    mov     dword [esp + CPUMCTXCORE.edx + 4], 0
+    mov     dword [esp + CPUMCTXCORE.ebx + 4], 0
+    mov     dword [esp + CPUMCTXCORE.esi + 4], 0
+    mov     dword [esp + CPUMCTXCORE.edi + 4], 0
+    mov     dword [esp + CPUMCTXCORE.ebp + 4], 0
+    mov     dword [esp + CPUMCTXCORE.esp + 4], 0
+    mov     dword [esp + CPUMCTXCORE.eip + 4], 0
+%endif
 
     mov     eax, es