Enable the x86 back end by default on platforms where it makes sense,

and add the option "--enable-interpreter" to "configure".

diff --git a/ChangeLog b/ChangeLog
index d6167fd38b5bc6b96bf008e9d49d752ba3359aa1..436fa3c36105137371d326e0d86a23dfdd690d62 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
        * jit/jit-rules-arm.c, jit/jit-rules-arm.sel: more instruction
        selection rules for ARM.
 
+       * configure.in, jit/jit-rules.h: enable the x86 back end by
+       default on platforms where it makes sense, and add the option
+       "--enable-interpreter" to "configure".
+
 2004-05-31  Rhys Weatherley  <rweather@southern-storm.com.au>
 
        * jit/jit-rules-x86.sel: optimize multiplications for x86.

diff --git a/configure.in b/configure.in
index fd1cc8def8df02debd1fef42aad1df24d034ef40..0c2a8b59d745c7ddb3c21316b40bbe772ea2c3d5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -51,6 +51,18 @@ case "$host" in
 esac
 AC_MSG_RESULT($platform_win32)
 
+dnl The "--enable-interpreter" option forces the use of the interpreter.
+AC_ARG_ENABLE(interpreter,
+[  --enable-interpreter    Enable the libjit interpreter],
+[case "${enableval}" in
+  yes) interp=true ;;
+  no)  interp=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-interpreter) ;;
+esac],[interp=false])
+if test x$interp = xtrue; then
+       AC_DEFINE(USE_LIBJIT_INTERPRETER, 1, [Define if you want to use the libjit interpreter])
+fi
+
 dnl Checks for programs.
 AC_PROG_AWK
 AC_PROG_CC

diff --git a/jit/jit-rules.h b/jit/jit-rules.h
index 3bad40808cef184a6a3d4a89630021f93b899bb5..f23ed9a3724ca6305db3618e0d588ef7c53c938d 100644 (file)
--- a/jit/jit-rules.h
+++ b/jit/jit-rules.h
@@ -22,6 +22,7 @@
 #define        _JIT_RULES_H
 
 #include "jit-cache.h"
+#include <config.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -30,9 +31,17 @@ extern       "C" {
 /*
  * Determine which backend to use.
  */
-#define        JIT_BACKEND_INTERP              1
-/*#define      JIT_BACKEND_X86         1*/
+#if defined(USE_LIBJIT_INTERPRETER)
+       #define JIT_BACKEND_INTERP              1
+       #define JIT_HAVE_BACKEND                1
+#elif defined(__i386) || defined(__i386__) || defined(_M_IX86)
+       #define JIT_BACKEND_X86                 1
+       #define JIT_HAVE_BACKEND                1
+#endif
 /*#define      JIT_BACKEND_ARM         1*/
+#if !defined(JIT_HAVE_BACKEND)
+       #define JIT_BACKEND_INTERP              1
+#endif
 
 /*
  * Information about a register.