ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/SheepShaver/src/Unix/configure.ac
(Generate patch)

Comparing SheepShaver/src/Unix/configure.ac (file contents):
Revision 1.2 by gbeauche, 2004-06-30T08:48:45Z vs.
Revision 1.29 by gbeauche, 2005-06-25T11:06:24Z

# Line 17 | Line 17 | ulimit -c 0
17   dnl Options.
18   AC_ARG_ENABLE(jit,          [  --enable-jit            enable JIT compiler [default=yes]], [WANT_JIT=$enableval], [WANT_JIT=yes])
19   AC_ARG_ENABLE(ppc-emulator, [  --enable-ppc-emulator   use the selected PowerPC emulator [default=auto]], [WANT_EMULATED_PPC=$enableval], [WANT_EMULATED_PPC=auto])
20 + AC_ARG_ENABLE(fbdev-dga,    [  --enable-fbdev-dga      use direct frame buffer access via /dev/fb0 [default=yes]], [WANT_FBDEV_DGA=$enableval], [WANT_FBDEV_DGA=yes])
21   AC_ARG_ENABLE(xf86-dga,     [  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes])
22 < AC_ARG_ENABLE(xf86-vidmode, [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=no]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=no])
22 > AC_ARG_ENABLE(xf86-vidmode, [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=yes]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=yes])
23   AC_ARG_ENABLE(vosf,         [  --enable-vosf           enable video on SEGV signals [default=yes]], [WANT_VOSF=$enableval], [WANT_VOSF=yes])
24   AC_ARG_WITH(esd,            [  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes])
25 < AC_ARG_WITH(gtk,            [  --with-gtk              use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes])
25 > AC_ARG_WITH(gtk,            [  --with-gtk              use GTK user interface [default=yes]],
26 >  [case "$withval" in
27 >   gtk1)      WANT_GTK="gtk";;
28 >   gtk|gtk2)  WANT_GTK="$withval";;
29 >   yes)       WANT_GTK="gtk2 gtk";;
30 >   *)         WANT_GTK="no";;
31 >   esac],
32 >  [WANT_GTK="gtk2 gtk"])
33   AC_ARG_WITH(mon,            [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
34   AC_ARG_WITH(dgcc,           [  --with-dgcc=COMPILER    use C++ COMPILER to compile synthetic opcodes], [DYNGEN_CC=$withval])
35  
36 + dnl Addressing mode
37 + AC_ARG_ENABLE(addressing,
38 +  [  --enable-addressing=AM  set the addressing mode to use [default=real]],
39 +  [case "$enableval" in
40 +   real)        WANT_ADDRESSING_MODE="real";;
41 +   direct)      WANT_ADDRESSING_MODE="direct";;
42 +   direct,0x*)  WANT_ADDRESSING_MODE="direct"; NATMEM_OFFSET=`echo "$enableval" | sed -n '/direct,\(0[[xX]][[0-9A-Fa-f]]*\([[UuLl]]\{1,2\}\)\?\)$/s//\1/p'`;;
43 +   esac],
44 +  [WANT_ADDRESSING_MODE="real"]
45 + )
46 +
47   dnl SDL options.
48   AC_ARG_ENABLE(sdl-static,   [  --enable-sdl-static     use SDL static libraries for linking [default=no]], [WANT_SDL_STATIC=$enableval], [WANT_SDL_STATIC=no])
49   AC_ARG_ENABLE(sdl-video,    [  --enable-sdl-video      use SDL for video graphics [default=no]], [WANT_SDL_VIDEO=$enableval], [WANT_SDL_VIDEO=no])
50 + AC_ARG_ENABLE(sdl-audio,    [  --enable-sdl-audio      use SDL for audio [default=no]], [WANT_SDL_AUDIO=$enableval], [WANT_SDL_AUDIO=no])
51  
52   dnl Checks for programs.
53   AC_PROG_CC
# Line 35 | Line 55 | AC_PROG_CPP
55   AC_PROG_CXX
56   AC_PROG_MAKE_SET
57   AC_PROG_INSTALL
58 + AC_PROG_EGREP
59 + AC_PATH_PROGS(FILE, [file false])
60 + AC_PATH_PROG(PERL, [perl])
61  
62   dnl Check for PowerPC target CPU.
63   HAVE_PPC=no
# Line 91 | Line 114 | if [[ "x$WANT_MON" = "xyes" ]]; then
114      WANT_MON=no
115    fi
116   fi
117 + AC_SUBST(MONSRCS)
118  
119   dnl Checks for libraries.
120   AC_CHECK_LIB(posix4, sem_init)
121  
122   dnl Do we need SDL?
123   WANT_SDL=no
100 SDL_SUPPORT="none"
124   if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
125    WANT_SDL=yes
126    WANT_XF86_DGA=no
127    WANT_XF86_VIDMODE=no
128    WANT_FBDEV_DGA=no
129 <  SDL_SUPPORT="video"
129 >  SDL_SUPPORT="$SDL_SUPPORT video"
130 > fi
131 > if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; then
132 >  WANT_SDL=yes
133 >  SDL_SUPPORT="$SDL_SUPPORT audio"
134   fi
135   if [[ "x$WANT_SDL" = "xyes" ]]; then
136    AC_PATH_PROG(sdl_config, "sdl-config")
137    if [[ -n "$sdl_config" ]]; then
138 <    sdl_cflags=`$sdl_config --cflags`
139 <    if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
140 <      sdl_libs=`$sdl_config --static-libs`
141 <    else
142 <      sdl_libs=`$sdl_config --libs`
143 <    fi
138 >    case $target_os in
139 >    # Special treatment for Cygwin so that we can still use the POSIX layer
140 >    *cygwin*)
141 >      sdl_cflags="-I`$sdl_config --prefix`/include/SDL"
142 >      sdl_libs="-L`$sdl_config --exec-prefix`/lib -lSDL"
143 >      ;;
144 >    *)
145 >      sdl_cflags=`$sdl_config --cflags`
146 >      if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
147 >        sdl_libs=`$sdl_config --static-libs`
148 >      else
149 >        sdl_libs=`$sdl_config --libs`
150 >      fi
151 >      ;;
152 >    esac
153      CFLAGS="$CFLAGS $sdl_cflags"
154      CXXFLAGS="$CXXFLAGS $sdl_cflags"
155      LIBS="$LIBS $sdl_libs"
156    else
157      WANT_SDL=no
158 +    WANT_SDL_VIDEO=no
159 +    WANT_SDL_AUDIO=no
160    fi
161 +  SDL_SUPPORT=`echo "$SDL_SUPPORT" | sed -e "s/^ //"`
162 + else
163 +  SDL_SUPPORT="none"
164   fi
165  
166   dnl We need X11, if not using SDL.
167 < if [[ "x$WANT_SDL" = "xno" ]]; then
167 > if [[ "x$WANT_SDL_VIDEO" != "xyes" ]]; then
168    AC_PATH_XTRA
169    if [[ "x$no_x" = "xyes" ]]; then
170      AC_MSG_ERROR([You need X11 to run SheepShaver.])
# Line 136 | Line 177 | fi
177   dnl We need pthreads on non-PowerPC systems. Try libpthread first, then libc_r (FreeBSD), then PTL.
178   HAVE_PTHREADS=yes
179   case $EMULATED_PPC:$target_os in
180 < no:linux*)
180 > no:linux*|no:netbsd*)
181    dnl We do have our own pthread_cancel() implementation
182    AC_DEFINE(HAVE_PTHREAD_CANCEL, 1, [Define if you have the pthread_cancel function.])
183    ;;
# Line 144 | Line 185 | no:linux*)
185    AC_CHECK_LIB(pthread, pthread_create, , [
186      AC_CHECK_LIB(c_r, pthread_create, , [
187        AC_CHECK_LIB(PTL, pthread_create, , [
188 <        AC_MSG_ERROR([You need pthreads to run Basilisk II.])
188 >        dnl XXX remove when no pthreads case is merged
189 >        AC_MSG_ERROR([You need pthreads to run SheepShaver.])
190 >        HAVE_PTHREADS=no
191        ])
192      ])
193    ])
# Line 152 | Line 195 | no:linux*)
195    AC_CHECK_FUNCS(pthread_mutexattr_setprotocol)
196    AC_CHECK_FUNCS(pthread_mutexattr_settype)
197    AC_CHECK_FUNCS(pthread_mutexattr_setpshared)
155  if [[ "x$HAVE_PTHREADS" = "xyes" ]]; then
156    AC_DEFINE(HAVE_PTHREADS, 1, [Define if pthreads are available.])
157  fi
198    dnl If POSIX.4 semaphores are not available, we emulate them with pthread mutexes.
199    SEMSRC=
200    AC_CHECK_FUNCS(sem_init, , [
# Line 164 | Line 204 | no:linux*)
204    ])
205    ;;
206   esac
207 + if [[ "x$HAVE_PTHREADS" = "xyes" ]]; then
208 +  AC_DEFINE(HAVE_PTHREADS, 1, [Define if pthreads are available.])
209 + fi
210 +
211 + dnl We use FBDev DGA if possible.
212 + if [[ "x$WANT_FBDEV_DGA" = "xyes" ]]; then
213 +  AC_CHECK_HEADER(linux/fb.h, [
214 +    AC_DEFINE(ENABLE_FBDEV_DGA, 1, [Define if using Linux fbdev extension.])
215 +  ], [
216 +    AC_MSG_WARN([Could not find Linux FBDev extension, ignoring --enable-fbdev-dga.])
217 +    WANT_FBDEV_DGA=no
218 +  ])
219 + fi
220  
221   dnl We use XFree86 DGA if possible.
222   if [[ "x$WANT_XF86_DGA" = "xyes" ]]; then
# Line 189 | Line 242 | fi
242  
243   dnl We use GTK+ if possible.
244   UISRCS=../dummy/prefs_editor_dummy.cpp
245 < if [[ "x$WANT_GTK" = "xyes" ]]; then
245 > case "x$WANT_GTK" in
246 > xgtk2*)
247 >  AM_PATH_GTK_2_0(1.3.15, [
248 >    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
249 >    CFLAGS="$CFLAGS $GTK_CFLAGS"
250 >    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
251 >    LIBS="$LIBS $GTK_LIBS"
252 >    UISRCS=prefs_editor_gtk.cpp
253 >    WANT_GTK=gtk2
254 >  ], [
255 >    case "x${WANT_GTK}x" in
256 >    *gtkx)
257 >      AC_MSG_WARN([Could not find GTK+ 2.0, trying with GTK+ 1.2.])
258 >      WANT_GTK=gtk
259 >      ;;
260 >    *)
261 >      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
262 >      WANT_GTK=no
263 >      ;;
264 >    esac
265 >  ])
266 >  ;;
267 > esac
268 > if [[ "x$WANT_GTK" = "xgtk" ]]; then
269    AM_PATH_GTK(1.2.0, [
270      AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
271      CFLAGS="$CFLAGS $GTK_CFLAGS"
# Line 221 | Line 297 | AC_SYS_LARGEFILE
297   dnl Checks for header files.
298   AC_HEADER_STDC
299   AC_HEADER_SYS_WAIT
300 + AC_CHECK_HEADERS(malloc.h)
301   AC_CHECK_HEADERS(mach/vm_map.h mach/mach_init.h sys/mman.h)
302   AC_CHECK_HEADERS(sys/time.h sys/times.h sys/socket.h)
303 < AC_CHECK_HEADERS(unistd.h fcntl.h byteswap.h)
303 > AC_CHECK_HEADERS(unistd.h fcntl.h byteswap.h dirent.h)
304   AC_CHECK_HEADERS(linux/if.h, [], [], [
305   #if HAVE_SYS_SOCKET_H
306   # include <sys/socket.h>
307   #endif
308   ])
309   AC_CHECK_HEADERS(linux/if_tun.h net/if.h net/if_tun.h)
310 + AC_CHECK_HEADERS(fenv.h)
311  
312   dnl Checks for typedefs, structures, and compiler characteristics.
313   AC_C_BIGENDIAN
# Line 270 | Line 348 | AC_CHECK_FUNCS(nanosleep)
348   AC_CHECK_FUNCS(sigaction signal)
349   AC_CHECK_FUNCS(mmap mprotect munmap)
350   AC_CHECK_FUNCS(vm_allocate vm_deallocate vm_protect)
351 < AC_CHECK_FUNCS(posix_memalign memalign valloc)
351 > AC_CHECK_FUNCS(exp2f log2f exp2 log2)
352 > AC_CHECK_FUNCS(floorf roundf ceilf truncf floor round ceil trunc)
353  
354   dnl Darwin seems to define mach_task_self() instead of task_self().
355   AC_CHECK_FUNCS(mach_task_self task_self)
# Line 282 | Line 361 | no:linux*)
361    ;;
362   *:*)
363    AC_SEARCH_LIBS(clock_gettime, [rt posix4])
364 <  AC_CHECK_FUNCS(clock_gettime)
364 >  AC_CHECK_FUNCS(clock_gettime clock_nanosleep)
365    ;;
366   esac
367  
368 + dnl Check for headers and functions related to pty support (sshpty.c)
369 + dnl From openssh-3.2.2p1 configure.ac
370 + AC_CHECK_HEADERS(strings.h login.h sys/bsdtty.h sys/stat.h util.h pty.h)
371 + AC_CHECK_FUNCS(_getpty vhangup strlcpy)
372 +
373 + case "$host" in
374 + *-*-hpux10.26)
375 +        disable_ptmx_check=yes
376 +        ;;
377 + *-*-linux*)
378 +        no_dev_ptmx=1
379 +        ;;
380 + mips-sony-bsd|mips-sony-newsos4)
381 +        AC_DEFINE(HAVE_NEWS4, 1, [Define if you are on NEWS-OS (additions from openssh-3.2.2p1, for sshpty.c).])
382 +        ;;
383 + *-*-sco3.2v4*)
384 +        no_dev_ptmx=1
385 +        ;;
386 + *-*-sco3.2v5*)
387 +        no_dev_ptmx=1
388 +        ;;
389 + *-*-cygwin*)
390 +        no_dev_ptmx=1
391 +        ;;
392 + esac
393 +
394 + if test -z "$no_dev_ptmx" ; then
395 +        if test "x$disable_ptmx_check" != "xyes" ; then
396 +                AC_CHECK_FILE([/dev/ptmx],
397 +                        [
398 +                                AC_DEFINE_UNQUOTED(HAVE_DEV_PTMX, 1, [Define if you have /dev/ptmx.])
399 +                                have_dev_ptmx=1
400 +                        ]
401 +                )
402 +        fi
403 + fi
404 + AC_CHECK_FILE([/dev/ptc],
405 +        [
406 +                AC_DEFINE_UNQUOTED(HAVE_DEV_PTS_AND_PTC, 1, [Define if you have /dev/ptc.])
407 +                have_dev_ptc=1
408 +        ]
409 + )
410 + dnl (end of code from openssh-3.2.2p1 configure.ac)
411 +
412   dnl AC_CHECK_FRAMEWORK($1=NAME, $2=INCLUDES)
413   AC_DEFUN(AC_CHECK_FRAMEWORK, [
414    AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])dnl
# Line 313 | Line 436 | SERIALSRC=serial_unix.cpp
436   ETHERSRC=../dummy/ether_dummy.cpp
437   SCSISRC=../dummy/scsi_dummy.cpp
438   AUDIOSRC=../dummy/audio_dummy.cpp
439 + EXTFSSRC=extfs_unix.cpp
440   EXTRASYSSRCS=
441   case "$target_os" in
442   linux*)
# Line 320 | Line 444 | linux*)
444    AUDIOSRC=audio_oss_esd.cpp
445    SCSISRC=Linux/scsi_linux.cpp
446    if [[ "x$EMULATED_PPC" = "xno" ]]; then
447 <    EXTRASYSSRCS="Linux/paranoia.cpp Linux/sheepthreads.c Linux/asm_linux.S"
447 >    EXTRASYSSRCS="Linux/paranoia.cpp Linux/sheepthreads.c ppc_asm.S"
448 >  fi
449 >  ;;
450 > netbsd*)
451 >  if [[ "x$EMULATED_PPC" = "xno" ]]; then
452 >    EXTRASYSSRCS="NetBSD/paranoia.cpp NetBSD/sheepthreads.c ppc_asm.S"
453    fi
454    ;;
455   darwin*)
456    if [[ "x$EMULATED_PPC" = "xno" ]]; then
457 <    EXTRASYSSRCS="Darwin/paranoia.cpp Linux/asm_linux.S"
457 >    EXTRASYSSRCS="Darwin/paranoia.cpp ppc_asm.S"
458    fi
459    if [[ "x$ac_cv_framework_IOKit" = "xyes" ]]; then
460      EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp"
461    fi
462 +  if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
463 +    EXTFSSRC=../MacOSX/extfs_macosx.mm
464 +  fi
465 +  ;;
466 + cygwin*)
467 +  SERIALSRC="../dummy/serial_dummy.cpp"
468    ;;
469   esac
470  
# Line 338 | Line 473 | if [[ "x$WANT_SDL" = "xyes" ]]; then
473    AC_DEFINE(USE_SDL, 1, [Define to enble SDL support.])
474   fi
475   if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
341  VIDEOSRCS="../SDL/video_sdl.cpp"
476    AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support.])
477 +  VIDEOSRCS="../SDL/video_sdl.cpp"
478    KEYCODES="../SDL/keycodes"
479    if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
480      EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/clip_macosx.cpp"
481    else
482 <    EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp"
482 >    case "$target_os" in
483 >    cygwin*)
484 >      EXTRASYSSRCS="$EXTRASYSSRCS ../Windows/clip_windows.cpp"
485 >      ;;
486 >    *)
487 >      EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp"
488 >      ;;
489 >    esac
490    fi
491   else
492    VIDEOSRCS="video_x.cpp"
493    KEYCODES="keycodes"
494    EXTRASYSSRCS="$EXTRASYSSRCS clip_unix.cpp"
495   fi
496 + if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; then
497 +  AC_DEFINE(USE_SDL_AUDIO, 1, [Define to enable SDL audio support])
498 +  AUDIOSRC="../SDL/audio_sdl.cpp"
499 + fi
500  
501 < SYSSRCS="$VIDEOSRCS $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
501 > SYSSRCS="$VIDEOSRCS $EXTFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS"
502  
503   dnl Define a macro that translates a yesno-variable into a C macro definition
504   dnl to be put into the config.h file
# Line 656 | Line 802 | fi
802   AC_TRANSLATE_DEFINE(HAVE_MACH_EXCEPTIONS, "$ac_cv_have_mach_exceptions",
803    [Define if your system supports Mach exceptions.])
804  
805 + dnl Check if Windows exceptions are supported.
806 + AC_CACHE_CHECK([whether your system supports Windows exceptions],
807 +  ac_cv_have_win32_exceptions, [
808 +  AC_LANG_SAVE
809 +  AC_LANG_CPLUSPLUS
810 +  AC_TRY_RUN([
811 +    #define HAVE_WIN32_EXCEPTIONS 1
812 +    #define CONFIGURE_TEST_SIGSEGV_RECOVERY
813 +    #include "vm_alloc.cpp"
814 +    #include "sigsegv.cpp"
815 +  ], [
816 +  sigsegv_recovery=win32
817 +  ac_cv_have_win32_exceptions=yes
818 +  ],
819 +  ac_cv_have_win32_exceptions=no,
820 +  dnl When cross-compiling, do not assume anything.
821 +  ac_cv_have_win32_exceptions=no
822 +  )
823 +  AC_LANG_RESTORE
824 +  ]
825 + )
826 + AC_TRANSLATE_DEFINE(HAVE_WIN32_EXCEPTIONS, "$ac_cv_have_win32_exceptions",
827 +  [Define if your system supports Windows exceptions.])
828 +
829   dnl Otherwise, check if extended signals are supported.
830   if [[ -z "$sigsegv_recovery" ]]; then
831    AC_CACHE_CHECK([whether your system supports extended signal handlers],
# Line 742 | Line 912 | else
912      WANT_VOSF=no
913   fi
914  
915 + dnl Check addressing mode to use
916 + AC_MSG_CHECKING([for addressing mode to use])
917 + case "$os_target" in
918 + cygwin*)
919 +  WANT_ADDRESSING_MODE="direct,cygwin-hack"
920 +  NATMEM_OFFSET=
921 +  ;;
922 + esac
923 + if [[ "$EMULATED_PPC" != "yes" ]]; then
924 +  if [[ "$WANT_ADDRESSING_MODE" != "real" ]]; then
925 +    AC_MSG_WARN([Running in native PowerPC mode, force use of Real Addressing.])
926 +    WANT_ADDRESSING_MODE="real"
927 +  fi
928 + fi
929 + if [[ "$WANT_ADDRESSING_MODE" = "direct" ]]; then
930 +  if [[ -n "$NATMEM_OFFSET" ]]; then
931 +    NATMEM_OFFSET_DEF="-DNATMEM_OFFSET=$NATMEM_OFFSET"
932 +  fi
933 +  AC_LANG_SAVE
934 +  AC_LANG_CPLUSPLUS
935 +  cat confdefs.h > conftest.$ac_ext
936 +  cat >> conftest.$ac_ext << EOF
937 + #include <stdio.h>
938 + #include <string.h>
939 + #include "vm_alloc.cpp"
940 +
941 + int main(void)
942 + {
943 +        if (vm_init() < 0)
944 +                return 1;
945 +
946 +        static const struct {
947 +                unsigned long base;
948 +                unsigned int size;
949 +        } ranges[[]] = {
950 +                { 0x00000000, 0x0003000 },
951 +                { 0x10000000, 0x2000000 },
952 +                { 0x40800000, 0x0400000 },
953 +                { 0x68070000, 0x0010000 },
954 +                { 0x69000000, 0x0080000 },
955 +                { 0x68ffe000, 0x0002000 },
956 +                { 0x5fffe000, 0x0002000 },
957 +                { 0x60000000, 0x0040000 },
958 +        };
959 +        const int n_ranges = sizeof(ranges)/ sizeof(ranges[[0]]);
960 +
961 + #ifdef NATMEM_OFFSET
962 +        unsigned long ofs = NATMEM_OFFSET;
963 + #else
964 +        for (unsigned long ofs = 0x10000000; ofs <= 0x90000000; ofs += 0x10000000)
965 + #endif
966 +        for (int i = 0; i < n_ranges; i++) {
967 +                char *m = (char *)(ranges[[i]].base + ofs);
968 +                if (vm_acquire_fixed(m, ranges[[i]].size) != 0)
969 +                        break;
970 +                memset(m, 0, ranges[[i]].size);
971 +                vm_release(m, ranges[[i]].size);
972 +                if (i == n_ranges - 1) {
973 +                        if (sizeof(void *) == 8 && ofs > 0xffffffff)
974 +                                printf("0x%lxul\n", ofs);
975 +                        else
976 +                                printf("0x%08x\n", ofs);
977 +                        return 0;
978 +                }
979 +        }
980 +
981 +        vm_exit();
982 +        return 1;
983 + }
984 + EOF
985 +  doit='$CXX conftest.$ac_ext -o conftest.$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS $LIBS $NATMEM_OFFSET_DEF >& AS_MESSAGE_LOG_FD'
986 +  if AC_TRY_EVAL(doit); then
987 +    NATMEM_OFFSET=`./conftest.$ac_exeext`
988 +  else
989 +    NATMEM_OFFSET=
990 +  fi
991 +  rm -f conftest*
992 +  AC_LANG_RESTORE
993 +
994 +  if [[ -z "$NATMEM_OFFSET" ]]; then
995 +    AC_MSG_ERROR([could not determine a sensible NATMEM_OFFSET value])
996 +  else
997 +    WANT_ADDRESSING_MODE="direct,$NATMEM_OFFSET"
998 +    AC_DEFINE_UNQUOTED(NATMEM_OFFSET, $NATMEM_OFFSET,
999 +      [Define constant offset for Mac address translation])
1000 +  fi
1001 + fi
1002 + AC_MSG_RESULT($WANT_ADDRESSING_MODE)
1003 +
1004 + dnl Utility macro used by next two tests.
1005 + dnl AC_EXAMINE_OBJECT(C source code,
1006 + dnl     commands examining object file,
1007 + dnl     [commands to run if compile failed]):
1008 + dnl
1009 + dnl Compile the source code to an object file; then convert it into a
1010 + dnl printable representation.  All unprintable characters and
1011 + dnl asterisks (*) are replaced by dots (.).  All white space is
1012 + dnl deleted.  Newlines (ASCII 0x10) in the input are preserved in the
1013 + dnl output, but runs of newlines are compressed to a single newline.
1014 + dnl Finally, line breaks are forcibly inserted so that no line is
1015 + dnl longer than 80 columns and the file ends with a newline.  The
1016 + dnl result of all this processing is in the file conftest.dmp, which
1017 + dnl may be examined by the commands in the second argument.
1018 + dnl
1019 + AC_DEFUN([gcc_AC_EXAMINE_OBJECT],
1020 + [AC_LANG_SAVE
1021 + AC_LANG_C
1022 + dnl Next bit cribbed from AC_TRY_COMPILE.
1023 + cat > conftest.$ac_ext <<EOF
1024 + [#line __oline__ "configure"
1025 + #include "confdefs.h"
1026 + $1
1027 + ]EOF
1028 + if AC_TRY_EVAL(ac_compile); then
1029 +  od -c conftest.o |
1030 +    sed ['s/^[0-7]*[    ]*/ /
1031 +          s/\*/./g
1032 +          s/ \\n/*/g
1033 +          s/ [0-9][0-9][0-9]/./g
1034 +          s/  \\[^ ]/./g'] |
1035 +    tr -d '
1036 + ' | tr -s '*' '
1037 + ' | fold | sed '$a\
1038 + ' > conftest.dmp
1039 +  $2
1040 + ifelse($3, , , else
1041 +  $3
1042 + )dnl
1043 + fi
1044 + rm -rf conftest*
1045 + AC_LANG_RESTORE])
1046 +
1047 + dnl Floating point format probe.
1048 + dnl The basic concept is the same as the above: grep the object
1049 + dnl file for an interesting string.  We have to watch out for
1050 + dnl rounding changing the values in the object, however; this is
1051 + dnl handled by ignoring the least significant byte of the float.
1052 + dnl
1053 + dnl Does not know about VAX G-float or C4x idiosyncratic format.
1054 + dnl It does know about PDP-10 idiosyncratic format, but this is
1055 + dnl not presently supported by GCC.  S/390 "binary floating point"
1056 + dnl is in fact IEEE (but maybe we should have that in EBCDIC as well
1057 + dnl as ASCII?)
1058 + dnl
1059 + AC_DEFUN([gcc_AC_C_FLOAT_FORMAT],
1060 + [AC_CACHE_CHECK(floating point format, ac_cv_c_float_format,
1061 + [gcc_AC_EXAMINE_OBJECT(
1062 + [/* This will not work unless sizeof(double) == 8.  */
1063 + extern char sizeof_double_must_be_8 [sizeof(double) == 8 ? 1 : -1];
1064 +
1065 + /* This structure must have no internal padding.  */
1066 + struct possibility {
1067 +  char prefix[8];
1068 +  double candidate;
1069 +  char postfix[8];
1070 + };
1071 +
1072 + #define C(cand) { "\nformat:", cand, ":tamrof\n" }
1073 + struct possibility table [] =
1074 + {
1075 +  C( 3.25724264705901305206e+01), /* @@IEEEFP - IEEE 754 */
1076 +  C( 3.53802595280598432000e+18), /* D__float - VAX */
1077 +  C( 5.32201830133125317057e-19), /* D.PDP-10 - PDP-10 - the dot is 0x13a */
1078 +  C( 1.77977764695171661377e+10), /* IBMHEXFP - s/390 format, ascii */
1079 +  C(-5.22995989424860458374e+10)  /* IBMHEXFP - s/390 format, EBCDIC */
1080 + };],
1081 + [if   grep 'format:.@IEEEF.:tamrof' conftest.dmp >/dev/null 2>&1; then
1082 +    ac_cv_c_float_format='IEEE (big-endian)'
1083 +  elif grep 'format:.I@@PFE.:tamrof' conftest.dmp >/dev/null 2>&1; then
1084 +    ac_cv_c_float_format='IEEE (big-endian)'
1085 +  elif grep 'format:.FEEEI@.:tamrof' conftest.dmp >/dev/null 2>&1; then
1086 +    ac_cv_c_float_format='IEEE (little-endian)'
1087 +  elif grep 'format:.EFP@@I.:tamrof' conftest.dmp >/dev/null 2>&1; then
1088 +    ac_cv_c_float_format='IEEE (little-endian)'
1089 +  elif grep 'format:.__floa.:tamrof' conftest.dmp >/dev/null 2>&1; then
1090 +    ac_cv_c_float_format='VAX D-float'
1091 +  elif grep 'format:..PDP-1.:tamrof' conftest.dmp >/dev/null 2>&1; then
1092 +    ac_cv_c_float_format='PDP-10'
1093 +  elif grep 'format:.BMHEXF.:tamrof' conftest.dmp >/dev/null 2>&1; then
1094 +    ac_cv_c_float_format='IBM 370 hex'
1095 +  else
1096 +    AC_MSG_ERROR(Unknown floating point format)
1097 +  fi],
1098 +  [AC_MSG_ERROR(compile failed)])
1099 + ])
1100 + # IEEE is the default format.  If the float endianness isn't the same
1101 + # as the integer endianness, we have to set FLOAT_WORDS_BIG_ENDIAN
1102 + # (which is a tristate: yes, no, default).  This is only an issue with
1103 + # IEEE; the other formats are only supported by a few machines each,
1104 + # all with the same endianness.
1105 + format=IEEE_FLOAT_FORMAT
1106 + fbigend=
1107 + case $ac_cv_c_float_format in
1108 +    'IEEE (big-endian)' )
1109 +        if test $ac_cv_c_bigendian = no; then
1110 +            fbigend=1
1111 +        fi
1112 +        ;;
1113 +    'IEEE (little-endian)' )
1114 +        if test $ac_cv_c_bigendian = yes; then
1115 +            fbigend=0
1116 +        fi
1117 +        ;;
1118 +    'VAX D-float' )
1119 +        format=VAX_FLOAT_FORMAT
1120 +        ;;
1121 +    'PDP-10' )
1122 +        format=PDP10_FLOAT_FORMAT
1123 +        ;;
1124 +    'IBM 370 hex' )
1125 +        format=IBM_FLOAT_FORMAT
1126 +        ;;
1127 + esac
1128 + AC_DEFINE_UNQUOTED(HOST_FLOAT_FORMAT, $format,
1129 +  [Define to the floating point format of the host machine.])
1130 + if test -n "$fbigend"; then
1131 +        AC_DEFINE_UNQUOTED(HOST_FLOAT_WORDS_BIG_ENDIAN, $fbigend,
1132 +  [Define to 1 if the host machine stores floating point numbers in
1133 +   memory with the word containing the sign bit at the lowest address,
1134 +   or to 0 if it does it the other way around.
1135 +
1136 +   This macro should not be defined if the ordering is the same as for
1137 +   multi-word integers.])
1138 + fi
1139 + ])
1140 +
1141 + dnl Check for host float format
1142 + gcc_AC_C_FLOAT_FORMAT
1143 +
1144   dnl Platform specific binary postprocessor
1145   AC_PATH_PROG(BLESS, "true")
1146   if [[ "x$ac_cv_pagezero_hack" = "xyes" ]]; then
# Line 775 | Line 1174 | if $CXX -V -v 2>&1 | grep -q "Intel(R) C
1174   fi
1175   AC_MSG_RESULT($HAVE_ICC)
1176  
1177 < # Test if the compiler can generate ELF objects
1178 < AC_CACHE_CHECK([whether the compiler can generate ELF objects],
1179 <  ac_cv_elf_objects, [
1177 > dnl Determine the generated object format
1178 > AC_CACHE_CHECK([the format of compiler generated objects],
1179 >  ac_cv_object_format, [
1180    echo 'int i;' > conftest.$ac_ext
1181 <  ac_cv_elf_objects=no
1181 >  ac_cv_object_format=no
1182    if AC_TRY_EVAL(ac_compile); then
1183      case `/usr/bin/file conftest.$ac_objext` in
1184      *"ELF"*)
1185 <      ac_cv_elf_objects=yes
1185 >      ac_cv_object_format=elf
1186 >      ;;
1187 >    *"Mach-O"*)
1188 >      ac_cv_object_format=mach
1189 >      ;;
1190 >    *)
1191 >      ac_cv_object_format=unknown
1192        ;;
1193      esac
1194    fi
1195    rm -rf conftest*
1196   ])
792 ELF_OBJECTS=$ac_cv_elf_objects
1197  
1198   dnl CPU emulator sources
1199   if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1200    CPUSRCS="\
1201 +    ../kpx_cpu/src/mathlib/ieeefp.cpp \
1202 +    ../kpx_cpu/src/mathlib/mathlib.cpp \
1203      ../kpx_cpu/src/cpu/ppc/ppc-cpu.cpp \
1204      ../kpx_cpu/src/cpu/ppc/ppc-decode.cpp \
1205      ../kpx_cpu/src/cpu/ppc/ppc-execute.cpp \
# Line 804 | Line 1210 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1210    if [[ "x$WANT_JIT" = "xyes" ]]; then
1211      AC_CACHE_CHECK([whether dyngen can be used],
1212        ac_cv_use_dyngen, [
1213 <      case $host_cpu:$ELF_OBJECTS in
1214 <      powerpc:yes)
1213 >      case $host_cpu:$ac_cv_object_format in
1214 >      powerpc:elf)
1215 >        ac_cv_use_dyngen=yes
1216 >        ;;
1217 >      x86_64:elf)
1218          ac_cv_use_dyngen=yes
1219          ;;
1220 <      x86_64:yes)
1220 >      i?86:elf)
1221          ac_cv_use_dyngen=yes
1222          ;;
1223 <      i?86:yes)
1223 >      powerpc:mach)
1224          ac_cv_use_dyngen=yes
1225          ;;
1226        *:*)
# Line 831 | Line 1240 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1240            done
1241          fi
1242        fi
1243 <      if [[ -z "$DYNGEN_CC" ]] || ! { echo '#include <limits>' | $DYNGEN_CC -xc++ -c -o /dev/null - >& /dev/null; }; then
1243 >      if [[ -z "$DYNGEN_CC" ]]; then
1244          ac_cv_use_dyngen=no
1245        fi
1246      ])
# Line 839 | Line 1248 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1248        case $host_cpu in
1249        i?86)
1250          DYNGEN_OP_FLAGS="-fomit-frame-pointer -mpreferred-stack-boundary=2"
842        if [[ "x$HAVE_GCC30" = "xyes" ]]; then
843          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -falign-functions=0"
844        else
845          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
846        fi
847        saved_CPPFLAGS=$CPPFLAGS
848        CPPFLAGS="$CPPFLAGS -mmmx"
849        AC_CHECK_HEADERS(mmintrin.h,  [DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -mmmx"])
850        CPPFLAGS="$CPPFLAGS -msse"
851        AC_CHECK_HEADERS(xmmintrin.h, [DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -msse"])
852        CPPFLAGS="$CPPFLAGS -msse2"
853        AC_CHECK_HEADERS(emmintrin.h, [DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -msse2"])
854        CPPFLAGS=$saved_CPPFLAGS
1251          ;;
1252 <      x86_64)
1253 <        AC_CHECK_HEADERS(mmintrin.h xmmintrin.h emmintrin.h)
1252 >      powerpc)
1253 >        if [[ "x$ac_cv_object_format" = "xmach" ]]; then
1254 >          DYNGEN_OP_FLAGS="-mdynamic-no-pic"
1255 >        fi
1256          ;;
1257        esac
1258 <      DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-limit=10000"
1258 >      if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1259 >        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -falign-functions=0"
1260 >      else
1261 >        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
1262 >      fi
1263 >      DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-limit=10000 -fno-exceptions -g0"
1264        if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1265          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -fno-reorder-blocks -fno-optimize-sibling-calls"
1266        fi
# Line 883 | Line 1286 | if [[ "x$ac_cv_use_dyngen" = "xyes" ]];
1286    AC_CACHE_CHECK([whether static data regions are executable],
1287      ac_cv_have_static_data_exec, [
1288      AC_TRY_RUN([int main(void) {
1289 < #if defined(__powerpc__)
1289 > #if defined(__powerpc__) || defined(__ppc__)
1290        static unsigned int p[8] = {0x4e800020,};
1291        asm volatile("dcbst 0,%0" : : "r" (p) : "memory");
1292        asm volatile("sync" : : : "memory");
# Line 899 | Line 1302 | if [[ "x$ac_cv_use_dyngen" = "xyes" ]];
1302      ac_cv_have_static_data_exec=no
1303      )
1304    ])
1305 + else
1306 +  ac_cv_use_dyngen=no
1307   fi
1308   AC_TRANSLATE_DEFINE(HAVE_STATIC_DATA_EXEC, "$ac_cv_have_static_data_exec",
1309    [Define if your system marks static data pages as executable.])
# Line 908 | Line 1313 | if [[ "x$WANT_JIT" = "xyes" ]]; then
1313   fi
1314  
1315   dnl Generate Makefile.
1316 + AC_SUBST(PERL)
1317 + AC_SUBST(USE_DYNGEN, [$ac_cv_use_dyngen])
1318   AC_SUBST(DYNGENSRCS)
1319   AC_SUBST(DYNGEN_CC)
1320   AC_SUBST(DYNGEN_OP_FLAGS)
# Line 915 | Line 1322 | AC_SUBST(SYSSRCS)
1322   AC_SUBST(CPUSRCS)
1323   AC_SUBST(BLESS)
1324   AC_SUBST(KEYCODES)
1325 < AC_OUTPUT(Makefile)
1325 > AC_OUTPUT([
1326 > Makefile
1327 > ../MacOSX/Info.plist
1328 > ])
1329  
1330   dnl Print summary.
1331   echo
1332   echo SheepShaver configuration summary:
1333   echo
1334   echo SDL support ...................... : $SDL_SUPPORT
1335 + echo FBDev DGA support ................ : $WANT_FBDEV_DGA
1336   echo XFree86 DGA support .............. : $WANT_XF86_DGA
1337   echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE
1338   echo Using PowerPC emulator ........... : $EMULATED_PPC
# Line 930 | Line 1341 | echo Enable video on SEGV signals .....
1341   echo ESD sound support ................ : $WANT_ESD
1342   echo GTK user interface ............... : $WANT_GTK
1343   echo mon debugger support ............. : $WANT_MON
1344 + echo Addressing mode .................. : $WANT_ADDRESSING_MODE
1345   echo Bad memory access recovery type .. : $sigsegv_recovery
1346   echo
1347   echo "Configuration done. Now type \"make\"."

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines