Changeset 57549 in vbox for trunk/src/VBox

Timestamp:

Aug 26, 2015 11:39:20 AM (10 years ago)

Author:

vboxsync

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

102361

Message:

VMM/HMR0A: Avoid 2 conditional branches in the VT-x vmlaunch/vmresume success code path. Add missing error handling for vmresume.

File:

• trunk/src/VBox/VMM/VMMR0/HMR0A.asm (modified) (4 diffs)

trunk/src/VBox/VMM/VMMR0/HMR0A.asm

@@ -1391 +1391 @@
     ; Resume or start VM?
     cmp     xDI, 0                  ; fResume
-    je      .vmlaunch_launch
 
     ; Load guest edi & esi.
@@ -1397 +1396 @@
     mov     esi, [xSI + CPUMCTX.esi]
 
+    je      .vmlaunch_launch
+
     vmresume
+    jc      near .vmxstart_invalid_vmcs_ptr
+    jz      near .vmxstart_start_failed
     jmp     .vmlaunch_done;      ; Here if vmresume detected a failure.
 
 .vmlaunch_launch:
-    ; Save guest edi & esi.
-    mov     edi, [xSI + CPUMCTX.edi]
-    mov     esi, [xSI + CPUMCTX.esi]
-
     vmlaunch
+    jc      near .vmxstart_invalid_vmcs_ptr
+    jz      near .vmxstart_start_failed
     jmp     .vmlaunch_done;      ; Here if vmlaunch detected a failure.
 
 ALIGNCODE(16) ;; @todo YASM BUG - this alignment is wrong on darwin, it's 1 byte off.
 .vmlaunch_done:
-    jc      near .vmxstart_invalid_vmcs_ptr
-    jz      near .vmxstart_start_failed
-
     RESTORE_STATE_VM32
     mov     eax, VINF_SUCCESS
@@ -1690 +1688 @@
     ; Resume or start VM?
     cmp     xDI, 0                  ; fResume
-    je      .vmlaunch64_launch
 
     ; Load guest rdi & rsi.
@@ -1696 +1693 @@
     mov     rsi, qword [xSI + CPUMCTX.esi]
 
+    je      .vmlaunch64_launch
+
     vmresume
+    jc      near .vmxstart64_invalid_vmcs_ptr
+    jz      near .vmxstart64_start_failed
     jmp     .vmlaunch64_done;      ; Here if vmresume detected a failure.
 
 .vmlaunch64_launch:
-    ; Save guest rdi & rsi.
-    mov     rdi, qword [xSI + CPUMCTX.edi]
-    mov     rsi, qword [xSI + CPUMCTX.esi]
-
     vmlaunch
+    jc      near .vmxstart64_invalid_vmcs_ptr
+    jz      near .vmxstart64_start_failed
     jmp     .vmlaunch64_done;      ; Here if vmlaunch detected a failure.
 
 ALIGNCODE(16)
 .vmlaunch64_done:
-    jc      near .vmxstart64_invalid_vmcs_ptr
-    jz      near .vmxstart64_start_failed
-
     RESTORE_STATE_VM64
     mov     eax, VINF_SUCCESS