diff options
Diffstat (limited to 'mach')
-rw-r--r-- | mach/setup-thread.c | 59 |
1 files changed, 20 insertions, 39 deletions
diff --git a/mach/setup-thread.c b/mach/setup-thread.c index a00edacdfd..a49fe3f2ed 100644 --- a/mach/setup-thread.c +++ b/mach/setup-thread.c @@ -1,20 +1,20 @@ -/* Copyright (C) 1991, 1994, 1995 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1991, 1994, 1995, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include <mach.h> #include "thread_state.h" @@ -41,33 +41,14 @@ __mach_setup_thread (task_t task, thread_t thread, void *pc, mach_msg_type_number_t tssize = MACHINE_THREAD_STATE_COUNT; vm_address_t stack; vm_size_t size; - int anywhere = 0; + int anywhere; size = stack_size ? *stack_size ? : STACK_SIZE : STACK_SIZE; + stack = stack_base ? *stack_base ? : 0 : 0; + anywhere = !stack_base || !*stack_base; - if (stack_base && *stack_base) - stack = *stack_base; - else if (size == STACK_SIZE) - { - /* Cthreads has a bug that makes its stack-probing code fail if - the stack is too low in memory. It's bad to try and fix it there - until cthreads is integrated into libc, so we'll just do it here - by requesting a high address. When the cthreads bug is fixed, - this assignment to STACK should be changed to 0, and the ANYWHERE - argument to vm_allocate should be changed to 0. This comment should - be left, however, in order to confuse people who wonder why its - here. (Though perhaps that last sentence (and this one) should - be deleted to maximize the effect.) */ -#ifdef STACK_GROWTH_DOWN - stack = VM_MAX_ADDRESS - size - __vm_page_size; -#else - stack = VM_MIN_ADDRESS; -#endif - } - else - anywhere = 1; - - if (error = __vm_allocate (task, &stack, size + __vm_page_size, anywhere)) + error = __vm_allocate (task, &stack, size + __vm_page_size, anywhere); + if (error) return error; if (stack_size) @@ -91,7 +72,7 @@ __mach_setup_thread (task_t task, thread_t thread, void *pc, /* Create the red zone. */ if (error = __vm_protect (task, stack, __vm_page_size, 0, VM_PROT_NONE)) return error; - + return __thread_set_state (thread, MACHINE_THREAD_STATE_FLAVOR, (int *) &ts, tssize); } |