Index: /trunk/src/VBox/VMM/VMMR0/HMR0A.asm
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/HMR0A.asm	(revision 87320)
+++ /trunk/src/VBox/VMM/VMMR0/HMR0A.asm	(revision 87321)
@@ -59,16 +59,16 @@
 %endif
 
-;; @def MYPUSHAD
+;; @def PUSH_CALLEE_PRESERVED_REGISTERS
 ; Macro generating an equivalent to PUSHAD instruction.
 
-;; @def MYPOPAD
+;; @def POP_CALLEE_PRESERVED_REGISTERS
 ; Macro generating an equivalent to POPAD instruction.
 
-;; @def MYPUSHSEGS
+;; @def PUSH_RELEVANT_SEGMENT_REGISTERS
 ; Macro saving all segment registers on the stack.
 ; @param 1  Full width register name.
 ; @param 2  16-bit register name for \a 1.
 
-;; @def MYPOPSEGS
+;; @def POP_RELEVANT_SEGMENT_REGISTERS
 ; Macro restoring all segment registers on the stack.
 ; @param 1  Full width register name.
@@ -76,5 +76,5 @@
 
 %ifdef ASM_CALL64_GCC
- %macro MYPUSHAD 0
+ %macro PUSH_CALLEE_PRESERVED_REGISTERS 0
    push    r15
    push    r14
@@ -83,5 +83,5 @@
    push    rbx
  %endmacro
- %macro MYPOPAD 0
+ %macro POP_CALLEE_PRESERVED_REGISTERS 0
    pop     rbx
    pop     r12
@@ -92,5 +92,5 @@
 
 %else ; ASM_CALL64_MSC
- %macro MYPUSHAD 0
+ %macro PUSH_CALLEE_PRESERVED_REGISTERS 0
    push    r15
    push    r14
@@ -101,5 +101,5 @@
    push    rdi
  %endmacro
- %macro MYPOPAD 0
+ %macro POP_CALLEE_PRESERVED_REGISTERS 0
    pop     rdi
    pop     rsi
@@ -113,12 +113,12 @@
 
 %ifdef VBOX_SKIP_RESTORE_SEG
- %macro MYPUSHSEGS 2
+ %macro PUSH_RELEVANT_SEGMENT_REGISTERS 2
  %endmacro
 
- %macro MYPOPSEGS 2
+ %macro POP_RELEVANT_SEGMENT_REGISTERS 2
  %endmacro
 %else       ; !VBOX_SKIP_RESTORE_SEG
  ; Trashes, rax, rdx & rcx.
- %macro MYPUSHSEGS 2
+ %macro PUSH_RELEVANT_SEGMENT_REGISTERS 2
   %ifndef HM_64_BIT_USE_NULL_SEL
    mov     %2, es
@@ -150,5 +150,5 @@
 
  ; trashes, rax, rdx & rcx
- %macro MYPOPSEGS 2
+ %macro POP_RELEVANT_SEGMENT_REGISTERS 2
    ; Note: do not step through this code with a debugger!
   %ifndef HM_64_BIT_USE_NULL_SEL
@@ -836,5 +836,5 @@
 
     ; Restore segment registers.
-    MYPOPSEGS xAX, ax
+    POP_RELEVANT_SEGMENT_REGISTERS xAX, ax
 
     ; Restore the host XCR0 if necessary.
@@ -848,5 +848,5 @@
 
     ; Restore general purpose registers.
-    MYPOPAD
+    POP_CALLEE_PRESERVED_REGISTERS
 %endmacro
 
@@ -871,5 +871,5 @@
 
     ; Save all general purpose host registers.
-    MYPUSHAD
+    PUSH_CALLEE_PRESERVED_REGISTERS
 
     ; First we have to save some final CPU context registers.
@@ -925,5 +925,5 @@
     ; Note! Trashes rdx & rcx, so we moved it here (amd64 case).
     ;
-    MYPUSHSEGS xAX, ax
+    PUSH_RELEVANT_SEGMENT_REGISTERS xAX, ax
 
     ; Save the pCtx pointer.
@@ -1078,5 +1078,5 @@
 
     ; Save all general purpose host registers.
-    MYPUSHAD
+    PUSH_CALLEE_PRESERVED_REGISTERS
 
     ; Load pCtx into xSI.
@@ -1202,5 +1202,5 @@
 
     ; Restore host general purpose registers.
-    MYPOPAD
+    POP_CALLEE_PRESERVED_REGISTERS
 
     mov     eax, VINF_SUCCESS