--- xvid.c	2002/07/07 13:21:34	1.25
+++ xvid.c	2002/07/21 23:34:08	1.32
@@ -37,7 +37,7 @@
  *  - 22.12.2001  API change: added xvid_init() - Isibaar
  *  - 16.12.2001	inital version; (c)2001 peter ross <pross@cs.rmit.edu.au>
  *
- *  $Id: xvid.c,v 1.25 2002/07/07 13:21:34 Isibaar Exp $
+ *  $Id: xvid.c,v 1.32 2002/07/21 23:34:08 chl Exp $
  *
  ****************************************************************************/
 
@@ -52,11 +52,79 @@
 #include "utils/mem_transfer.h"
 #include "quant/quant_h263.h"
 #include "quant/quant_mpeg4.h"
+#include "motion/motion.h"
 #include "motion/sad.h"
 #include "utils/emms.h"
 #include "utils/timer.h"
 #include "bitstream/mbcoding.h"
 
+#if defined(ARCH_X86) && defined(EXPERIMENTAL_SSE2_CODE)
+
+#ifdef WIN32
+#include <windows.h>
+#else
+#include <signal.h>
+#include <setjmp.h>
+#endif
+
+
+#ifndef WIN32
+
+static jmp_buf mark;
+
+static void
+sigill_handler(int signal)
+{
+   longjmp(mark, 1);
+}
+#endif
+
+
+/*
+calls the funcptr, and returns whether SIGILL (illegal instruction) was signalled
+return values:
+-1 : could not determine
+0  : SIGILL was *not* signalled
+1  : SIGILL was signalled
+*/
+
+int
+sigill_check(void (*func)())
+{
+#ifdef WIN32
+	_try {
+		func();
+	}
+	_except(EXCEPTION_EXECUTE_HANDLER) {
+
+		if (_exception_code() == STATUS_ILLEGAL_INSTRUCTION)
+			return 1;
+	}
+	return 0;
+#else
+    void * old_handler;
+    int jmpret;
+
+
+    old_handler = signal(SIGILL, sigill_handler);
+    if (old_handler == SIG_ERR)
+    {
+        return -1;
+    }
+
+    jmpret = setjmp(mark);
+    if (jmpret == 0)
+    {
+        func();
+    }
+
+    signal(SIGILL, old_handler);
+
+    return jmpret;
+#endif
+}
+#endif
+
 /*****************************************************************************
  * XviD Init Entry point
  *
@@ -88,21 +156,33 @@
 	/* Inform the client the core build - unused because we're still alpha */
 	init_param->core_build = 1000;
 
-	if ((init_param->cpu_flags & XVID_CPU_CHKONLY))
-	{
-		init_param->cpu_flags = check_cpu_features();
-		return XVID_ERR_OK;
-	}
-
 	/* Do we have to force CPU features  ? */
-	if ((init_param->cpu_flags & XVID_CPU_FORCE) > 0) {
+	if ((init_param->cpu_flags & XVID_CPU_FORCE)) {
+
 		cpu_flags = init_param->cpu_flags;
+
 	} else {
 
 		cpu_flags = check_cpu_features();
+
+#if defined(ARCH_X86) && defined(EXPERIMENTAL_SSE2_CODE)
+		if ((cpu_flags & XVID_CPU_SSE) && sigill_check(sse_os_trigger))
+			cpu_flags &= ~XVID_CPU_SSE;
+
+		if ((cpu_flags & XVID_CPU_SSE2) && sigill_check(sse2_os_trigger))
+			cpu_flags &= ~XVID_CPU_SSE2;
+#endif
+	}
+
+	if ((init_param->cpu_flags & XVID_CPU_CHKONLY))
+	{
 		init_param->cpu_flags = cpu_flags;
+		return XVID_ERR_OK;
 	}
 
+	init_param->cpu_flags = cpu_flags;
+
+
 	/* Initialize the function pointers */
 	idct_int32_init();
 	init_vlc_tables();
@@ -168,6 +248,8 @@
 	sad16bi  = sad16bi_c;
 	sad8     = sad8_c;
 	dev16    = dev16_c;
+	sad8bi   = sad8bi_c;
+	Halfpel8_Refine = Halfpel8_Refine_c;
 
 #ifdef ARCH_X86
 	if ((cpu_flags & XVID_CPU_MMX) > 0) {
@@ -296,6 +378,7 @@
 	  sad16bi = sad16bi_ia64;
 	  sad8 = sad8_ia64;
 	  dev16 = dev16_ia64;
+	  Halfpel8_Refine = Halfpel8_Refine_ia64;
 	  quant_intra = quant_intra_ia64;
 	  dequant_intra = dequant_intra_ia64;
 	  quant_inter = quant_inter_ia64;