[xiph-commits] r11346 - branches/theora-mmx/lib

[giles at svn.xiph.org]

Author: giles
Date: 2006-05-05 19:07:18 -0700 (Fri, 05 May 2006)
New Revision: 11346

Modified:
   branches/theora-mmx/lib/cpu.c
   branches/theora-mmx/lib/dct.c
   branches/theora-mmx/lib/dsp.c
   branches/theora-mmx/lib/dsp.h
   branches/theora-mmx/lib/reconstruct.c
Log:
My gcc 4.0.3 (ubuntu dapper) defines __i386__ but not __x86 on x86_32.


Modified: branches/theora-mmx/lib/cpu.c
===================================================================
--- branches/theora-mmx/lib/cpu.c	2006-05-06 01:16:38 UTC (rev 11345)
+++ branches/theora-mmx/lib/cpu.c	2006-05-06 02:07:18 UTC (rev 11346)
@@ -33,7 +33,7 @@
                 "=d" (*edx)          
               : "a" (op)            
               : "cc");
-#elif defined(__x86)
+#elif defined(__i386__)
   asm volatile ("pushl %%ebx   \n\t"
                 "cpuid         \n\t"
                 "movl %%ebx,%1 \n\t"
@@ -57,7 +57,7 @@
 
   /* no need to check, we have cpuid on x86_64 */
 
-#elif defined(__x86)
+#elif defined(__i386__)
   asm volatile ("pushfl              \n\t"
                 "pushfl              \n\t"
                 "popl %0             \n\t"

Modified: branches/theora-mmx/lib/dct.c
===================================================================
--- branches/theora-mmx/lib/dct.c	2006-05-06 01:16:38 UTC (rev 11345)
+++ branches/theora-mmx/lib/dct.c	2006-05-06 02:07:18 UTC (rev 11346)
@@ -256,7 +256,7 @@
 void dsp_dct_init (DspFunctions *funcs)
 {
   funcs->fdct_short = fdct_short__c;
-#if defined(__x86)
+#if defined(__i386__)
   if (cpu_flags & CPU_X86_MMX) {
     dsp_mmx_fdct_init(&dsp_funcs);
   }

Modified: branches/theora-mmx/lib/dsp.c
===================================================================
--- branches/theora-mmx/lib/dsp.c	2006-05-06 01:16:38 UTC (rev 11345)
+++ branches/theora-mmx/lib/dsp.c	2006-05-06 02:07:18 UTC (rev 11346)
@@ -408,7 +408,7 @@
 
   dsp_recon_init (&dsp_funcs);
   dsp_dct_init (&dsp_funcs);
-#if defined(__x86)
+#if defined(__i386__)
   if (cpu_flags & CPU_X86_MMX) {
     dsp_mmx_init(&dsp_funcs);
   }

Modified: branches/theora-mmx/lib/dsp.h
===================================================================
--- branches/theora-mmx/lib/dsp.h	2006-05-06 01:16:38 UTC (rev 11345)
+++ branches/theora-mmx/lib/dsp.h	2006-05-06 02:07:18 UTC (rev 11346)
@@ -86,7 +86,7 @@
 
 void dsp_init(DspFunctions *funcs);
 void dsp_static_init(void);
-#if defined(__x86)
+#if defined(__i386__)
 extern void dsp_mmx_init(DspFunctions *funcs);
 extern void dsp_mmxext_init(DspFunctions *funcs);
 extern void dsp_mmx_fdct_init(DspFunctions *funcs);

Modified: branches/theora-mmx/lib/reconstruct.c
===================================================================
--- branches/theora-mmx/lib/reconstruct.c	2006-05-06 01:16:38 UTC (rev 11345)
+++ branches/theora-mmx/lib/reconstruct.c	2006-05-06 02:07:18 UTC (rev 11346)
@@ -104,7 +104,7 @@
   funcs->recon_intra8x8 = recon_intra8x8__c;
   funcs->recon_inter8x8 = recon_inter8x8__c;
   funcs->recon_inter8x8_half = recon_inter8x8_half__c;
-#if defined(__x86)
+#if defined(__i386__)
   if (cpu_flags & CPU_X86_MMX) {
     dsp_mmx_recon_init(&dsp_funcs);
   }