Changeset 87429 in vbox

Timestamp:

Jan 26, 2021 11:37:29 AM (4 years ago)

Author:

vboxsync

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

142435

Message:

VMM/HMR0A.asm: Refactored hmR0VMXStartVM into a more regular frame setup. [macOS build fix]

File:

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

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

@@ -833 +833 @@
 .skip_cr2_write:
         ; Set the vmlaunch/vmresume "return" host RIP and RSP values.
-        lea     rcx, [hmR0VMXStartVMHostRIP wrt rip] ;; @todo It is only strictly necessary to write VMX_VMCS_HOST_RIP when
-        mov     eax, VMX_VMCS_HOST_RIP               ;;       the VMXVMCSINFO::pfnStartVM function changes (eventually
-        vmwrite rax, rcx                             ;;       take the Windows/SSE stuff into account then)...
+        lea     rcx, [NAME(hmR0VMXStartVMHostRIP) wrt rip] ;; @todo It is only strictly necessary to write VMX_VMCS_HOST_RIP when
+        mov     eax, VMX_VMCS_HOST_RIP                     ;;       the VMXVMCSINFO::pfnStartVM function changes (eventually
+        vmwrite rax, rcx                                   ;;       take the Windows/SSE stuff into account then)...
  %ifdef VBOX_STRICT
-        jna     hmR0VMXStartVMHostRIP.vmwrite_failed
- %endif
-        mov     edx, VMX_VMCS_HOST_RSP               ;; @todo The HOST_RSP value is unlikely to change much, so if vmwrite
-        vmwrite rdx, rsp                             ;;       can be noticably more expensive than a memory read, we could
- %ifdef VBOX_STRICT                                  ;;       easily optimize this one away almost completely by comparing
-        jna     hmR0VMXStartVMHostRIP.vmwrite_failed ;;       rsp with a shadow copy of VMX_VMCS_HOST_RSP.
+        jna     NAME(hmR0VMXStartVMHostRIP.vmwrite_failed)
+ %endif
+        mov     edx, VMX_VMCS_HOST_RSP                     ;; @todo The HOST_RSP value is unlikely to change much, so if vmwrite
+        vmwrite rdx, rsp                                   ;;       can be noticably more expensive than a memory read, we could
+ %ifdef VBOX_STRICT                                        ;;       easily optimize this one away almost completely by comparing
+        jna     NAME(hmR0VMXStartVMHostRIP.vmwrite_failed) ;;       rsp with a shadow copy of VMX_VMCS_HOST_RSP.
  %endif
 
@@ -871 +871 @@
 
         vmresume
-        jc      hmR0VMXStartVMHostRIP.vmxstart64_invalid_vmcs_ptr
-        jz      hmR0VMXStartVMHostRIP.vmxstart64_start_failed
-        jmp     hmR0VMXStartVMHostRIP   ; here if vmresume detected a failure
+        jc      NAME(hmR0VMXStartVMHostRIP.vmxstart64_invalid_vmcs_ptr)
+        jz      NAME(hmR0VMXStartVMHostRIP.vmxstart64_start_failed)
+        jmp     NAME(hmR0VMXStartVMHostRIP) ; here if vmresume detected a failure
 
 .vmlaunch64_launch:
         vmlaunch
-        jc      hmR0VMXStartVMHostRIP.vmxstart64_invalid_vmcs_ptr
-        jz      hmR0VMXStartVMHostRIP.vmxstart64_start_failed
-        jmp     hmR0VMXStartVMHostRIP   ; here if vmlaunch detected a failure
+        jc      NAME(hmR0VMXStartVMHostRIP.vmxstart64_invalid_vmcs_ptr)
+        jz      NAME(hmR0VMXStartVMHostRIP.vmxstart64_start_failed)
+        jmp     NAME(hmR0VMXStartVMHostRIP) ; here if vmlaunch detected a failure
 
 ALIGNCODE(64)