Changeset 49018 in vbox

Timestamp:

Oct 10, 2013 8:19:24 AM (12 years ago)

Author:

vboxsync

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

89766

Message:

VMM/HMR0Mixed.mac: Remove ugly jump label suffix passing when assembler can handle it with '%%'.

File:

• trunk/src/VBox/VMM/VMMR0/HMR0Mixed.mac (modified) (12 diffs)

trunk/src/VBox/VMM/VMMR0/HMR0Mixed.mac

@@ -36 +36 @@
 %endif
 
-;; @def RESTORESTATEVM32
+;; @def RESTORE_STATE_VM32
 ; Macro restoring essential host state and updating guest state
 ; for common host, 32-bit guest for VT-x.
-;
-; @param 1  Jump label suffix 1.
-; @param 2  Jump label suffix 2.
-; @param 3  Jump label suffix 3.
-%macro RESTORESTATEVM32 3
+%macro RESTORE_STATE_VM32 0
     ; Restore base and limit of the IDTR & GDTR.
  %ifndef VMX_SKIP_IDTR
@@ -95 +91 @@
  %ifdef RT_ARCH_AMD64
     cmp     eax, 0
-    je      .skipldtwrite32%1
+    je      %%skip_ldt_write32
  %endif
     lldt    ax
 
-.skipldtwrite32%1:
+%%skip_ldt_write32:
     add     xSP, xCB     ; pCtx
 
@@ -110 +106 @@
     mov     ecx, [ss:xDX + VMCSCACHE.Read.cValidEntries]
     cmp     ecx, 0      ; Can't happen
-    je      .no_cached_read32%2
-    jmp     .cached_read32%3
+    je      %%no_cached_read32
+    jmp     %%cached_read32
 
 ALIGN(16)
-.cached_read32%3:
+%%cached_read32:
     dec     xCX
     mov     eax, [ss:xDX + VMCSCACHE.Read.aField + xCX * 4]
     vmread  [ss:xDX + VMCSCACHE.Read.aFieldVal + xCX * 8], xAX
     cmp     xCX, 0
-    jnz     .cached_read32%3
-.no_cached_read32%2:
+    jnz     %%cached_read32
+%%no_cached_read32:
  %endif
 
@@ -233 +229 @@
     mov     xDX, cr2
     cmp     xBX, xDX
-    je      .skipcr2write32
+    je      .skip_cr2_write32
     mov     cr2, xBX
 
-.skipcr2write32:
+.skip_cr2_write32:
     mov     eax, VMX_VMCS_HOST_RSP
     vmwrite xAX, xSP
@@ -273 +269 @@
     jz      near .vmxstart_start_failed
 
-    RESTORESTATEVM32 A, B, C
+    RESTORE_STATE_VM32
     mov     eax, VINF_SUCCESS
 
@@ -282 +278 @@
 
 .vmxstart_invalid_vmcs_ptr:
-    RESTORESTATEVM32 D, E, F
+    RESTORE_STATE_VM32
     mov     eax, VERR_VMX_INVALID_VMCS_PTR_TO_START_VM
     jmp     .vmstart_end
 
 .vmxstart_start_failed:
-    RESTORESTATEVM32 G, H, I
+    RESTORE_STATE_VM32
     mov     eax, VERR_VMX_UNABLE_TO_START_VM
     jmp     .vmstart_end
@@ -295 +291 @@
 
 %ifdef RT_ARCH_AMD64
-;; @def RESTORESTATEVM64
+;; @def RESTORE_STATE_VM64
 ; Macro restoring essential host state and updating guest state
 ; for 64-bit host, 64-bit guest for VT-x.
 ;
-; @param 1  Jump label suffix 1.
-; @param 2  Jump label suffix 2.
-; @param 3  Jump label suffix 3.
-%macro RESTORESTATEVM64 3
+%macro RESTORE_STATE_VM64 0
     ; Restore base and limit of the IDTR & GDTR
  %ifndef VMX_SKIP_IDTR
@@ -357 +350 @@
     pop     xAX         ; Saved LDTR
     cmp     eax, 0
-    je      .skipldtwrite64%1
+    je      %%skip_ldt_write64
     lldt    ax
 
-.skipldtwrite64%1:
+%%skip_ldt_write64:
     pop     xSI         ; pCtx (needed in rsi by the macros below)
 
@@ -379 +372 @@
     mov     ecx, [xDX + VMCSCACHE.Read.cValidEntries]
     cmp     ecx, 0      ; Can't happen
-    je      .no_cached_read64%2
-    jmp     .cached_read64%3
+    je      %%no_cached_read64
+    jmp     %%cached_read64
 
 ALIGN(16)
-.cached_read64%3:
+%%cached_read64:
     dec     xCX
     mov     eax, [xDX + VMCSCACHE.Read.aField + xCX * 4]
     vmread  [xDX + VMCSCACHE.Read.aFieldVal + xCX * 8], xAX
     cmp     xCX, 0
-    jnz     .cached_read64%3
-.no_cached_read64%2:
+    jnz     %%cached_read64
+%%no_cached_read64:
  %endif
 
@@ -499 +492 @@
     mov     rdx, cr2
     cmp     rbx, rdx
-    je      .skipcr2write
+    je      .skip_cr2_write
     mov     cr2, rbx
 
-.skipcr2write:
+.skip_cr2_write:
     mov     eax, VMX_VMCS_HOST_RSP
     vmwrite xAX, xSP
@@ -547 +540 @@
     jz      near .vmxstart64_start_failed
 
-    RESTORESTATEVM64 a, b, c
+    RESTORE_STATE_VM64
     mov     eax, VINF_SUCCESS
 
@@ -556 +549 @@
 
 .vmxstart64_invalid_vmcs_ptr:
-    RESTORESTATEVM64 d, e, f
+    RESTORE_STATE_VM64
     mov     eax, VERR_VMX_INVALID_VMCS_PTR_TO_START_VM
     jmp     .vmstart64_end
 
 .vmxstart64_start_failed:
-    RESTORESTATEVM64 g, h, i
+    RESTORE_STATE_VM64
     mov     eax, VERR_VMX_UNABLE_TO_START_VM
     jmp     .vmstart64_end