Module Name: src
Committed By: skrll
Date: Wed Feb 19 13:01:52 UTC 2014
Modified Files:
src/lib/libc/arch/hppa: Makefile.inc
src/lib/libc/arch/hppa/gen: swapcontext.S
src/lib/libc/arch/hppa/sys: getcontext.S
src/sys/arch/hppa/include: mcontext.h
Added Files:
src/lib/libc/arch/hppa: genassym.cf
Log Message:
Provide a genassym.cf in libc for hppa and use it.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/arch/hppa/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/lib/libc/arch/hppa/genassym.cf
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/arch/hppa/gen/swapcontext.S
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/hppa/sys/getcontext.S
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hppa/include/mcontext.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/hppa/Makefile.inc
diff -u src/lib/libc/arch/hppa/Makefile.inc:1.9 src/lib/libc/arch/hppa/Makefile.inc:1.10
--- src/lib/libc/arch/hppa/Makefile.inc:1.9 Wed Oct 21 19:30:46 2009
+++ src/lib/libc/arch/hppa/Makefile.inc Wed Feb 19 13:01:51 2014
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.9 2009/10/21 19:30:46 skrll Exp $
+# $NetBSD: Makefile.inc,v 1.10 2014/02/19 13:01:51 skrll Exp $
# $OpenBSD: Makefile.inc,v 1.3 1999/12/25 06:02:10 mickey Exp $
SRCS+= __sigaction14_sigtramp.c __sigtramp2.S
SRCS+= bcopy.c
+
+CPPFLAGS+= -I.
Index: src/lib/libc/arch/hppa/gen/swapcontext.S
diff -u src/lib/libc/arch/hppa/gen/swapcontext.S:1.5 src/lib/libc/arch/hppa/gen/swapcontext.S:1.6
--- src/lib/libc/arch/hppa/gen/swapcontext.S:1.5 Wed Sep 12 02:00:52 2012
+++ src/lib/libc/arch/hppa/gen/swapcontext.S Wed Feb 19 13:01:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: swapcontext.S,v 1.5 2012/09/12 02:00:52 manu Exp $ */
+/* $NetBSD: swapcontext.S,v 1.6 2014/02/19 13:01:51 skrll Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,10 +30,12 @@
*/
#include "SYS.h"
+#include "assym.h"
+
#include <machine/mcontext.h>
#if defined(SYSLIBC_SCCS) && !defined(lint)
- RCSID("$NetBSD: swapcontext.S,v 1.5 2012/09/12 02:00:52 manu Exp $")
+ RCSID("$NetBSD: swapcontext.S,v 1.6 2014/02/19 13:01:51 skrll Exp $")
#endif /* SYSLIBC_SCCS && !lint */
LEAF_ENTRY(swapcontext)
Index: src/lib/libc/arch/hppa/sys/getcontext.S
diff -u src/lib/libc/arch/hppa/sys/getcontext.S:1.4 src/lib/libc/arch/hppa/sys/getcontext.S:1.5
--- src/lib/libc/arch/hppa/sys/getcontext.S:1.4 Mon Apr 28 20:22:56 2008
+++ src/lib/libc/arch/hppa/sys/getcontext.S Wed Feb 19 13:01:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: getcontext.S,v 1.4 2008/04/28 20:22:56 martin Exp $ */
+/* $NetBSD: getcontext.S,v 1.5 2014/02/19 13:01:51 skrll Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -29,17 +29,13 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/errno.h>
-#include <machine/mcontext.h>
#include "SYS.h"
+#include "assym.h"
#ifdef WEAK_ALIAS
WEAK_ALIAS(getcontext, _getcontext)
#endif
-#define _OFFSETOF_UC_GREGS (10 * 4)
-#define SZREG 4
-
ENTRY(_getcontext, 0)
SYSCALL(getcontext)
stw %rp, (_OFFSETOF_UC_GREGS + _REG_PCOQH * SZREG)(%arg0)
Index: src/sys/arch/hppa/include/mcontext.h
diff -u src/sys/arch/hppa/include/mcontext.h:1.7 src/sys/arch/hppa/include/mcontext.h:1.8
--- src/sys/arch/hppa/include/mcontext.h:1.7 Thu Dec 8 21:00:50 2011
+++ src/sys/arch/hppa/include/mcontext.h Wed Feb 19 13:01:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.7 2011/12/08 21:00:50 skrll Exp $ */
+/* $NetBSD: mcontext.h,v 1.8 2014/02/19 13:01:51 skrll Exp $ */
#ifndef _HPPA_MCONTEXT_H_
#define _HPPA_MCONTEXT_H_
@@ -69,8 +69,6 @@ __lwp_getprivate_fast(void)
#endif /* !__ASSEMBLER__ */
-#define _OFFSETOF_UC_GREGS 40
-
#define _UC_SETSTACK 0x00010000
#define _UC_CLRSTACK 0x00020000
#define _UC_TLSBASE 0x00040000
Added files:
Index: src/lib/libc/arch/hppa/genassym.cf
diff -u /dev/null src/lib/libc/arch/hppa/genassym.cf:1.1
--- /dev/null Wed Feb 19 13:01:52 2014
+++ src/lib/libc/arch/hppa/genassym.cf Wed Feb 19 13:01:51 2014
@@ -0,0 +1,39 @@
+# $NetBSD: genassym.cf,v 1.1 2014/02/19 13:01:51 skrll Exp $
+
+#
+# Copyright (c) 2014 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Nick Hudson
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+include <sys/types.h>
+include <ucontext.h>
+
+define _REG_PCOQH _REG_PCOQH
+define _REG_PCOQT _REG_PCOQT
+define _REG_RET0 _REG_RET0
+
+define _OFFSETOF_UC_GREGS offsetof(ucontext_t, uc_mcontext.__gregs[0])
