base/dispatch-x86ish.S: Lift register allocation definitions.

... and use the logical names during setup.  This seems to be the
convention I've followed elsewhere and it makes some sense as
(a) establishing a target for the following setup code to aim for,
and (b) giving a visual indication of how well we're getting there.

diff --git a/base/dispatch-x86ish.S b/base/dispatch-x86ish.S
index e5a174063c53d3e4bcf73e7049895d5ff8367098..67ec05e67b9b6fd35c92aa5caa62ce6e38b273f8 100644 (file)
--- a/base/dispatch-x86ish.S
+++ b/base/dispatch-x86ish.S
@@ -44,25 +44,25 @@ FUNC(dispatch_x86ish_cpuid)
        // return zero if we can; otherwise fill with zero and return -1.
 
 #if CPUFAM_X86
        // return zero if we can; otherwise fill with zero and return -1.
 
 #if CPUFAM_X86

+#  define OUT edi

        pushreg ebx
        pushreg edi
        pushreg ebx
        pushreg edi

-       mov     edi, [SP + 12]
+       mov     OUT, [SP + 12]

        mov     eax, [SP + 16]
        mov     ecx, [SP + 20]
        mov     eax, [SP + 16]
        mov     ecx, [SP + 20]

-#  define OUT edi

 #endif
 #if CPUFAM_AMD64 && ABI_SYSV
 #endif
 #if CPUFAM_AMD64 && ABI_SYSV

+#  define OUT rdi

        pushreg rbx
        mov     eax, esi
        mov     ecx, edx
        pushreg rbx
        mov     eax, esi
        mov     ecx, edx

-#  define OUT rdi

 #endif
 #if CPUFAM_AMD64 && ABI_WIN
 #endif
 #if CPUFAM_AMD64 && ABI_WIN

+#  define OUT r9

        pushreg rbx
        pushreg rbx

-       mov     r9, rcx
+       mov     OUT, rcx

        mov     eax, edx
        mov     ecx, r8d
        mov     eax, edx
        mov     ecx, r8d

-#  define OUT r9

 #endif
   endprologue
 
 #endif
   endprologue
 


@@ -172,7 +172,7 @@ FUNC(dispatch_x86ish_xgetbv)
 #if CPUFAM_X86
 #  define Z_OUT edi
        pushreg edi
 #if CPUFAM_X86
 #  define Z_OUT edi
        pushreg edi

-       mov     edi, [esp + 8]
+       mov     Z_OUT, [esp + 8]

        mov     ecx, [esp + 12]
 #endif
 #if CPUFAM_AMD64 && ABI_SYSV
        mov     ecx, [esp + 12]
 #endif
 #if CPUFAM_AMD64 && ABI_SYSV