X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fsunos-os.c;h=4389564d6be9117bbec3fab4db05b780a5f22eac;hb=25d55fff07e7eb37ad976f980cb440cdd95ff326;hp=0cccfe167418905020a10cabcfccce4362e19b48;hpb=84e9f00b07d3d5ce4a5a5d30bcdf94c0bd7f2f0f;p=sbcl.git diff --git a/src/runtime/sunos-os.c b/src/runtime/sunos-os.c index 0cccfe1..4389564 100644 --- a/src/runtime/sunos-os.c +++ b/src/runtime/sunos-os.c @@ -26,91 +26,28 @@ #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); - -static os_vm_size_t real_page_size_difference=0; - -/* So, this sucks. Versions of Solaris prior to 8 (SunOS releases - earlier than 5.8) do not support MAP_ANON passed as a flag to - mmap(). However, we would like SBCL compiled on SunOS 5.7 but - 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 - - 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 */ +os_vm_size_t os_vm_page_size=0; void os_init(char *argv[], char *envp[]) { - struct utsname name; - int major_version; - int minor_version; - - uname(&name); - major_version = atoi(name.release); - if (major_version != 5) { - lose("sunos major version=%d (which isn't 5!)\n", major_version); - } - minor_version = atoi(name.release+2); - if ((minor_version < 8)) { - kludge_mmap_fd = open("/dev/zero",O_RDONLY); - if (kludge_mmap_fd < 0) { - perror("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. */ - os_vm_page_size = os_real_page_size = sysconf(_SC_PAGESIZE); - - if(os_vm_page_size>OS_VM_DEFAULT_PAGESIZE){ - fprintf(stderr,"os_init: Pagesize too large (%d > %d)\n", - os_vm_page_size,OS_VM_DEFAULT_PAGESIZE); - exit(1); - } else { - /* - * we do this because there are apparently dependencies on - * the pagesize being OS_VM_DEFAULT_PAGESIZE somewhere... - * but since the OS doesn't know we're using this restriction, - * we have to grovel around a bit to enforce it, thus anything - * that uses real_page_size_difference. - */ - /* FIXME: Is this still true? */ - real_page_size_difference=OS_VM_DEFAULT_PAGESIZE-os_vm_page_size; - os_vm_page_size=OS_VM_DEFAULT_PAGESIZE; - } + /* + * historically, this used sysconf to select the runtime page size + * per recent changes on other arches and discussion on sbcl-devel, + * however, this is not necessary -- the VM page size need not match + * the OS page size (and the default backend page size has been + * ramped up accordingly for efficiency reasons). + */ + os_vm_page_size = BACKEND_PAGE_BYTES; } 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; + int flags = MAP_PRIVATE | MAP_NORESERVE | MAP_ANON; if (addr) flags |= MAP_FIXED; - addr = mmap(addr, len, - OS_VM_PROT_ALL, - flags, - kludge_mmap_fd, 0); + addr = mmap(addr, len, OS_VM_PROT_ALL, flags, -1, 0); if (addr == MAP_FAILED) { perror("mmap"); @@ -177,10 +114,10 @@ boolean 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) || #ifdef LISP_FEATURE_GENCGC - in_range_p(addr, DYNAMIC_SPACE_START, DYNAMIC_SPACE_SIZE) + 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) + 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; @@ -197,38 +134,25 @@ 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) +sigsegv_handler(int signal, siginfo_t *info, os_context_t *context) { - os_context_t *context = arch_os_get_context(&void_context); void* fault_addr = (void*)info->si_addr; - if(info->si_code == 1) - { - perror("error: SEGV_MAPERR\n"); - exit(1); - } if (!gencgc_handle_wp_violation(fault_addr)) - if(!handle_guard_page_triggered(context, fault_addr)) -#ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK - arrange_return_to_lisp_function(context, - SymbolFunction(MEMORY_FAULT_ERROR)); -#else - interrupt_handle_now(signal, info, context); -#endif + 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) +sigsegv_handler(int signal, siginfo_t *info, os_context_t *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, addr); } } @@ -239,17 +163,21 @@ 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() +os_get_runtime_executable_path(int external) { - int ret; char path[] = "/proc/self/object/a.out"; - ret = access(path, R_OK); - if (ret == -1) + if (external || access(path, R_OK) == -1) return NULL; return copied_string(path); } +