X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fvalidate.c;h=f4c8bfe1718f321898ad7fa8a8ad7656b3cf4b4d;hb=69ef68ba7393e3492c1b4a756d1140f71c2922bc;hp=b8bf2831a90b61ad6e7b8d1f7a672c7309da8d0f;hpb=ba94fb1763a2f1e01a3b75a9e1415f051c5a559f;p=sbcl.git diff --git a/src/runtime/validate.c b/src/runtime/validate.c index b8bf283..f4c8bfe 100644 --- a/src/runtime/validate.c +++ b/src/runtime/validate.c @@ -30,10 +30,25 @@ ensure_space(lispobj *start, unsigned long size) "ensure_space: failed to validate %ld bytes at 0x%08lx\n", size, (unsigned long)start); + fprintf(stderr, + "(hint: Try \"ulimit -a\"; maybe you should increase memory limits.)\n"); exit(1); } } +os_vm_address_t undefined_alien_address = 0; + +static void +ensure_undefined_alien(void) { + os_vm_address_t start = os_validate(NULL, os_vm_page_size); + if (start) { + os_protect(start, os_vm_page_size, OS_VM_PROT_NONE); + undefined_alien_address = start; + } else { + lose("could not allocate guard page for undefined alien"); + } +} + void validate(void) { @@ -51,15 +66,31 @@ validate(void) ensure_space( (lispobj *)DYNAMIC_1_SPACE_START , DYNAMIC_SPACE_SIZE); #endif +#ifdef LISP_FEATURE_LINKAGE_TABLE + ensure_space( (lispobj *)LINKAGE_TABLE_SPACE_START, LINKAGE_TABLE_SPACE_SIZE); +#endif + +#ifdef LISP_FEATURE_OS_PROVIDES_DLOPEN + ensure_undefined_alien(); +#endif + #ifdef PRINTNOISE printf(" done.\n"); #endif } -void protect_control_stack_guard_page(pid_t t_id, int protect_p) { +void +protect_control_stack_guard_page(pid_t t_id, int protect_p) { struct thread *th = find_thread_by_pid(t_id); os_protect(CONTROL_STACK_GUARD_PAGE(th), os_vm_page_size,protect_p ? (OS_VM_PROT_READ|OS_VM_PROT_EXECUTE) : OS_VM_PROT_ALL); } +void +protect_control_stack_return_guard_page(pid_t t_id, int protect_p) { + struct thread *th = find_thread_by_pid(t_id); + os_protect(CONTROL_STACK_RETURN_GUARD_PAGE(th), + os_vm_page_size,protect_p ? + (OS_VM_PROT_READ|OS_VM_PROT_EXECUTE) : OS_VM_PROT_ALL); +}