# HG changeset patch # User michael # Date 1224601075 0 # Node ID fddfdadb477fc6bc452679868713d254135dd7ae # Parent 2ec148d26d9fc351694015351a3727f0a2c602cc Port read_time() that works on x86_32 and 64 from noe. diff -r 2ec148d26d9f -r fddfdadb477f common.h --- a/common.h Mon Oct 20 00:03:25 2008 +0000 +++ b/common.h Tue Oct 21 14:57:55 2008 +0000 @@ -323,21 +323,13 @@ #if defined(ARCH_X86) || defined(ARCH_POWERPC) || defined(ARCH_BFIN) #define AV_READ_TIME read_time -#if defined(ARCH_X86_64) +#if defined(ARCH_X86) static inline uint64_t read_time(void) { - uint64_t a, d; + uint32_t a, d; __asm__ volatile("rdtsc\n\t" : "=a" (a), "=d" (d)); - return (d << 32) | (a & 0xffffffff); -} -#elif defined(ARCH_X86_32) -static inline long long read_time(void) -{ - long long l; - __asm__ volatile("rdtsc\n\t" - : "=A" (l)); - return l; + return ((uint64_t)d << 32) + a; } #elif ARCH_BFIN static inline uint64_t read_time(void)