#if defined LISP_FEATURE_SPARC
#define OS_VM_DEFAULT_PAGESIZE 8192
-#elif defined LISP_FEATURE_X86
+#elif defined LISP_FEATURE_X86 || defined LISP_FEATURE_X86_64
#define OS_VM_DEFAULT_PAGESIZE 4096
#else
#error "Don't know OS_VM_DEFAULT_PAGESIZE"
#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 (!gencgc_handle_wp_violation(fault_addr))
- if(!handle_guard_page_triggered(context, fault_addr))
-#ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK
- lisp_memory_fault_error(context, fault_addr);
-#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 = arch_get_bad_addr(signal, info, context);
if (!cheneygc_handle_wp_violation(context, addr)) {
if (!handle_guard_page_triggered(context,addr))
- interrupt_handle_now(signal, info, context);
+ lisp_memory_fault_error(context, addr);
}
}
}
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);