X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fbsd-os.c;h=f41911df71b82b1e9eb266f8d33020dd94d5f645;hb=e4542bc034db18cf98f005b2dac53a6d7d5c7260;hp=63b28ef652453f239fa6a7f794ebe617aad3b179;hpb=5e1fcdac979db9a6aebe69531229355def8c0f90;p=sbcl.git

diff --git a/src/runtime/bsd-os.c b/src/runtime/bsd-os.c
index 63b28ef..f41911d 100644
--- a/src/runtime/bsd-os.c
+++ b/src/runtime/bsd-os.c
@@ -32,6 +32,9 @@
 #include "interr.h"
 #include "lispregs.h"
 #include "thread.h"
+#include "runtime.h"
+#include "genesis/static-symbols.h"
+#include "genesis/fdefn.h"
 
 #include <sys/types.h>
 #include <signal.h>
@@ -47,8 +50,9 @@ os_vm_size_t os_vm_page_size;
 
 static void netbsd_init();
 #endif /* __NetBSD__ */
- 
-void os_init(void)
+
+void
+os_init(char *argv[], char *envp[])
 {
     os_vm_page_size = getpagesize();
 
@@ -93,13 +97,13 @@ os_validate(os_vm_address_t addr, os_vm_size_t len)
     int flags = MAP_PRIVATE | MAP_ANON;
 
     if (addr)
-	flags |= MAP_FIXED;
+        flags |= MAP_FIXED;
 
     addr = mmap(addr, len, OS_VM_PROT_ALL, flags, -1, 0);
 
     if (addr == MAP_FAILED) {
-	perror("mmap");
-	return NULL;
+        perror("mmap");
+        return NULL;
     }
 
     return addr;
@@ -109,20 +113,20 @@ void
 os_invalidate(os_vm_address_t addr, os_vm_size_t len)
 {
     if (munmap(addr, len) == -1)
-	perror("munmap");
+        perror("munmap");
 }
 
 os_vm_address_t
 os_map(int fd, int offset, os_vm_address_t addr, os_vm_size_t len)
 {
     addr = mmap(addr, len,
-		OS_VM_PROT_ALL,
-		MAP_PRIVATE | MAP_FILE | MAP_FIXED,
-		fd, (off_t) offset);
+                OS_VM_PROT_ALL,
+                MAP_PRIVATE | MAP_FILE | MAP_FIXED,
+                fd, (off_t) offset);
 
     if (addr == MAP_FAILED) {
-	perror("mmap");
-	lose("unexpected mmap(..) failure");
+        perror("mmap");
+        lose("unexpected mmap(..) failure");
     }
 
     return addr;
@@ -132,7 +136,7 @@ void
 os_protect(os_vm_address_t address, os_vm_size_t length, os_vm_prot_t prot)
 {
     if (mprotect(address, length, prot) == -1) {
-	perror("mprotect");
+        perror("mprotect");
     }
 }
 
@@ -152,12 +156,12 @@ is_valid_lisp_addr(os_vm_address_t addr)
     if(in_range_p(addr, READ_ONLY_SPACE_START, READ_ONLY_SPACE_SIZE) ||
        in_range_p(addr, STATIC_SPACE_START   , STATIC_SPACE_SIZE) ||
        in_range_p(addr, DYNAMIC_SPACE_START  , DYNAMIC_SPACE_SIZE))
-	return 1;
+        return 1;
     for_each_thread(th) {
-	if((th->control_stack_start <= addr) && (addr < th->control_stack_end))
-	    return 1;
-	if(in_range_p(addr, th->binding_stack_start, BINDING_STACK_SIZE))
-	    return 1;
+        if((th->control_stack_start <= addr) && (addr < th->control_stack_end))
+            return 1;
+        if(in_range_p(addr, th->binding_stack_start, BINDING_STACK_SIZE))
+            return 1;
     }
     return 0;
 }
@@ -186,18 +190,20 @@ memory_fault_handler(int signal, siginfo_t *siginfo, void *void_context)
 #endif
 
     os_context_t *context = arch_os_get_context(&void_context);
-    if (!gencgc_handle_wp_violation(fault_addr)) 
+    if (!gencgc_handle_wp_violation(fault_addr))
         if(!handle_guard_page_triggered(context,fault_addr))
-	    /* FIXME is this context or void_context?  not that it */
-	    /* makes a difference currently except on linux/sparc */
-	    interrupt_handle_now(signal, siginfo, void_context);
+#ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK
+            arrange_return_to_lisp_function(context, SymbolFunction(MEMORY_FAULT_ERROR));
+#else
+            interrupt_handle_now(signal, siginfo, context);
+#endif
 }
 void
 os_install_interrupt_handlers(void)
 {
     SHOW("os_install_interrupt_handlers()/bsd-os/defined(GENCGC)");
     undoably_install_low_level_interrupt_handler(SIG_MEMORY_FAULT,
-						 memory_fault_handler);
+                                                 memory_fault_handler);
     SHOW("leaving os_install_interrupt_handlers()");
 }
 
@@ -209,13 +215,13 @@ sigsegv_handler(int signal, siginfo_t *info, void* void_context)
     os_context_t *context = arch_os_get_context(&void_context);
     unsigned int pc =  (unsigned int *)(*os_context_pc_addr(context));
     os_vm_address_t addr;
-    
+
     addr = arch_get_bad_addr(signal,info,context);
     if(!interrupt_maybe_gc(signal, info, context))
-	if(!handle_guard_page_triggered(context,addr))
-	    interrupt_handle_now(signal, info, context);
+        if(!handle_guard_page_triggered(context,addr))
+            interrupt_handle_now(signal, info, context);
     /* Work around G5 bug; fix courtesy gbyers */
-    sigreturn(void_context);
+    DARWIN_FIX_CONTEXT(context);
 }
 
 void
@@ -223,7 +229,7 @@ os_install_interrupt_handlers(void)
 {
     SHOW("os_install_interrupt_handlers()/bsd-os/!defined(GENCGC)");
     undoably_install_low_level_interrupt_handler(SIG_MEMORY_FAULT,
-						 sigsegv_handler);
+                                                 sigsegv_handler);
 }
 
 #endif /* defined GENCGC */
@@ -244,10 +250,10 @@ static void netbsd_init()
 
     /* If we're older than 2.0... */
     if (osrev < 200000000) {
-	fprintf(stderr, "osrev = %d (needed at least 200000000).\n", osrev);
-	lose("NetBSD kernel too old to run sbcl.\n");
+        fprintf(stderr, "osrev = %d (needed at least 200000000).\n", osrev);
+        lose("NetBSD kernel too old to run sbcl.\n");
     }
-    
+
     /* NetBSD counts mmap()ed space against the process's data size limit,
      * so yank it up. This might be a nasty thing to do? */
     getrlimit (RLIMIT_DATA, &rl);
@@ -257,11 +263,11 @@ static void netbsd_init()
        -- CSR, 2004-04-08 */
     rl.rlim_cur = 1073741824;
     if (setrlimit (RLIMIT_DATA, &rl) < 0) {
-	fprintf (stderr, 
-		 "RUNTIME WARNING: unable to raise process data size limit:\n\
+        fprintf (stderr,
+                 "RUNTIME WARNING: unable to raise process data size limit:\n\
   %s.\n\
 The system may fail to start.\n",
-		 strerror(errno));
+                 strerror(errno));
     }
 }
 #endif /* __NetBSD__ */