[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec common.h,1.149,1.150

[Michael Niedermayer CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv6320

Modified Files:
	common.h 
Log Message:
START/STOP_TIMER for ppc32 by (Luca Barbato: lu_zero, gentoo org)


Index: common.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/common.h,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- common.h	20 Apr 2005 10:05:15 -0000	1.149
+++ common.h	21 May 2005 21:37:07 -0000	1.150
@@ -456,9 +456,9 @@
 }
 #endif
 
-#if defined(ARCH_X86) || defined(ARCH_X86_64)
+#if defined(ARCH_X86) || defined(ARCH_X86_64) || defined(ARCH_POWERPC)
 #if defined(ARCH_X86_64)
-static inline uint64_t rdtsc(void)
+static inline uint64_t read_time(void)
 {
 	uint64_t a, d;
 	asm volatile(	"rdtsc\n\t"
@@ -466,8 +466,8 @@
 	);
 	return (d << 32) | (a & 0xffffffff);
 }
-#else
-static inline long long rdtsc(void)
+#elif defined(ARCH_X86)
+static inline long long read_time(void)
 {
 	long long l;
 	asm volatile(	"rdtsc\n\t"
@@ -475,14 +475,33 @@
 	);
 	return l;
 }
+#else //FIXME check ppc64
+static inline uint64_t read_time(void)
+{
+    uint32_t tbu, tbl, temp;
+
+     /* from section 2.2.1 of the 32-bit PowerPC PEM */
+     __asm__ __volatile__(
+         "1:\n"
+         "mftbu  %2\n"
+         "mftb   %0\n"
+         "mftbu  %1\n"
+         "cmpw   %2,%1\n"
+         "bne    1b\n"
+     : "=r"(tbl), "=r"(tbu), "=r"(temp)
+     :
+     : "cc");
+
+     return (((uint64_t)tbu)<<32) | (uint64_t)tbl;
+}
 #endif
 
 #define START_TIMER \
 uint64_t tend;\
-uint64_t tstart= rdtsc();\
+uint64_t tstart= read_time();\
 
 #define STOP_TIMER(id) \
-tend= rdtsc();\
+tend= read_time();\
 {\
   static uint64_t tsum=0;\
   static int tcount=0;\