X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fsunos-os.c;h=fdf5a086d9ea3cf924d11a359b78acd48b5d7986;hb=449088454569070e400f9f562c247bdc17cf60b5;hp=d6d3215a7246bdc55d5666f3fa3830629db83790;hpb=cd3ba8630e52f6131f7bc9931bc2fe77c77fe1a9;p=sbcl.git

diff --git a/src/runtime/sunos-os.c b/src/runtime/sunos-os.c
index d6d3215..fdf5a08 100644
--- a/src/runtime/sunos-os.c
+++ b/src/runtime/sunos-os.c
@@ -8,13 +8,13 @@
 #include <sys/param.h>
 #include <sys/utsname.h>
 
+#include "sbcl.h"
 #include "os.h"
 #include "arch.h"
 #include "interr.h"
 #include "interrupt.h"
 #include "globals.h"
 #include "validate.h"
-#include "sbcl.h"
 #include "target-arch-os.h"
 
 #define OS_VM_DEFAULT_PAGESIZE 8192
@@ -30,8 +30,13 @@ static os_vm_size_t real_page_size_difference=0;
    running on 5.8 to use MAP_ANON, but because of C's lack of
    introspection at runtime, we can't grab the right value because
    it's stuffed in a header file somewhere. We can, however, hardcode
-   it, and test at runtime for whether to use it... -- CSR, 2002-05-06 */
+   it, and test at runtime for whether to use it... -- CSR, 2002-05-06 
+
+   And, in fact, it sucks slightly more, as if you don't use MAP_ANON
+   you need to have /dev/zero open and pass the file descriptor to
+   mmap().  So overall, this counts as a KLUDGE. -- CSR, 2002-05-20 */
 int KLUDGE_MAYBE_MAP_ANON = 0x0;
+int kludge_mmap_fd = -1; /* default for MAP_ANON */
 
 void os_init(void)
 {
@@ -45,11 +50,19 @@ void os_init(void)
 	lose("sunos major version=%d (which isn't 5!)", major_version);
     }
     minor_version = atoi(name.release+2);
-    if (minor_version == 8) {
+    if ((minor_version == 8) || 
+	(minor_version == 9) || 
+	(minor_version == 10)) {
 	KLUDGE_MAYBE_MAP_ANON = 0x100;
-    }
-    if (minor_version > 8) {
-	FSHOW((stderr, "os_init: Solaris version greater than 8?\nUnknown MAP_ANON behaviour.\n"));
+    } else if (minor_version > 10) {
+	FSHOW((stderr, "os_init: Solaris version greater than 9?\nUnknown MAP_ANON behaviour.\n"));
+	lose("Unknown mmap() interaction with MAP_ANON");
+    } else { /* minor_version < 8 */
+	kludge_mmap_fd = open("/dev/zero",O_RDONLY);
+	if (kludge_mmap_fd < 0) {
+	    perror("open");
+	    lose("Error in open(..)");
+	}
     }
 
     /* I do not understand this at all. FIXME. */
@@ -76,14 +89,14 @@ void os_init(void)
 os_vm_address_t os_validate(os_vm_address_t addr, os_vm_size_t len)
 {
     int flags = MAP_PRIVATE | MAP_NORESERVE | KLUDGE_MAYBE_MAP_ANON;
-    
     if (addr) 
 	flags |= MAP_FIXED;
-    
+
     addr = mmap(addr, len, 
 		OS_VM_PROT_ALL, 
 		flags, 
-		-1, 0);
+		kludge_mmap_fd, 0);
+
     if (addr == MAP_FAILED) {
 	perror("mmap");
 	lose ("Error in mmap(..)");
@@ -139,21 +152,28 @@ boolean is_valid_lisp_addr(os_vm_address_t addr)
        
        Just assume address is valid if it lies within one of the known
        spaces.  (Unlike sunos-os which keeps track of every valid page.) */
-    return (   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_0_SPACE_START, DYNAMIC_SPACE_SIZE  )
-	       || in_range_p(addr, DYNAMIC_1_SPACE_START, DYNAMIC_SPACE_SIZE  )
-	       || in_range_p(addr, CONTROL_STACK_START  , CONTROL_STACK_SIZE  )
-	       || in_range_p(addr, BINDING_STACK_START  , BINDING_STACK_SIZE  ));
+    
+    /* FIXME: this looks like a valid definition for all targets with
+       cheney-gc; it may not be impressively smart (witness the
+       comment above) but maybe associating these functions with the
+       GC rather than the OS would be a maintainability win.  -- CSR,
+       2003-04-04 */
+    struct thread *th;
+    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_0_SPACE_START, DYNAMIC_SPACE_SIZE) ||
+       in_range_p(addr, DYNAMIC_1_SPACE_START, DYNAMIC_SPACE_SIZE))
+	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;
+    }
+    return 0;
 }
-
 
 
-#if defined GENCGC
-
-#error "GENCGC is not yet supported (presumably on x86 solaris?)"
-
-#else
 
 static void
 sigsegv_handler(int signal, siginfo_t *info, void* void_context)
@@ -162,17 +182,15 @@ sigsegv_handler(int signal, siginfo_t *info, void* void_context)
     os_vm_address_t addr;
 
     addr = arch_get_bad_addr(signal, info, context);
-	/* There's some complicated recovery code in linux-os.c here
-	   that I'm currently too confused to understand. Fixme. */
     if(!interrupt_maybe_gc(signal, info, context)) {
-	interrupt_handle_now(signal, info, context);
+	if(!handle_guard_page_triggered(context,addr))
+	    interrupt_handle_now(signal, info, context);
     }
 }
 
-#endif
-
 void
 os_install_interrupt_handlers()
 {
-    undoably_install_low_level_interrupt_handler(SIGSEGV,sigsegv_handler);
+    undoably_install_low_level_interrupt_handler(SIG_MEMORY_FAULT,
+						 sigsegv_handler);
 }