diff options
| author | Måns Rullgård <mans@mansr.com> | 2007-06-17 15:47:03 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2007-06-17 15:47:03 +0000 |
| commit | 9cafbd6c490624315c5713db9ba960a408d3e73b (patch) | |
| tree | e3e5c0b634c98b5d86dc7dc1d94d7c9090ae6126 /libavcodec | |
| parent | d5f916e146e8255194c0d3c5a244948c82554c7e (diff) | |
| download | ffmpeg-9cafbd6c490624315c5713db9ba960a408d3e73b.tar.gz | |
simplify ppc64 handling
Originally committed as revision 9355 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/ppc/dsputil_ppc.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/ppc/dsputil_ppc.h b/libavcodec/ppc/dsputil_ppc.h index 5b25732b2d..567dfd1cae 100644 --- a/libavcodec/ppc/dsputil_ppc.h +++ b/libavcodec/ppc/dsputil_ppc.h @@ -25,7 +25,7 @@ void powerpc_display_perf_report(void); /* the 604* have 2, the G3* have 4, the G4s have 6, and the G5 are completely different (they MUST use - POWERPC_MODE_64BITS, and let's hope all future 64 bis PPC + HAVE_PPC64, and let's hope all future 64 bis PPC will use the same PMCs... */ #define POWERPC_NUM_PMC_ENABLED 6 /* if you add to the enum below, also add to the perfname array @@ -68,7 +68,7 @@ enum powerpc_data_index { }; extern unsigned long long perfdata[POWERPC_NUM_PMC_ENABLED][powerpc_perf_total][powerpc_data_total]; -#ifndef POWERPC_MODE_64BITS +#ifndef HAVE_PPC64 #define POWERP_PMC_DATATYPE unsigned long #define POWERPC_GET_PMC1(a) asm volatile("mfspr %0, 937" : "=r" (a)) #define POWERPC_GET_PMC2(a) asm volatile("mfspr %0, 938" : "=r" (a)) @@ -86,7 +86,7 @@ extern unsigned long long perfdata[POWERPC_NUM_PMC_ENABLED][powerpc_perf_total][ #define POWERPC_GET_PMC5(a) do {} while (0) #define POWERPC_GET_PMC6(a) do {} while (0) #endif -#else /* POWERPC_MODE_64BITS */ +#else /* HAVE_PPC64 */ #define POWERP_PMC_DATATYPE unsigned long long #define POWERPC_GET_PMC1(a) asm volatile("mfspr %0, 771" : "=r" (a)) #define POWERPC_GET_PMC2(a) asm volatile("mfspr %0, 772" : "=r" (a)) @@ -104,7 +104,7 @@ extern unsigned long long perfdata[POWERPC_NUM_PMC_ENABLED][powerpc_perf_total][ #define POWERPC_GET_PMC5(a) do {} while (0) #define POWERPC_GET_PMC6(a) do {} while (0) #endif -#endif /* POWERPC_MODE_64BITS */ +#endif /* HAVE_PPC64 */ #define POWERPC_PERF_DECLARE(a, cond) \ POWERP_PMC_DATATYPE \ pmc_start[POWERPC_NUM_PMC_ENABLED], \ |