Commit 475b46da authored by Michael Niedermayer's avatar Michael Niedermayer

fix for ppc compile broken by (Romain Dolbeau <dolbeau at irisa dot fr> and...

fix for ppc compile broken by (Romain Dolbeau <dolbeau at irisa dot fr> and Colin Leroy <colin at colino dot net>)

Originally committed as revision 1526 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 9ec05e36
...@@ -75,7 +75,7 @@ extern unsigned long long perfdata_miss[powerpc_perf_total][powerpc_data_total]; ...@@ -75,7 +75,7 @@ extern unsigned long long perfdata_miss[powerpc_perf_total][powerpc_data_total];
#else /* POWERPC_PERF_USE_PMC */ #else /* POWERPC_PERF_USE_PMC */
#define POWERPC_GET_CYCLES(a) asm volatile("mfspr %0, 937" : "=r" (a)) #define POWERPC_GET_CYCLES(a) asm volatile("mfspr %0, 937" : "=r" (a))
#define POWERPC_GET_MISS(a) asm volatile("mfspr %0, 938" : "=r" (a)) #define POWERPC_GET_MISS(a) asm volatile("mfspr %0, 938" : "=r" (a))
#define POWERPC_TBL_DECLARE(a, cond) register unsigned long cycles_start, cycles_stop, miss_start, miss_stop; #define POWERPC_TBL_DECLARE(a, cond) register unsigned long cycles_start, cycles_stop, miss_start, miss_stop
#define POWERPC_TBL_START_COUNT(a, cond) do { POWERPC_GET_MISS(miss_start); POWERPC_GET_CYCLES(cycles_start); } while (0) #define POWERPC_TBL_START_COUNT(a, cond) do { POWERPC_GET_MISS(miss_start); POWERPC_GET_CYCLES(cycles_start); } while (0)
#define POWERPC_TBL_STOP_COUNT(a, cond) do { \ #define POWERPC_TBL_STOP_COUNT(a, cond) do { \
POWERPC_GET_CYCLES(cycles_stop); \ POWERPC_GET_CYCLES(cycles_stop); \
...@@ -114,9 +114,10 @@ extern unsigned long long perfdata_miss[powerpc_perf_total][powerpc_data_total]; ...@@ -114,9 +114,10 @@ extern unsigned long long perfdata_miss[powerpc_perf_total][powerpc_data_total];
#else /* POWERPC_TBL_PERFORMANCE_REPORT */ #else /* POWERPC_TBL_PERFORMANCE_REPORT */
#define POWERPC_TBL_DECLARE(a, cond) // those are needed to avoid empty statements.
#define POWERPC_TBL_START_COUNT(a, cond) #define POWERPC_TBL_DECLARE(a, cond) int altivec_placeholder __attribute__ ((unused))
#define POWERPC_TBL_STOP_COUNT(a, cond) #define POWERPC_TBL_START_COUNT(a, cond) do {} while (0)
#define POWERPC_TBL_STOP_COUNT(a, cond) do {} while (0)
#endif /* POWERPC_TBL_PERFORMANCE_REPORT */ #endif /* POWERPC_TBL_PERFORMANCE_REPORT */
#endif /* _DSPUTIL_PPC_ */ #endif /* _DSPUTIL_PPC_ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment