--- portab.h	2002/06/14 13:29:07	1.21
+++ portab.h	2002/09/04 22:01:59	1.27
@@ -1,24 +1,78 @@
+/*****************************************************************************
+ *
+ *  XVID MPEG-4 VIDEO CODEC
+ *  - Portable macros, types and inlined assembly -
+ *
+ *  Copyright(C) 2002 Michael Militzer
+ *
+ *  This program is an implementation of a part of one or more MPEG-4
+ *  Video tools as specified in ISO/IEC 14496-2 standard.  Those intending
+ *  to use this software module in hardware or software products are
+ *  advised that its use may infringe existing patents or copyrights, and
+ *  any such use would be at such party's own risk.  The original
+ *  developer of this software module and his/her company, and subsequent
+ *  editors and their companies, will have no liability for use of this
+ *  software or modifications or derivatives thereof.
+ *
+ *  This program is free software ; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation ; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY ; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program ; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ * $Id: portab.h,v 1.27 2002/09/04 22:01:59 edgomez Exp $
+ *
+ ****************************************************************************/
+
 #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);
+	}
 }
 
 
@@ -85,7 +139,24 @@
 	return ts;
 }
 
-#elif defined(LINUX) || defined(DJGPP) || defined(FREEBSD)
+#elif defined(LINUX) || defined(DJGPP) || defined(FREEBSD) || defined(BEOS)
+
+#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
 
@@ -106,9 +177,13 @@
 #define DEBUGCBR(A,B,C)
 #endif
 
-#if defined(LINUX)
+#if defined(LINUX) || defined(BEOS)
 
+#if defined(BEOS)
+#include <inttypes.h>
+#else
 #include <stdint.h>
+#endif
 
 #define DECLARE_ALIGNED_MATRIX(name,sizex,sizey,type,alignment) \
 	type name##_storage[(sizex)*(sizey)+(alignment)-1]; \
@@ -177,16 +252,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 <ia64intrin.h>
+
+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")
@@ -215,6 +329,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)