summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorskrll <skrll@NetBSD.org>2010-01-07 12:31:10 +0000
committerskrll <skrll@NetBSD.org>2010-01-07 12:31:10 +0000
commit5ddaffd10796ae65c8cc0674599cb8be8be33ec8 (patch)
treeea2cfd581ef964945d35e0085bb27fb0ad9d7c5e /lib
parent76f833ae3d5f058688871c7d72e1f1c31bb9314d (diff)
Deal with PLABELs in _lwp_makecontext
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/arch/hppa/gen/_lwp.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/libc/arch/hppa/gen/_lwp.c b/lib/libc/arch/hppa/gen/_lwp.c
index 141c2428ae2..4e8cc16b015 100644
--- a/lib/libc/arch/hppa/gen/_lwp.c
+++ b/lib/libc/arch/hppa/gen/_lwp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: _lwp.c,v 1.3 2008/04/28 20:22:56 martin Exp $ */
+/* $NetBSD: _lwp.c,v 1.4 2010/01/07 12:31:10 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _lwp.c,v 1.3 2008/04/28 20:22:56 martin Exp $");
+__RCSID("$NetBSD: _lwp.c,v 1.4 2010/01/07 12:31:10 skrll Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -47,6 +47,8 @@ _lwp_makecontext(ucontext_t *u, void (*start)(void *),
{
caddr_t sp;
__greg_t *gr;
+ __greg_t *gp;
+ __greg_t fp;
getcontext(u);
gr = u->uc_mcontext.__gregs;
@@ -56,8 +58,14 @@ _lwp_makecontext(ucontext_t *u, void (*start)(void *),
u->uc_stack.ss_size = stack_size;
sp = stack_base + HPPA_FRAME_SIZE;
- gr[_REG_PCOQH] = (__greg_t) start;
- gr[_REG_PCOQT] = (__greg_t) start + 4;
+ fp = (__greg_t)start;
+ if (fp & 2) {
+ gp = (__greg_t *)(fp & ~3);
+ fp = gp[0];
+ gr[_REG_R19] = gp[1];
+ }
+ gr[_REG_PCOQH] = fp | HPPA_PC_PRIV_USER;
+ gr[_REG_PCOQT] = (fp + 4) | HPPA_PC_PRIV_USER;
gr[_REG_RP] = (__greg_t) _lwp_exit;
gr[_REG_ARG0] = (__greg_t) arg;
gr[_REG_SP] = (__greg_t) sp;