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

Timestamp:

Sep 19, 2008 1:07:44 PM (17 years ago)

Author:

vboxsync

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

36853

Message:

Turned dr0..dr7 into an array.

Location:

trunk/src/VBox/VMM/VMMSwitcher

Files:

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

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

@@ -518 +518 @@
     DEBUG_S_CHAR('x')
     ; load hyper DR0-7
-    mov     ebx, [edx + CPUM.Hyper.dr0]
+    mov     ebx, [edx + CPUM.Hyper.dr]
     mov     dr0, ebx
-    mov     ecx, [edx + CPUM.Hyper.dr1]
+    mov     ecx, [edx + CPUM.Hyper.dr + 4*1]
     mov     dr1, ecx
-    mov     eax, [edx + CPUM.Hyper.dr2]
+    mov     eax, [edx + CPUM.Hyper.dr + 4*2]
     mov     dr2, eax
-    mov     ebx, [edx + CPUM.Hyper.dr3]
+    mov     ebx, [edx + CPUM.Hyper.dr + 4*3]
     mov     dr3, ebx
-    ;mov     eax, [edx + CPUM.Hyper.dr6]
+    ;mov     eax, [edx + CPUM.Hyper.dr + 4*6]
     mov     ecx, 0ffff0ff0h
     mov     dr6, ecx
-    mov     eax, [edx + CPUM.Hyper.dr7]
+    mov     eax, [edx + CPUM.Hyper.dr + 4*7]
     mov     dr7, eax
     jmp     htg_debug_regs_guest_no

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

@@ -414 +414 @@
     mov     [edx + CPUM.Host.dr3], eax
     ; load hyper DR0-7
-    mov     ebx, [edx + CPUM.Hyper.dr0]
+    mov     ebx, [edx + CPUM.Hyper.dr]
     mov     dr0, ebx
-    mov     ecx, [edx + CPUM.Hyper.dr1]
+    mov     ecx, [edx + CPUM.Hyper.dr + 4*1]
     mov     dr1, ecx
-    mov     eax, [edx + CPUM.Hyper.dr2]
+    mov     eax, [edx + CPUM.Hyper.dr + 4*2]
     mov     dr2, eax
-    mov     ebx, [edx + CPUM.Hyper.dr3]
+    mov     ebx, [edx + CPUM.Hyper.dr + 4*3]
     mov     dr3, ebx
-    ;mov     eax, [edx + CPUM.Hyper.dr6]
+    ;mov     eax, [edx + CPUM.Hyper.dr + 4*6]
     mov     ecx, 0ffff0ff0h
     mov     dr6, ecx
-    mov     eax, [edx + CPUM.Hyper.dr7]
+    mov     eax, [edx + CPUM.Hyper.dr + 4*7]
     mov     dr7, eax
     jmp     htg_debug_regs_guest_no