Index: /trunk/src/VBox/VMM/VMMR0/HMR0A.asm
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/HMR0A.asm	(revision 48317)
+++ /trunk/src/VBox/VMM/VMMR0/HMR0A.asm	(revision 48318)
@@ -313,5 +313,5 @@
     jz          .test_es
     mov         ax, [rsi + VMXRESTOREHOST.uHostSelDS]
-    mov         ds, ax
+    mov         ds, eax
 
 .test_es:
@@ -319,5 +319,5 @@
     jz          .test_tr
     mov         ax, [rsi + VMXRESTOREHOST.uHostSelES]
-    mov         es, ax
+    mov         es, eax
 
 .test_tr:
@@ -350,5 +350,5 @@
     jz          .test_gs
     mov         ax, word [rsi + VMXRESTOREHOST.uHostSelFS]
-    mov         fs, ax
+    mov         fs, eax
     mov         eax, dword [rsi + VMXRESTOREHOST.uHostFSBase]         ; uHostFSBase - Lo
     mov         edx, dword [rsi + VMXRESTOREHOST.uHostFSBase + 4h]    ; uHostFSBase - Hi
@@ -356,9 +356,9 @@
     wrmsr
 
+.test_gs:
     test        edi, VMX_RESTORE_HOST_SEL_GS
     jz          .restore_flags
-.test_gs:
     mov         ax, word [rsi + VMXRESTOREHOST.uHostSelGS]
-    mov         gs, ax
+    mov         gs, eax
     mov         eax, dword [rsi + VMXRESTOREHOST.uHostGSBase]         ; uHostGSBase - Lo
     mov         edx, dword [rsi + VMXRESTOREHOST.uHostGSBase + 4h]    ; uHostGSBase - Hi
Index: /trunk/src/VBox/VMM/VMMR0/HMR0Mixed.mac
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/HMR0Mixed.mac	(revision 48317)
+++ /trunk/src/VBox/VMM/VMMR0/HMR0Mixed.mac	(revision 48318)
@@ -89,5 +89,5 @@
     pop     xAX         ; Saved LDTR
  %ifdef RT_ARCH_AMD64
-    cmp     xAX, 0
+    cmp     eax, 0
     je      .skipldtwrite32%1
  %endif
@@ -351,5 +351,5 @@
 
     pop     xAX         ; Saved LDTR
-    cmp     xAX, 0
+    cmp     eax, 0
     je      .skipldtwrite64%1
     lldt    ax
@@ -382,5 +382,5 @@
     mov     eax, [xDX + VMCSCACHE.Read.aField + xCX * 4]
     vmread  [xDX + VMCSCACHE.Read.aFieldVal + xCX * 8], xAX
-    cmp      xCX, 0
+    cmp     xCX, 0
     jnz     .cached_read64%3
 .no_cached_read64%2: