diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2002-03-07 21:40:08 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2002-03-07 21:40:08 +0000 |
| commit | 0b2fa873c6da02f169a76d74d3bedd91236f8e28 (patch) | |
| tree | 505c779a78d475869f837a371ea65979ec3a0a6b /src/mesa/x86/common_x86_asm.S | |
| parent | c5a76cbed41b5816d2f5284f90c70364b062aea4 (diff) | |
syntax fixes for Solaris (David Dawes)
Diffstat (limited to 'src/mesa/x86/common_x86_asm.S')
| -rw-r--r-- | src/mesa/x86/common_x86_asm.S | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/src/mesa/x86/common_x86_asm.S b/src/mesa/x86/common_x86_asm.S index 8a0a6477af..61ff15a1df 100644 --- a/src/mesa/x86/common_x86_asm.S +++ b/src/mesa/x86/common_x86_asm.S @@ -1,4 +1,4 @@ -/* $Id: common_x86_asm.S,v 1.7 2001/03/29 06:46:16 gareth Exp $ */ +/* $Id: common_x86_asm.S,v 1.8 2002/03/07 21:40:08 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -34,6 +34,12 @@ * Cleaned up and simplified by Gareth Hughes <gareth@valinux.com> */ +/* + * NOTE: Avoid using spaces in between '(' ')' and arguments, especially + * with macros like CONST, LLBL that expand to CONCAT(...). Putting spaces + * in there will break the build on some platforms. + */ + #include "matypes.h" #include "common_x86_features.h" @@ -87,7 +93,7 @@ GLNAME( _mesa_identify_x86_cpu_features ): /* Verify the ID Flag bit has been written. */ CMP_L ( ECX, EAX ) - JZ ( LLBL ( cpuid_done ) ) + JZ ( LLBL (cpuid_done) ) /* Get the CPU vendor info. */ @@ -98,11 +104,11 @@ GLNAME( _mesa_identify_x86_cpu_features ): * "GenuineIntel" string in EBX, ECX and EDX. */ CMP_L ( CONST(GENU), EBX ) - JNE ( LLBL( cpuid_amd ) ) + JNE ( LLBL(cpuid_amd) ) CMP_L ( CONST(INEI), EDX ) - JNE ( LLBL( cpuid_amd ) ) + JNE ( LLBL(cpuid_amd) ) CMP_L ( CONST(NTEL), ECX ) - JNE ( LLBL( cpuid_amd ) ) + JNE ( LLBL(cpuid_amd) ) /* We have an Intel processor, so we can get the feature * information with an CPUID input value of 1. @@ -110,19 +116,19 @@ GLNAME( _mesa_identify_x86_cpu_features ): MOV_L ( CONST(0x1), EAX ) CPUID MOV_L ( EDX, EAX ) - JMP ( LLBL( cpuid_done ) ) + JMP ( LLBL(cpuid_done) ) -LLBL( cpuid_amd ): +LLBL(cpuid_amd): /* Test for AMD processors. We must look for the * "AuthenticAMD" string in EBX, ECX and EDX. */ CMP_L ( CONST(AUTH), EBX ) - JNE ( LLBL( cpuid_other ) ) + JNE ( LLBL(cpuid_other) ) CMP_L ( CONST(ENTI), EDX ) - JNE ( LLBL( cpuid_other ) ) + JNE ( LLBL(cpuid_other) ) CMP_L ( CONST(CAMD), ECX ) - JNE ( LLBL( cpuid_other ) ) + JNE ( LLBL(cpuid_other) ) /* We have an AMD processor, so we can get the feature * information after we verify that the extended functions are @@ -131,19 +137,19 @@ LLBL( cpuid_amd ): MOV_L ( CONST(0x80000000), EAX ) CPUID TEST_L ( EAX, EAX ) - JZ ( LLBL ( cpuid_failed ) ) + JZ ( LLBL (cpuid_failed) ) MOV_L ( CONST(0x80000001), EAX ) CPUID MOV_L ( EDX, EAX ) - JMP ( LLBL ( cpuid_done ) ) + JMP ( LLBL (cpuid_done) ) -LLBL( cpuid_other ): +LLBL(cpuid_other): /* Test for other processors here when required. */ -LLBL( cpuid_failed ): +LLBL(cpuid_failed): /* If we can't determine the feature information, we must * return zero to indicate that no platform-specific @@ -151,7 +157,7 @@ LLBL( cpuid_failed ): */ MOV_L ( CONST(0), EAX ) -LLBL ( cpuid_done ): +LLBL (cpuid_done): POP_L ( EBX ) RET |