Index: /trunk/src/VBox/VMM/VMMAll/IEMAllAImpl.asm
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/IEMAllAImpl.asm	(revision 38025)
+++ /trunk/src/VBox/VMM/VMMAll/IEMAllAImpl.asm	(revision 38026)
@@ -32,10 +32,10 @@
 ;
 %macro RET_FASTCALL 1
-%ifdef RT_ARCH_X86                  
- %ifdef RT_OS_WINDOWS                                 
+%ifdef RT_ARCH_X86
+ %ifdef RT_OS_WINDOWS
     ret %1
  %else
     ret
- %endif        
+ %endif
 %else
     ret
@@ -46,5 +46,5 @@
 ; NAME for fastcall functions.
 ;
-;; @todo 'global @fastcall@12' is still broken in yasm and requires dollar 
+;; @todo 'global @fastcall@12' is still broken in yasm and requires dollar
 ;         escaping (or whatever the dollar is good for here).  Thus the ugly
 ;         prefix argument.
@@ -52,8 +52,8 @@
 %define NAME_FASTCALL(a_Name, a_cbArgs, a_Dollar)   NAME(a_Name)
 %ifdef RT_ARCH_X86
- %ifdef RT_OS_WINDOWS                                 
+ %ifdef RT_OS_WINDOWS
   %undef NAME_FASTCALL
   %define NAME_FASTCALL(a_Name, a_cbArgs, a_Prefix) a_Prefix %+ a_Name %+ @ %+ a_cbArgs
- %endif        
+ %endif
 %endif
 
@@ -86,17 +86,24 @@
  %macro PROLOGUE_1_ARGS 0
  %endmacro
- %macro EPILOGUE_1_ARGS 0
- %endmacro
+ %macro EPILOGUE_1_ARGS 1
+        ret
+ %endmacro
+
  %macro PROLOGUE_2_ARGS 0
  %endmacro
- %macro EPILOGUE_2_ARGS 0
- %endmacro
+ %macro EPILOGUE_2_ARGS 1
+        ret
+ %endmacro
+
  %macro PROLOGUE_3_ARGS 0
  %endmacro
- %macro EPILOGUE_3_ARGS 0
- %endmacro
+ %macro EPILOGUE_3_ARGS 1
+        ret
+ %endmacro
+
  %macro PROLOGUE_4_ARGS 0
  %endmacro
- %macro EPILOGUE_4_ARGS 0
+ %macro EPILOGUE_4_ARGS 1
+        ret
  %endmacro
 
@@ -160,5 +167,5 @@
  %macro EPILOGUE_1_ARGS 1
         pop     edi
-        RET_FASTCALL %1
+        ret     %1
  %endmacro
 
@@ -168,5 +175,5 @@
  %macro EPILOGUE_2_ARGS 1
         pop     edi
-        RET_FASTCALL %1
+        ret     %1
  %endmacro
 
@@ -179,5 +186,5 @@
         pop     edi
         pop     ebx
-        RET_FASTCALL %1
+        ret     %1
  %endmacro
 
@@ -193,5 +200,5 @@
         pop     edi
         pop     ebx
-        RET_FASTCALL %1
+        ret     %1
  %endmacro
 
@@ -1139,5 +1146,5 @@
 .return:
         EPILOGUE_4_ARGS 8
-        
+
 .div_zero:
         mov     eax, -1
@@ -1210,5 +1217,5 @@
 .return:
         EPILOGUE_4_ARGS 12
-        
+
 .div_zero:
         mov     eax, -1