--- portab.h 2002/06/30 10:46:29 1.23 +++ portab.h 2002/08/18 14:06:06 1.26 @@ -105,7 +105,7 @@ return ts; } -#elif defined(LINUX) || defined(DJGPP) || defined(FREEBSD) +#elif defined(LINUX) || defined(DJGPP) || defined(FREEBSD) || defined(BEOS) #include #include @@ -143,9 +143,13 @@ #define DEBUGCBR(A,B,C) #endif -#if defined(LINUX) +#if defined(LINUX) || defined(BEOS) +#if defined(BEOS) +#include +#else #include +#endif #define DECLARE_ALIGNED_MATRIX(name,sizex,sizey,type,alignment) \ type name##_storage[(sizex)*(sizey)+(alignment)-1]; \ @@ -214,16 +218,55 @@ #define EMMS() +#ifdef __GNUC__ + +// needed for bitstream.h +#define BSWAP(a) __asm__ __volatile__ ("mux1 %1 = %0, @rev" \ + ";;" \ + "shr.u %1 = %1, 32" : "=r" (a) : "r" (a)); + +// rdtsc replacement for ia64 +static __inline int64_t read_counter() { + unsigned long result; + +// __asm__ __volatile__("mov %0=ar.itc" : "=r"(result) :: "memory"); +// while (__builtin_expect ((int) result == -1, 0)) + __asm__ __volatile__("mov %0=ar.itc" : "=r"(result) :: "memory"); + return result; + +} + +/* we are missing our ia64intrin.h file, but according to the + Intel's ecc manual, this should be the right way ... + this + +#elif defined(__INTEL_COMPILER) + +#include + +static __inline int64_t read_counter() { + return __getReg(44); +} + +#define BSWAP(a) ((unsigned int) (_m64_mux1(a, 0xb) >> 32)) +*/ + +#else + // needed for bitstream.h #define BSWAP(a) \ ((a) = ( ((a)&0xff)<<24) | (((a)&0xff00)<<8) | (((a)>>8)&0xff00) | (((a)>>24)&0xff)) // rdtsc command most likely not supported, // so just dummy code here -static __inline int64_t read_counter() { +static __inline int64_t +read_counter() +{ return 0; } +#endif // gcc or ecc + #else #define BSWAP(a) __asm__ ( "bswapl %0\n" : "=r" (a) : "0" (a) ) #define EMMS() __asm__("emms\n\t")