--- SheepShaver/src/Unix/configure.in	2003/05/13 16:59:57	1.4
+++ SheepShaver/src/Unix/configure.in	2004/01/04 18:36:47	1.14
@@ -5,9 +5,16 @@ AC_INIT(main_unix.cpp)
 AC_PREREQ(2.12)
 AC_CONFIG_HEADER(config.h)
 
+dnl Canonical system information.
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
+
 dnl Options.
+AC_ARG_ENABLE(jit,          [  --enable-jit            enable JIT compiler [default=yes]], [WANT_JIT=$enableval], [WANT_JIT=yes])
+AC_ARG_ENABLE(ppc-emulator, [  --enable-ppc-emulator   use the selected PowerPC emulator [default=auto]], [WANT_EMULATED_PPC=$enableval], [WANT_EMULATED_PPC=auto])
 AC_ARG_ENABLE(xf86-dga,     [  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes])
 AC_ARG_ENABLE(xf86-vidmode, [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=yes]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=yes])
+AC_ARG_ENABLE(vosf,         [  --enable-vosf           enable video on SEGV signals [default=yes]], [WANT_VOSF=$enableval], [WANT_VOSF=yes])
 AC_ARG_WITH(esd,            [  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes])
 AC_ARG_WITH(gtk,            [  --with-gtk              use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes])
 AC_ARG_WITH(mon,            [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
@@ -29,11 +36,29 @@ AC_EGREP_CPP(yes,
 #endif
 ], [AC_MSG_RESULT(yes); HAVE_PPC=yes], AC_MSG_RESULT(no))
 
+dnl We use native CPU if possible.
+EMULATED_PPC=yes
+case $WANT_EMULATED_PPC in
+  auto) [[ "x$HAVE_PPC" = "xyes" ]] && EMULATED_PPC=no;;
+  no)   EMULATED_PPC=no;;
+esac
+if [[ "x$EMULATED_PPC" = "xyes" ]]; then
+  AC_DEFINE(EMULATED_PPC)
+fi
+
 dnl We use mon if possible.
 MONSRCS=
+case "x$WANT_MON" in
+x/* | x.*)
+  mon_srcdir=$WANT_MON
+  WANT_MON=yes
+  ;;
+yes)
+  mon_srcdir=../../../mon/src
+  ;;
+esac
 if [[ "x$WANT_MON" = "xyes" ]]; then
   AC_MSG_CHECKING(for mon)
-  mon_srcdir=../../../mon/src
   if grep mon_init $mon_srcdir/mon.h >/dev/null 2>/dev/null; then
     AC_MSG_RESULT(yes)
     AC_DEFINE(ENABLE_MON)
@@ -68,7 +93,7 @@ LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -l
 
 dnl We need pthreads on non-PowerPC systems. Try libpthread first, then libc_r (FreeBSD), then PTL.
 HAVE_PTHREADS=yes
-if [[ "x$HAVE_PPC" = "xno" ]]; then
+if [[ "x$EMULATED_PPC" = "xyes" ]]; then
   AC_CHECK_LIB(pthread, pthread_create, , [
     AC_CHECK_LIB(c_r, pthread_create, , [
       AC_CHECK_LIB(PTL, pthread_create, , [
@@ -77,6 +102,12 @@ if [[ "x$HAVE_PPC" = "xno" ]]; then
     ])
   ])
   AC_CHECK_FUNCS(pthread_cancel)
+  if [[ "x$HAVE_PTHREADS" = "xyes" ]]; then
+    AC_DEFINE(HAVE_PTHREADS, 1, [Define if pthreads are available.])
+  fi
+else
+  dnl We do have our own pthread_cancel() implementation
+  AC_DEFINE(HAVE_PTHREAD_CANCEL, 1, [Define if you have the pthread_cancel function.])
 fi
 
 dnl If POSIX.4 semaphores are not available, we emulate them with pthread mutexes.
@@ -140,7 +171,9 @@ fi
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(unistd.h fcntl.h sys/time.h sys/mman.h)
+AC_CHECK_HEADERS(mach/vm_map.h mach/mach_init.h sys/mman.h)
+AC_CHECK_HEADERS(sys/time.h sys/times.h)
+AC_CHECK_HEADERS(unistd.h fcntl.h byteswap.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_BIGENDIAN
@@ -168,10 +201,8 @@ AC_CHECK_FUNCS(mmap mprotect munmap)
 AC_CHECK_FUNCS(vm_allocate vm_deallocate vm_protect)
 
 dnl Select system-dependant sources.
-if [[ "x$HAVE_PPC" = "xyes" ]]; then
+if [[ "x$EMULATED_PPC" = "xno" ]]; then
   SYSSRCS="Linux/paranoia.cpp Linux/sheepthreads.c Linux/asm_linux.S"
-else
-  SYSSRCS="../emul_ppc/emul_ppc.cpp"
 fi
 SYSSRCS="$SYSSRCS $SEMSRCS $UISRCS $MONSRCS"
 
@@ -477,8 +508,147 @@ AC_CACHE_CHECK([whether we can skip inst
 AC_TRANSLATE_DEFINE(HAVE_SIGSEGV_SKIP_INSTRUCTION, "$ac_cv_have_skip_instruction",
   [Define if we can ignore the fault (instruction skipping in SIGSEGV handler).])
 
+dnl Can we do Video on SEGV Signals ?
+CAN_VOSF=no
+if [[ "$ac_cv_have_extended_signals" = "yes" -o "$ac_cv_have_sigcontext_hack" = "yes" ]]; then
+  CAN_VOSF=yes
+fi
+
+dnl Enable VOSF screen updates with this feature is requested and feasible
+if [[ "x$WANT_VOSF" = "xyes" -a "x$CAN_VOSF" = "xyes" ]]; then
+    AC_DEFINE(ENABLE_VOSF, 1, [Define if using video enabled on SEGV signals.])
+else
+    WANT_VOSF=no
+fi
+
+dnl Check for GCC 2.7 or higher.
+HAVE_GCC27=no
+AC_MSG_CHECKING(for GCC 2.7 or higher)
+AC_EGREP_CPP(xyes,
+[#if __GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5
+  xyes
+#endif
+], [AC_MSG_RESULT(yes); HAVE_GCC27=yes], AC_MSG_RESULT(no))
+
+dnl Check for GCC 3.0 or higher.
+HAVE_GCC30=no
+AC_MSG_CHECKING(for GCC 3.0 or higher)
+AC_EGREP_CPP(xyes,
+[#if __GNUC__ >= 3
+  xyes
+#endif
+], [AC_MSG_RESULT(yes); HAVE_GCC30=yes], AC_MSG_RESULT(no))
+
+# Test if the compiler can generate ELF objects
+AC_CACHE_CHECK([whether the compiler can generate ELF objects],
+  ac_cv_elf_objects, [
+  echo 'int i;' > conftest.$ac_ext
+  ac_cv_elf_objects=no
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+    *"ELF"*)
+      ac_cv_elf_objects=yes
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+])
+ELF_OBJECTS=$ac_cv_elf_objects
+
+dnl CPU emulator sources
+if [[ "x$EMULATED_PPC" = "xyes" ]]; then
+  CPUSRCS="\
+    ../kpx_cpu/src/cpu/ppc/ppc-cpu.cpp \
+    ../kpx_cpu/src/cpu/ppc/ppc-decode.cpp \
+    ../kpx_cpu/src/cpu/ppc/ppc-execute.cpp \
+    ../kpx_cpu/src/cpu/ppc/ppc-translate.cpp"
+  CPPFLAGS="$CPPFLAGS -I../kpx_cpu/include -I../kpx_cpu/src"
+
+  dnl Enable JIT compiler, if possible
+  if [[ "x$WANT_JIT" = "xyes" ]]; then
+    AC_CACHE_CHECK([whether dyngen can be used],
+      ac_cv_use_dyngen, [
+      case $host_cpu:$ELF_OBJECTS in
+      powerpc:yes)
+        ac_cv_use_dyngen=yes
+        ;;
+      x86_64:yes)
+        ac_cv_use_dyngen=yes
+        ;;
+      i?86:yes)
+        ac_cv_use_dyngen=yes
+        ;;
+      *:*)
+        ac_cv_use_dyngen=no
+        ;;
+      esac
+    ])
+    if [[ "x$ac_cv_use_dyngen" = "xyes" ]]; then
+      case $host_cpu in
+      i?86)
+        DYNGEN_OP_FLAGS="-fomit-frame-pointer -mpreferred-stack-boundary=2"
+        if [[ "x$HAVE_GCC30" = "xyes" ]]; then
+          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -falign-functions=0"
+        else
+          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
+        fi
+        ;;
+      esac
+      DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-limit=10000"
+      if [[ "x$HAVE_GCC30" = "xyes" ]]; then
+        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -fno-reorder-blocks -fno-optimize-sibling-calls"
+      fi
+    else
+      WANT_JIT=no
+    fi
+    AC_TRANSLATE_DEFINE(ENABLE_DYNGEN, $ac_cv_use_dyngen, [Define to enable dyngen engine])
+    if [[ "x$WANT_JIT" = "xyes" ]]; then
+      DYNGENSRCS="\
+        ../kpx_cpu/src/cpu/jit/dyngen.c \
+        ../kpx_cpu/src/cpu/jit/cxxdemangle.cpp"
+      CPUSRCS="\
+        ../kpx_cpu/src/cpu/jit/jit-cache.cpp \
+        ../kpx_cpu/src/cpu/jit/basic-dyngen.cpp \
+        ../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp $CPUSRCS"
+    fi
+  fi
+  CPUSRCS="$CPUSRCS ../kpx_cpu/sheepshaver_glue.cpp"
+else
+  WANT_JIT=no
+fi
+if [[ "x$ac_cv_use_dyngen" = "xyes" ]]; then
+  AC_CACHE_CHECK([whether static data regions are executable],
+    ac_cv_have_static_data_exec, [
+    AC_TRY_RUN([int main(void) {
+#if defined(__powerpc__)
+      static unsigned int p[8] = {0x4e800020,};
+      asm volatile("dcbst 0,%0" : : "r" (p) : "memory");
+      asm volatile("sync" : : : "memory");
+      asm volatile("icbi 0,%0" : : "r" (p) : "memory");
+      asm volatile("sync" : : : "memory");
+      asm volatile("isync" : : : "memory");
+      ((void (*)(void))p)();
+      return 0;
+#endif
+      return 1;
+    }], ac_cv_have_static_data_exec=yes, ac_cv_have_static_data_exec=no,
+    dnl When cross-compiling, do not assume anything.
+    ac_cv_have_static_data_exec=no
+    )
+  ])
+fi
+AC_TRANSLATE_DEFINE(HAVE_STATIC_DATA_EXEC, "$ac_cv_have_static_data_exec",
+  [Define if your system marks static data pages as executable.])
+
+if [[ "x$WANT_JIT" = "xyes" ]]; then
+  CPPFLAGS="$CPPFLAGS -DUSE_JIT"
+fi
+
 dnl Generate Makefile.
+AC_SUBST(DYNGENSRCS)
+AC_SUBST(DYNGEN_OP_FLAGS)
 AC_SUBST(SYSSRCS)
+AC_SUBST(CPUSRCS)
 AC_OUTPUT(Makefile)
 
 dnl Print summary.
@@ -487,6 +657,9 @@ echo SheepShaver configuration summary:
 echo
 echo XFree86 DGA support .............. : $WANT_XF86_DGA
 echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE
+echo Using PowerPC emulator ........... : $EMULATED_PPC
+echo Enable JIT compiler .............. : $WANT_JIT
+echo Enable video on SEGV signals ..... : $WANT_VOSF
 echo ESD sound support ................ : $WANT_ESD
 echo GTK user interface ............... : $WANT_GTK
 echo mon debugger support ............. : $WANT_MON