X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fsunos-os.c;h=e2f68e17b46cfb54f1d671b039a09edc53b1d0bd;hb=64eccd1724e5f1e638bfc574f7f376427ee3dcb1;hp=2501edd1359b41a852a63cf4cfc8289ea3c71629;hpb=79cc569a97e444389350ea3f5b1017374fe16bec;p=sbcl.git

diff --git a/src/runtime/sunos-os.c b/src/runtime/sunos-os.c
index 2501edd..e2f68e1 100644
--- a/src/runtime/sunos-os.c
+++ b/src/runtime/sunos-os.c
@@ -17,7 +17,22 @@
 #include "validate.h"
 #include "target-arch-os.h"
 
+#ifdef LISP_FEATURE_X86
+#include "genesis/static-symbols.h"
+#include "genesis/fdefn.h"
+#endif
+
+#ifdef LISP_FEATURE_GENCGC
+#include "gencgc-internal.h"
+#endif
+
+#if defined LISP_FEATURE_SPARC
 #define OS_VM_DEFAULT_PAGESIZE 8192
+#elif defined LISP_FEATURE_X86
+#define OS_VM_DEFAULT_PAGESIZE 4096
+#else
+#error "Don't know OS_VM_DEFAULT_PAGESIZE"
+#endif
 
 long os_vm_page_size=(-1);
 static long os_real_page_size=(-1);
@@ -38,7 +53,8 @@ static os_vm_size_t real_page_size_difference=0;
 int KLUDGE_MAYBE_MAP_ANON = 0x0;
 int kludge_mmap_fd = -1; /* default for MAP_ANON */
 
-void os_init(void)
+void
+os_init(char *argv[], char *envp[])
 {
     struct utsname name;
     int major_version;
@@ -47,22 +63,21 @@ void os_init(void)
     uname(&name);
     major_version = atoi(name.release);
     if (major_version != 5) {
-        lose("sunos major version=%d (which isn't 5!)", major_version);
+        lose("sunos major version=%d (which isn't 5!)\n", major_version);
     }
     minor_version = atoi(name.release+2);
-    if ((minor_version == 8) ||
-        (minor_version == 9) ||
-        (minor_version == 10)) {
-        KLUDGE_MAYBE_MAP_ANON = 0x100;
-    } 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 */
+    if ((minor_version < 8)) {
         kludge_mmap_fd = open("/dev/zero",O_RDONLY);
         if (kludge_mmap_fd < 0) {
             perror("open");
-            lose("Error in open(..)");
+            lose("Error in open(..)\n");
         }
+    } else if (minor_version > 11) {
+        FSHOW((stderr, "os_init: Solaris version greater than 11?\nUnknown MAP_ANON behaviour.\n"));
+        lose("Unknown mmap() interaction with MAP_ANON\n");
+    } else {
+        /* Versions 8-11*/
+        KLUDGE_MAYBE_MAP_ANON = 0x100;
     }
 
     /* I do not understand this at all. FIXME. */
@@ -99,7 +114,7 @@ os_vm_address_t os_validate(os_vm_address_t addr, os_vm_size_t len)
 
     if (addr == MAP_FAILED) {
         perror("mmap");
-        lose ("Error in mmap(..)");
+        lose ("Error in mmap(..)\n");
     }
 
     return addr;
@@ -124,7 +139,7 @@ os_map(int fd, int offset, os_vm_address_t addr, os_vm_size_t len)
 
     if (addr == MAP_FAILED) {
         perror("mmap");
-        lose("Unexpedted mmap(..) failure");
+        lose("Unexpedted mmap(..) failure\n");
     }
 
     return addr;
@@ -161,8 +176,13 @@ boolean is_valid_lisp_addr(os_vm_address_t addr)
     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))
+#ifdef LISP_FEATURE_GENCGC
+       in_range_p(addr, DYNAMIC_SPACE_START  , dynamic_space_size)
+#else
+       in_range_p(addr, DYNAMIC_0_SPACE_START, dynamic_space_size) ||
+       in_range_p(addr, DYNAMIC_1_SPACE_START, dynamic_space_size)
+#endif
+       )
         return 1;
     for_each_thread(th) {
         if((th->control_stack_start <= addr) && (addr < th->control_stack_end))
@@ -174,23 +194,57 @@ boolean is_valid_lisp_addr(os_vm_address_t addr)
 }
 
 
+#if defined LISP_FEATURE_GENCGC
+
+void
+sigsegv_handler(int signal, siginfo_t *info, void* void_context)
+{
+    os_context_t *context = arch_os_get_context(&void_context);
+    void* fault_addr = (void*)info->si_addr;
+
+    if (!gencgc_handle_wp_violation(fault_addr))
+        if(!handle_guard_page_triggered(context, fault_addr))
+            lisp_memory_fault_error(context, fault_addr);
+}
+
+#else
 
 static void
 sigsegv_handler(int signal, siginfo_t *info, void* void_context)
 {
     os_context_t *context = arch_os_get_context(&void_context);
-    os_vm_address_t addr;
+    os_vm_address_t addr = arch_get_bad_addr(signal, info, context);
 
-    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 (!cheneygc_handle_wp_violation(context, addr)) {
+        if (!handle_guard_page_triggered(context,addr))
+            lisp_memory_fault_error(context, fault_addr);
     }
 }
 
+#endif
+
 void
 os_install_interrupt_handlers()
 {
     undoably_install_low_level_interrupt_handler(SIG_MEMORY_FAULT,
                                                  sigsegv_handler);
+
+#ifdef LISP_FEATURE_SB_THREAD
+    undoably_install_low_level_interrupt_handler(SIG_STOP_FOR_GC,
+                                                 sig_stop_for_gc_handler);
+#endif
 }
+
+char *
+os_get_runtime_executable_path()
+{
+    int ret;
+    char path[] = "/proc/self/object/a.out";
+
+    ret = access(path, R_OK);
+    if (ret == -1)
+        return NULL;
+
+    return copied_string(path);
+}
+