From: Christophe R. <cr...@us...> - 2003-04-04 13:08:19
|
Update of /cvsroot/sbcl/sbcl/src/runtime In directory sc8-pr-cvs1:/tmp/cvs-serv13111/src/runtime Modified Files: thread.c validate.c Log Message: 0.pre8.36: === Threads merge, 3.125 metres === Reenable control stack guard page checking. Define control_stack_end as an exclusive bound. Index: thread.c =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/thread.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- thread.c 3 Apr 2003 18:27:30 -0000 1.5 +++ thread.c 4 Apr 2003 13:08:11 -0000 1.6 @@ -123,7 +123,7 @@ th->control_stack_start = spaces; th->binding_stack_start= (lispobj*)((void*)th->control_stack_start+THREAD_CONTROL_STACK_SIZE); - th->control_stack_end = th->binding_stack_start-1; + th->control_stack_end = th->binding_stack_start; th->alien_stack_start= (lispobj*)((void*)th->binding_stack_start+BINDING_STACK_SIZE); th->binding_stack_pointer=th->binding_stack_start; Index: validate.c =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/validate.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- validate.c 3 Apr 2003 18:27:32 -0000 1.15 +++ validate.c 4 Apr 2003 13:08:12 -0000 1.16 @@ -86,11 +86,9 @@ } void protect_control_stack_guard_page(pid_t t_id, int protect_p) { - struct thread *th= find_thread_by_pid(t_id); -#if 0 + 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); -#endif } |