Handle dummy files. Merge in configure stuff for Mach exception filters.

Check whether struct sigaction defines sa_restorer member. Don't include
posix_sem.cpp on native Linux/ppc builds.

SheepShaver/src/Unix/Makefile.in

@@ -23,6 +23,7 @@ SYSSRCS = @SYSSRCS@
 CPUSRCS = @CPUSRCS@
 DYNGENSRCS = @DYNGENSRCS@
 DYNGEN_OP_FLAGS = @DYNGEN_OP_FLAGS@
+BLESS = @BLESS@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
 INSTALL_DATA = @INSTALL_DATA@
@@ -32,9 +33,8 @@ SRCS = main_unix.cpp ../prefs.cpp ../prefs_items.cpp prefs_unix.cpp sys_unix.cpp
     ../rom_patches.cpp ../rsrc_patches.cpp ../emul_op.cpp ../name_registry.cpp \
     ../macos_util.cpp ../timer.cpp timer_unix.cpp ../xpram.cpp xpram_unix.cpp \
     ../adb.cpp clip_unix.cpp ../sony.cpp ../disk.cpp ../cdrom.cpp ../scsi.cpp \
-    Linux/scsi_linux.cpp ../video.cpp video_blit.cpp video_x.cpp \
+    ../video.cpp video_blit.cpp video_x.cpp ../audio.cpp ../ether.cpp ../thunks.cpp \
-    ../audio.cpp audio_oss_esd.cpp ../ether.cpp ../thunks.cpp \
+    ../serial.cpp ../extfs.cpp extfs_unix.cpp \
-    Linux/ether_linux.cpp ../serial.cpp serial_unix.cpp ../extfs.cpp extfs_unix.cpp \
     about_window_unix.cpp ../user_strings.cpp user_strings_unix.cpp \
     vm_alloc.cpp sigsegv.cpp \
     sshpty.c strlcpy.c $(SYSSRCS) $(CPUSRCS)
@@ -69,6 +69,7 @@ VPATH += $(addprefix :, $(subst  ,:, $(filter-out $($(subst, :, ,$(VPATH))), $(S
 
 $(APP): $(OBJ_DIR) $(OBJS)
 	$(CXX) -o $(APP) $(LDFLAGS) $(OBJS) $(LIBS)
+	$(BLESS) $(APP)
 
 modules:
 	cd NetDriver; make

SheepShaver/src/Unix/acconfig.h

@@ -35,6 +35,9 @@
 /* Define is using PowerPC emulator. */
 #undef EMULATED_PPC
 
+/* Define if struct sigaction defines sa_restorer. */
+#undef HAVE_SIGNAL_SA_RESTORER
+
 
 /* Leave that blank line there!!  Autoheader needs it.
    If you're adding to this file, keep in mind:

SheepShaver/src/Unix/configure.in

@@ -34,6 +34,9 @@ AC_EGREP_CPP(yes,
 #ifdef __powerpc__
   yes
 #endif
+#ifdef __ppc__
+  yes
+#endif
 ], [AC_MSG_RESULT(yes); HAVE_PPC=yes], AC_MSG_RESULT(no))
 
 dnl We use native CPU if possible.
@@ -93,7 +96,12 @@ LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
 
 dnl We need pthreads on non-PowerPC systems. Try libpthread first, then libc_r (FreeBSD), then PTL.
 HAVE_PTHREADS=yes
-if [[ "x$EMULATED_PPC" = "xyes" ]]; then
+case $EMULATED_PPC:$target_os in
+no:linux*)
+  dnl We do have our own pthread_cancel() implementation
+  AC_DEFINE(HAVE_PTHREAD_CANCEL, 1, [Define if you have the pthread_cancel function.])
+  ;;
+*:*)
   AC_CHECK_LIB(pthread, pthread_create, , [
     AC_CHECK_LIB(c_r, pthread_create, , [
       AC_CHECK_LIB(PTL, pthread_create, , [
@@ -108,18 +116,15 @@ if [[ "x$EMULATED_PPC" = "xyes" ]]; then
   if [[ "x$HAVE_PTHREADS" = "xyes" ]]; then
     AC_DEFINE(HAVE_PTHREADS, 1, [Define if pthreads are available.])
   fi
-else
+  dnl If POSIX.4 semaphores are not available, we emulate them with pthread mutexes.
-  dnl We do have our own pthread_cancel() implementation
+  SEMSRC=
-  AC_DEFINE(HAVE_PTHREAD_CANCEL, 1, [Define if you have the pthread_cancel function.])
+  AC_CHECK_FUNCS(sem_init, , [
-fi
-
-dnl If POSIX.4 semaphores are not available, we emulate them with pthread mutexes.
-SEMSRC=
-AC_CHECK_FUNCS(sem_init, , [
   if test "x$HAVE_PTHREADS" = "xyes"; then
     SEMSRC=posix_sem.cpp
   fi
-])
+  ])
+  ;;
+esac
 
 dnl We use XFree86 DGA if possible.
 if [[ "x$WANT_XF86_DGA" = "xyes" ]]; then
@@ -144,7 +149,7 @@ if [[ "x$WANT_XF86_VIDMODE" = "xyes" ]]; then
 fi
 
 dnl We use GTK+ if possible.
-UISRCS=
+UISRCS=../dummy/prefs_editor_dummy.cpp
 if [[ "x$WANT_GTK" = "xyes" ]]; then
   AM_PATH_GTK(1.2.0, [
     AC_DEFINE(ENABLE_GTK)
@@ -196,24 +201,64 @@ AC_TYPE_SIGNAL
 AC_HEADER_TIME
 AC_STRUCT_TM
 
+dnl Check whether struct sigaction has sa_restorer member.
+AC_CACHE_CHECK([whether struct sigaction has sa_restorer],
+  ac_cv_signal_sa_restorer, [
+  AC_TRY_COMPILE([
+    #include <signal.h>
+  ], [struct sigaction sa; sa.sa_restorer = 0;],
+  ac_cv_signal_sa_restorer=yes, ac_cv_signal_sa_restorer=no,
+  dnl When cross-compiling, do not assume anything.
+  ac_cv_signal_sa_restorer=no
+  )
+])
+if [[ "x$ac_cv_signal_sa_restorer" = "xyes" ]]; then
+  AC_DEFINE(HAVE_SIGNAL_SA_RESTORER)
+fi
+
 dnl Checks for library functions.
 AC_CHECK_FUNCS(strdup cfmakeraw)
 AC_CHECK_FUNCS(nanosleep)
 AC_CHECK_FUNCS(sigaction signal)
 AC_CHECK_FUNCS(mmap mprotect munmap)
 AC_CHECK_FUNCS(vm_allocate vm_deallocate vm_protect)
+
+dnl Darwin seems to define mach_task_self() instead of task_self().
+AC_CHECK_FUNCS(mach_task_self task_self)
+
 dnl We need clock_gettime() for better performance but it may drag
 dnl libpthread in, which we don't want for native ppc mode
-if [[ "x$EMULATED_PPC" = "xyes" ]]; then
+case $EMULATED_PPC:$target_os in
+no:linux*)
+  ;;
+*:*)
   AC_SEARCH_LIBS(clock_gettime, [rt posix4])
   AC_CHECK_FUNCS(clock_gettime)
-fi
+  ;;
+esac
 
 dnl Select system-dependant sources.
-if [[ "x$EMULATED_PPC" = "xno" ]]; then
+SERIALSRC=serial_unix.cpp
-  SYSSRCS="Linux/paranoia.cpp Linux/sheepthreads.c Linux/asm_linux.S"
+ETHERSRC=../dummy/ether_dummy.cpp
-fi
+SCSISRC=../dummy/scsi_dummy.cpp
-SYSSRCS="$SYSSRCS $SEMSRCS $UISRCS $MONSRCS"
+AUDIOSRC=../dummy/audio_dummy.cpp
+EXTRASYSSRCS=
+case "$target_os" in
+linux*)
+  ETHERSRC=Linux/ether_linux.cpp
+  AUDIOSRC=audio_oss_esd.cpp
+  SCSISRC=Linux/scsi_linux.cpp
+  if [[ "x$EMULATED_PPC" = "xno" ]]; then
+    EXTRASYSSRCS="Linux/paranoia.cpp Linux/sheepthreads.c Linux/asm_linux.S"
+  fi
+  ;;
+darwin*)
+  if [[ "x$EMULATED_PPC" = "xno" ]]; then
+    EXTRASYSSRCS="Darwin/paranoia.cpp Linux/asm_linux.S"
+  fi
+  ;;
+esac
+SYSSRCS="$SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
 
 dnl Define a macro that translates a yesno-variable into a C macro definition
 dnl to be put into the config.h file
@@ -372,8 +417,21 @@ AC_TRANSLATE_DEFINE(HAVE_MMAP_VM, $have_mmap_vm,
 
 fi dnl HAVE_MMAP_VM
 
-dnl Check if we can mmap 0x2000 bytes from 0x0000
+dnl Check if we can modify the __PAGEZERO segment for use as Low Memory
-AC_CACHE_CHECK([whether we can map Low Memory area 0x0000-0x2000],
+AC_CACHE_CHECK([whether __PAGEZERO can be Low Memory area 0x0000-0x3000],
+  ac_cv_pagezero_hack, [
+  ac_cv_pagezero_hack=no 
+  if AC_TRY_COMMAND([Darwin/testlmem.sh 0x3000]); then
+    ac_cv_pagezero_hack=yes
+    dnl might as well skip the test for mmap-able low memory
+    ac_cv_can_map_lm=no
+  fi
+])
+AC_TRANSLATE_DEFINE(PAGEZERO_HACK, "$ac_cv_pagezero_hack",
+  [Define if the __PAGEZERO Mach-O Low Memory Globals hack works on this system.])
+
+dnl Check if we can mmap 0x3000 bytes from 0x0000
+AC_CACHE_CHECK([whether we can map Low Memory area 0x0000-0x3000],
   ac_cv_can_map_lm, [
   AC_LANG_SAVE
   AC_LANG_CPLUSPLUS
@@ -456,28 +514,58 @@ AC_CACHE_CHECK([whether sigaction handlers need to be reinstalled],
 AC_TRANSLATE_DEFINE(SIGACTION_NEED_REINSTALL, "$ac_cv_sigaction_need_reinstall",
   [Define if your system requires sigactions to be reinstalled.])
 
-dnl Check if extended signals are supported.
+dnl Check if Mach exceptions supported.
-AC_CACHE_CHECK([whether your system supports extended signal handlers],
+AC_CACHE_CHECK([whether your system supports Mach exceptions],
-  ac_cv_have_extended_signals, [
+  ac_cv_have_mach_exceptions, [
   AC_LANG_SAVE
   AC_LANG_CPLUSPLUS
   AC_TRY_RUN([
-    #define HAVE_SIGINFO_T 1
+    #define HAVE_MACH_EXCEPTIONS 1
     #define CONFIGURE_TEST_SIGSEGV_RECOVERY
     #include "vm_alloc.cpp"
     #include "sigsegv.cpp"
-  ], ac_cv_have_extended_signals=yes, ac_cv_have_extended_signals=no,
+  ], [
+  sigsegv_recovery=mach
+  ac_cv_have_mach_exceptions=yes
+  ],
+  ac_cv_have_mach_exceptions=no,
   dnl When cross-compiling, do not assume anything.
-  ac_cv_have_extended_signals=no
+  ac_cv_have_mach_exceptions=no
   )
   AC_LANG_RESTORE
   ]
 )
-AC_TRANSLATE_DEFINE(HAVE_SIGINFO_T, "$ac_cv_have_extended_signals",
+AC_TRANSLATE_DEFINE(HAVE_MACH_EXCEPTIONS, "$ac_cv_have_mach_exceptions",
-  [Define if your system support extended signals.])
+  [Define if your system supports Mach exceptions.])
+
+dnl Otherwise, check if extended signals are supported.
+if [[ -z "$sigsegv_recovery" ]]; then
+  AC_CACHE_CHECK([whether your system supports extended signal handlers],
+    ac_cv_have_extended_signals, [
+    AC_LANG_SAVE
+    AC_LANG_CPLUSPLUS
+    AC_TRY_RUN([
+      #define HAVE_SIGINFO_T 1
+      #define CONFIGURE_TEST_SIGSEGV_RECOVERY
+      #include "vm_alloc.cpp"
+      #include "sigsegv.cpp"
+    ], [
+    sigsegv_recovery=siginfo
+    ac_cv_have_extended_signals=yes
+    ],
+    ac_cv_have_extended_signals=no,
+    dnl When cross-compiling, do not assume anything.
+    ac_cv_have_extended_signals=no
+    )
+    AC_LANG_RESTORE
+    ]
+  )
+  AC_TRANSLATE_DEFINE(HAVE_SIGINFO_T, "$ac_cv_have_extended_signals",
+    [Define if your system support extended signals.])
+fi
 
 dnl Otherwise, check for subterfuges.
-if [[ "x$ac_cv_have_extended_signals" = "xno" ]]; then
+if [[ -z "$sigsegv_recovery" ]]; then
   AC_CACHE_CHECK([whether we then have a subterfuge for your system],
   ac_cv_have_sigcontext_hack, [
     AC_LANG_SAVE
@@ -487,7 +575,11 @@ if [[ "x$ac_cv_have_extended_signals" = "xno" ]]; then
       #define CONFIGURE_TEST_SIGSEGV_RECOVERY
       #include "vm_alloc.cpp"
       #include "sigsegv.cpp"
-    ], ac_cv_have_sigcontext_hack=yes, ac_cv_have_sigcontext_hack=no,
+    ], [
+    sigsegv_recovery=sigcontext
+    ac_cv_have_sigcontext_hack=yes
+    ],
+    ac_cv_have_sigcontext_hack=no,
     dnl When cross-compiling, do not assume anything.
     ac_cv_have_sigcontext_hack=no
     )
@@ -519,7 +611,7 @@ AC_TRANSLATE_DEFINE(HAVE_SIGSEGV_SKIP_INSTRUCTION, "$ac_cv_have_skip_instruction
 
 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
+if [[ -n "$sigsegv_recovery" ]]; then
   CAN_VOSF=yes
 fi
 
@@ -530,6 +622,13 @@ else
     WANT_VOSF=no
 fi
 
+dnl Platform specific binary postprocessor
+BLESS=/bin/true
+if [[ "x$ac_cv_pagezero_hack" = "xyes" ]]; then
+  BLESS=Darwin/lowmem
+  LDFLAGS="$LDFLAGS -pagezero_size 0x3000"
+fi
+
 dnl Check for GCC 2.7 or higher.
 HAVE_GCC27=no
 AC_MSG_CHECKING(for GCC 2.7 or higher)
@@ -658,6 +757,7 @@ AC_SUBST(DYNGENSRCS)
 AC_SUBST(DYNGEN_OP_FLAGS)
 AC_SUBST(SYSSRCS)
 AC_SUBST(CPUSRCS)
+AC_SUBST(BLESS)
 AC_OUTPUT(Makefile)
 
 dnl Print summary.
@@ -672,5 +772,6 @@ 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
+echo Bad memory access recovery type .. : $sigsegv_recovery
 echo
 echo "Configuration done. Now type \"make\"."