From aab24d77d0eeafb6880dce4420d3f422ef7a0971 Mon Sep 17 00:00:00 2001 From: Christophe Rhodes Date: Fri, 4 Apr 2003 13:08:07 +0000 Subject: [PATCH] 0.pre8.36: === Threads merge, 3.125 metres === Reenable control stack guard page checking. Define control_stack_end as an exclusive bound. --- src/runtime/thread.c | 2 +- src/runtime/validate.c | 4 +--- version.lisp-expr | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/runtime/thread.c b/src/runtime/thread.c index 7706545e3..7d4520dd5 100644 --- a/src/runtime/thread.c +++ b/src/runtime/thread.c @@ -123,7 +123,7 @@ pid_t create_thread(lispobj initial_function) { 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; diff --git a/src/runtime/validate.c b/src/runtime/validate.c index 6d7680396..36c1729b4 100644 --- a/src/runtime/validate.c +++ b/src/runtime/validate.c @@ -86,11 +86,9 @@ validate(void) } 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 } diff --git a/version.lisp-expr b/version.lisp-expr index 7e7b90985..7140e8425 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -18,4 +18,4 @@ ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.pre8.35" +"0.pre8.36" -- 2.11.4.GIT