--- portab.h	2002/06/14 13:29:07	1.21
+++ 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);
+	}
 }
 
 
@@ -87,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>
@@ -178,13 +215,19 @@
 #define EMMS()
 
 // needed for bitstream.h
-#define BSWAP(a) \
-	 ((a) = ( ((a)&0xff)<<24) | (((a)&0xff00)<<8) | (((a)>>8)&0xff00) | (((a)>>24)&0xff))
+#define BSWAP(a)  __asm__ __volatile__ ("mux1 %1 = %0, @rev" \
+			";;" \
+			"shr.u %1 = %1, 32" : "=r" (a) : "r" (a));
 
-// rdtsc command most likely not supported,
-// so just dummy code here
+// rdtsc replacement for ia64
 static __inline int64_t read_counter() {
-	return 0;
+	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
@@ -215,6 +258,25 @@
 
 #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)