--- portab.h	2002/06/14 13:06:33	1.20
+++ portab.h	2002/07/10 14:05:08	1.24
@@ -1,24 +1,44 @@
 #ifndef _PORTAB_H_
 #define _PORTAB_H_
 
+
+// debug level masks
+#define DPRINTF_ERROR		0x00000001
+#define DPRINTF_STARTCODE	0x00000002
+#define DPRINTF_HEADER		0x00000004
+#define DPRINTF_TIMECODE	0x00000008
+#define DPRINTF_MB			0x00000010
+#define DPRINTF_COEFF		0x00000020
+#define DPRINTF_MV			0x00000040
+#define DPRINTF_DEBUG		0x80000000
+
+// debug level
+#define DPRINTF_LEVEL		0
+
+
+#define DPRINTF_BUF_SZ  1024
+
+
 #if defined(WIN32)
 
 #include <windows.h>
 #include <stdio.h>
 
-
-#define DPRINTF_BUF_SZ  1024
-static void
-dprintf(char *fmt,
+static __inline void
+DPRINTF(int level, char *fmt,
 		...)
 {
-	va_list args;
-	char buf[DPRINTF_BUF_SZ];
-
-	va_start(args, fmt);
-	vsprintf(buf, fmt, args);
-	OutputDebugString(buf);
-	fprintf(stdout, "%s\n", buf);
+	if ((DPRINTF_LEVEL & level))
+	{
+		va_list args;
+		char buf[DPRINTF_BUF_SZ];
+
+		va_start(args, fmt);
+		vsprintf(buf, fmt, args);
+		OutputDebugString(buf);
+		fprintf(stdout, "%s\n", buf);
+		fflush(stdout);
+	}
 }
 
 
@@ -49,6 +69,7 @@
 #define uint32_t unsigned int
 #define int64_t __int64
 #define uint64_t unsigned __int64
+#define ptr_t uint32_t
 
 #define EMMS() __asm {emms}
 
@@ -74,8 +95,8 @@
 	uint32_t ts1, ts2;
 
 	__asm {
-		rdtsc 
-		mov ts1, eax 
+		rdtsc
+		mov ts1, eax
 		mov ts2, edx
 	}
 
@@ -86,6 +107,23 @@
 
 #elif defined(LINUX) || defined(DJGPP) || defined(FREEBSD)
 
+#include <stdio.h>
+#include <stdarg.h>
+
+static __inline void
+DPRINTF(int level, char *fmt,
+		...)
+{
+	if ((DPRINTF_LEVEL & level)) {
+		va_list args;
+		char buf[DPRINTF_BUF_SZ];
+
+		va_start(args, fmt);
+		vsprintf(buf, fmt, args);
+		fprintf(stdout, "%s\n", buf);
+	}
+}
+
 #ifdef _DEBUG
 
 #include <stdio.h>
@@ -105,15 +143,13 @@
 #define DEBUGCBR(A,B,C)
 #endif
 
-#define CACHE_LINE  16
-
 #if defined(LINUX)
 
 #include <stdint.h>
 
 #define DECLARE_ALIGNED_MATRIX(name,sizex,sizey,type,alignment) \
 	type name##_storage[(sizex)*(sizey)+(alignment)-1]; \
-	type * name = (type *) (((int32_t) name##_storage+(alignment - 1)) & ~((int32_t)(alignment)-1))
+	type * name = (type *) (((ptr_t) name##_storage+(alignment - 1)) & ~((ptr_t)(alignment)-1))
 
 #else
 
@@ -165,6 +201,35 @@
 	} while (tb != get_tbl());
 	return (((int64_t) tu) << 32) | (int64_t) tb;
 }
+
+#define ptr_t   uint32_t
+
+#define CACHE_LINE 16
+
+#elif defined(ARCH_IA64)
+
+#define ptr_t   uint64_t
+
+#define CACHE_LINE 32
+
+#define EMMS()
+
+// 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;
+
+}
+
 #else
 #define BSWAP(a) __asm__ ( "bswapl %0\n" : "=r" (a) : "0" (a) )
 #define EMMS() __asm__("emms\n\t")
@@ -185,10 +250,33 @@
 	return ts;
 }
 
+#define ptr_t   uint32_t
+
+#define CACHE_LINE 16
+
 #endif
 
 #else							// OTHER OS
 
+
+#include <stdio.h>
+#include <stdarg.h>
+
+static __inline void
+DPRINTF(int level, char *fmt, ...)
+{
+	if ((DPRINTF_LEVEL & level)) {
+
+		va_list args;
+		char buf[DPRINTF_BUF_SZ];
+
+		va_start(args, fmt);
+		vsprintf(buf, fmt, args);
+		fprintf(stdout, "%s\n", buf);
+	}
+}
+
+
 #define DEBUG(S)
 #define DEBUG1(S,I)
 #define DEBUG2(X,A,B)
@@ -212,10 +300,10 @@
 	return 0;
 }
 
+#define ptr_t uint32_t
+
 #define CACHE_LINE  16
 #define CACHE_ALIGN
-#define DECLARE_ALIGNED_MATRIX(name,sizex,sizey,type,alignment) \
-	type name[(sizex)*(sizey)]
 
 #endif