Module Name: src
Committed By: snj
Date: Mon Feb 26 04:32:31 UTC 2018
Modified Files:
src/doc [netbsd-8]: CHANGES-8.0
src/sys/arch/aarch64/include [netbsd-8]: mcontext.h
src/sys/arch/alpha/include [netbsd-8]: mcontext.h
src/sys/arch/amd64/include [netbsd-8]: mcontext.h
src/sys/arch/arm/include [netbsd-8]: mcontext.h
src/sys/arch/hppa/include [netbsd-8]: mcontext.h
src/sys/arch/i386/include [netbsd-8]: mcontext.h
src/sys/arch/ia64/include [netbsd-8]: mcontext.h
src/sys/arch/m68k/include [netbsd-8]: mcontext.h
src/sys/arch/mips/include [netbsd-8]: mcontext.h
src/sys/arch/or1k/include [netbsd-8]: mcontext.h
src/sys/arch/powerpc/include [netbsd-8]: mcontext.h
src/sys/arch/riscv/include [netbsd-8]: mcontext.h
src/sys/arch/sh3/include [netbsd-8]: mcontext.h
src/sys/arch/sparc/include [netbsd-8]: mcontext.h
src/sys/arch/sparc64/include [netbsd-8]: mcontext.h
src/sys/arch/vax/include [netbsd-8]: mcontext.h
src/tests/lib/libc/sys [netbsd-8]: Makefile t_ucontext.c
Log Message:
revert ticket 552, which broke the build
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.130 -r1.1.2.131 src/doc/CHANGES-8.0
cvs rdiff -u -r1.1.22.1 -r1.1.22.2 src/sys/arch/aarch64/include/mcontext.h
cvs rdiff -u -r1.8.32.1 -r1.8.32.2 src/sys/arch/alpha/include/mcontext.h
cvs rdiff -u -r1.18.20.1 -r1.18.20.2 src/sys/arch/amd64/include/mcontext.h
cvs rdiff -u -r1.18.10.1 -r1.18.10.2 src/sys/arch/arm/include/mcontext.h
cvs rdiff -u -r1.8.22.1 -r1.8.22.2 src/sys/arch/hppa/include/mcontext.h
cvs rdiff -u -r1.12.22.1 -r1.12.22.2 src/sys/arch/i386/include/mcontext.h
cvs rdiff -u -r1.5.8.1 -r1.5.8.2 src/sys/arch/ia64/include/mcontext.h
cvs rdiff -u -r1.9.42.1 -r1.9.42.2 src/sys/arch/m68k/include/mcontext.h
cvs rdiff -u -r1.21.10.1 -r1.21.10.2 src/sys/arch/mips/include/mcontext.h
cvs rdiff -u -r1.1.12.1 -r1.1.12.2 src/sys/arch/or1k/include/mcontext.h
cvs rdiff -u -r1.17.12.1 -r1.17.12.2 src/sys/arch/powerpc/include/mcontext.h
cvs rdiff -u -r1.4.10.1 -r1.4.10.2 src/sys/arch/riscv/include/mcontext.h
cvs rdiff -u -r1.10.32.1 -r1.10.32.2 src/sys/arch/sh3/include/mcontext.h
cvs rdiff -u -r1.13.32.1 -r1.13.32.2 src/sys/arch/sparc/include/mcontext.h
cvs rdiff -u -r1.9.32.1 -r1.9.32.2 src/sys/arch/sparc64/include/mcontext.h
cvs rdiff -u -r1.8.40.1 -r1.8.40.2 src/sys/arch/vax/include/mcontext.h
cvs rdiff -u -r1.49.4.1 -r1.49.4.2 src/tests/lib/libc/sys/Makefile
cvs rdiff -u -r1.1.34.1 -r1.1.34.2 src/tests/lib/libc/sys/t_ucontext.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES-8.0
diff -u src/doc/CHANGES-8.0:1.1.2.130 src/doc/CHANGES-8.0:1.1.2.131
--- src/doc/CHANGES-8.0:1.1.2.130 Mon Feb 26 01:31:19 2018
+++ src/doc/CHANGES-8.0 Mon Feb 26 04:32:29 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.130 2018/02/26 01:31:19 snj Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.131 2018/02/26 04:32:29 snj Exp $
A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
until the 8.0 release:
@@ -9727,34 +9727,6 @@ tests/lib/libc/sys/t_ptrace_x86_wait.h
test environments.
[martin, ticket #586]
-sys/arch/aarch64/include/mcontext.h 1.2
-sys/arch/alpha/include/mcontext.h 1.9
-sys/arch/amd64/include/mcontext.h 1.19
-sys/arch/arm/include/mcontext.h 1.19
-sys/arch/hppa/include/mcontext.h 1.9
-sys/arch/i386/include/mcontext.h 1.14
-sys/arch/ia64/include/mcontext.h 1.6
-sys/arch/m68k/include/mcontext.h 1.10
-sys/arch/mips/include/mcontext.h 1.22
-sys/arch/or1k/include/mcontext.h 1.2
-sys/arch/powerpc/include/mcontext.h 1.18
-sys/arch/riscv/include/mcontext.h 1.5
-sys/arch/sh3/include/mcontext.h 1.11
-sys/arch/sparc/include/mcontext.h 1.14-1.17
-sys/arch/sparc64/include/mcontext.h 1.10
-sys/arch/vax/include/mcontext.h 1.9
-tests/lib/libc/sys/Makefile 1.50
-tests/lib/libc/sys/t_ucontext.c 1.2
-
- - Introduce _UC_MACHINE_FP(). _UC_MACHINE_FP() is a helper
- macro to extract from mcontext a frame pointer.
- - Add new tests in lib/libc/sys/t_ucontext:
- * ucontext_sp (testing _UC_MACHINE_SP)
- * ucontext_fp (testing _UC_MACHINE_FP)
- * ucontext_pc (testing _UC_MACHINE_PC)
- * ucontext_intrv (testing _UC_MACHINE_INTRV)
- [kamil, ticket #552]
-
include/string.h 1.52
Mark memccpy(3) and strdup(3) as _POSIX_C_SOURCE >= 2001
Index: src/sys/arch/aarch64/include/mcontext.h
diff -u src/sys/arch/aarch64/include/mcontext.h:1.1.22.1 src/sys/arch/aarch64/include/mcontext.h:1.1.22.2
--- src/sys/arch/aarch64/include/mcontext.h:1.1.22.1 Sun Feb 25 23:50:22 2018
+++ src/sys/arch/aarch64/include/mcontext.h Mon Feb 26 04:32:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.1.22.1 2018/02/25 23:50:22 snj Exp $ */
+/* $NetBSD: mcontext.h,v 1.1.22.2 2018/02/26 04:32:29 snj Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -106,7 +106,6 @@ typedef struct {
#define _UC_TLSBASE 0x00080000 /* see <sys/ucontext.h> */
#define _UC_MACHINE_SP(uc) ((uc)->uc_mcontext.__gregs[_REG_SP])
-#define _UC_MACHINE_FP(uc) ((uc)->uc_mcontext.__gregs[_REG_X29])
#define _UC_MACHINE_PC(uc) ((uc)->uc_mcontext.__gregs[_REG_PC])
#define _UC_MACHINE_INTRV(uc) ((uc)->uc_mcontext.__gregs[_REG_X0])
Index: src/sys/arch/alpha/include/mcontext.h
diff -u src/sys/arch/alpha/include/mcontext.h:1.8.32.1 src/sys/arch/alpha/include/mcontext.h:1.8.32.2
--- src/sys/arch/alpha/include/mcontext.h:1.8.32.1 Sun Feb 25 23:50:22 2018
+++ src/sys/arch/alpha/include/mcontext.h Mon Feb 26 04:32:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.8.32.1 2018/02/25 23:50:22 snj Exp $ */
+/* $NetBSD: mcontext.h,v 1.8.32.2 2018/02/26 04:32:29 snj Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -96,7 +96,6 @@ typedef struct {
#define _UC_TLSBASE 0x20 /* valid process-unique value in _REG_UNIQUE */
#define _UC_MACHINE_SP(uc) ((uc)->uc_mcontext.__gregs[_REG_SP])
-#define _UC_MACHINE_FP(uc) ((uc)->uc_mcontext.__gregs[_REG_S6])
#define _UC_MACHINE_PC(uc) ((uc)->uc_mcontext.__gregs[_REG_PC])
#define _UC_MACHINE_INTRV(uc) ((uc)->uc_mcontext.__gregs[_REG_V0])
Index: src/sys/arch/amd64/include/mcontext.h
diff -u src/sys/arch/amd64/include/mcontext.h:1.18.20.1 src/sys/arch/amd64/include/mcontext.h:1.18.20.2
--- src/sys/arch/amd64/include/mcontext.h:1.18.20.1 Sun Feb 25 23:50:22 2018
+++ src/sys/arch/amd64/include/mcontext.h Mon Feb 26 04:32:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.18.20.1 2018/02/25 23:50:22 snj Exp $ */
+/* $NetBSD: mcontext.h,v 1.18.20.2 2018/02/26 04:32:29 snj Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -68,7 +68,6 @@ typedef struct {
/* AMD64 ABI 128-bytes "red zone". */
#define _UC_MACHINE_SP(uc) ((uc)->uc_mcontext.__gregs[_REG_RSP] - 128)
-#define _UC_MACHINE_FP(uc) ((uc)->uc_mcontext.__gregs[_REG_RBP])
#define _UC_MACHINE_PC(uc) ((uc)->uc_mcontext.__gregs[_REG_RIP])
#define _UC_MACHINE_INTRV(uc) ((uc)->uc_mcontext.__gregs[_REG_RAX])
Index: src/sys/arch/arm/include/mcontext.h
diff -u src/sys/arch/arm/include/mcontext.h:1.18.10.1 src/sys/arch/arm/include/mcontext.h:1.18.10.2
--- src/sys/arch/arm/include/mcontext.h:1.18.10.1 Sun Feb 25 23:50:22 2018
+++ src/sys/arch/arm/include/mcontext.h Mon Feb 26 04:32:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.18.10.1 2018/02/25 23:50:22 snj Exp $ */
+/* $NetBSD: mcontext.h,v 1.18.10.2 2018/02/26 04:32:29 snj Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -110,7 +110,6 @@ typedef struct {
#define _UC_MACHINE_PAD 1 /* Padding appended to ucontext_t */
#define _UC_MACHINE_SP(uc) ((uc)->uc_mcontext.__gregs[_REG_SP])
-#define _UC_MACHINE_FP(uc) ((uc)->uc_mcontext.__gregs[_REG_R11])
#define _UC_MACHINE_PC(uc) ((uc)->uc_mcontext.__gregs[_REG_PC])
#define _UC_MACHINE_INTRV(uc) ((uc)->uc_mcontext.__gregs[_REG_R0])
Index: src/sys/arch/hppa/include/mcontext.h
diff -u src/sys/arch/hppa/include/mcontext.h:1.8.22.1 src/sys/arch/hppa/include/mcontext.h:1.8.22.2
--- src/sys/arch/hppa/include/mcontext.h:1.8.22.1 Sun Feb 25 23:50:22 2018
+++ src/sys/arch/hppa/include/mcontext.h Mon Feb 26 04:32:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.8.22.1 2018/02/25 23:50:22 snj Exp $ */
+/* $NetBSD: mcontext.h,v 1.8.22.2 2018/02/26 04:32:29 snj Exp $ */
#ifndef _HPPA_MCONTEXT_H_
#define _HPPA_MCONTEXT_H_
@@ -50,7 +50,6 @@ typedef struct {
} mcontext_t;
#define _UC_MACHINE_SP(uc) ((uc)->uc_mcontext.__gregs[_REG_SP])
-#define _UC_MACHINE_FP(uc) ((uc)->uc_mcontext.__gregs[3])
#define _UC_MACHINE_PC(uc) ((uc)->uc_mcontext.__gregs[_REG_PCOQH])
#define _UC_MACHINE_SET_PC(uc, pc) \
do { \
Index: src/sys/arch/i386/include/mcontext.h
diff -u src/sys/arch/i386/include/mcontext.h:1.12.22.1 src/sys/arch/i386/include/mcontext.h:1.12.22.2
--- src/sys/arch/i386/include/mcontext.h:1.12.22.1 Sun Feb 25 23:50:22 2018
+++ src/sys/arch/i386/include/mcontext.h Mon Feb 26 04:32:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.12.22.1 2018/02/25 23:50:22 snj Exp $ */
+/* $NetBSD: mcontext.h,v 1.12.22.2 2018/02/26 04:32:30 snj Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -116,7 +116,6 @@ typedef struct {
#ifndef _UC_MACHINE_SP
#define _UC_MACHINE_SP(uc) ((uc)->uc_mcontext.__gregs[_REG_UESP])
#endif
-#define _UC_MACHINE_FP(uc) ((uc)->uc_mcontext.__gregs[_REG_EBP])
#define _UC_MACHINE_PC(uc) ((uc)->uc_mcontext.__gregs[_REG_EIP])
#define _UC_MACHINE_INTRV(uc) ((uc)->uc_mcontext.__gregs[_REG_EAX])
Index: src/sys/arch/ia64/include/mcontext.h
diff -u src/sys/arch/ia64/include/mcontext.h:1.5.8.1 src/sys/arch/ia64/include/mcontext.h:1.5.8.2
--- src/sys/arch/ia64/include/mcontext.h:1.5.8.1 Sun Feb 25 23:50:23 2018
+++ src/sys/arch/ia64/include/mcontext.h Mon Feb 26 04:32:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.5.8.1 2018/02/25 23:50:23 snj Exp $ */
+/* $NetBSD: mcontext.h,v 1.5.8.2 2018/02/26 04:32:30 snj Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -112,7 +112,6 @@ typedef struct __mcontext {
} mcontext_t;
#define _UC_MACHINE_SP(uc) ((uc)->uc_mcontext.mc_special.sp)
-#define _UC_MACHINE_FP(uc) ((uc)->uc_mcontext.__gregs[79])
/* XXX or assembly "mov Rn = ip" or ...? */
#define _UC_MACHINE_PC(uc) ((uc)->uc_mcontext.mc_special.iip)
Index: src/sys/arch/m68k/include/mcontext.h
diff -u src/sys/arch/m68k/include/mcontext.h:1.9.42.1 src/sys/arch/m68k/include/mcontext.h:1.9.42.2
--- src/sys/arch/m68k/include/mcontext.h:1.9.42.1 Sun Feb 25 23:50:23 2018
+++ src/sys/arch/m68k/include/mcontext.h Mon Feb 26 04:32:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.9.42.1 2018/02/25 23:50:23 snj Exp $ */
+/* $NetBSD: mcontext.h,v 1.9.42.2 2018/02/26 04:32:30 snj Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -102,7 +102,6 @@ typedef struct {
#define _UC_TLSBASE 0x00080000
#define _UC_MACHINE_SP(uc) ((uc)->uc_mcontext.__gregs[_REG_A7])
-#define _UC_MACHINE_FP(uc) ((uc)->uc_mcontext.__gregs[_REG_A6])
#define _UC_MACHINE_PC(uc) ((uc)->uc_mcontext.__gregs[_REG_PC])
#define _UC_MACHINE_INTRV(uc) ((uc)->uc_mcontext.__gregs[_REG_D0])
Index: src/sys/arch/mips/include/mcontext.h
diff -u src/sys/arch/mips/include/mcontext.h:1.21.10.1 src/sys/arch/mips/include/mcontext.h:1.21.10.2
--- src/sys/arch/mips/include/mcontext.h:1.21.10.1 Sun Feb 25 23:50:23 2018
+++ src/sys/arch/mips/include/mcontext.h Mon Feb 26 04:32:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.21.10.1 2018/02/25 23:50:23 snj Exp $ */
+/* $NetBSD: mcontext.h,v 1.21.10.2 2018/02/26 04:32:30 snj Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -159,7 +159,6 @@ typedef struct {
#define _UC_TLSBASE 0x00040000
#define _UC_MACHINE_SP(uc) ((uc)->uc_mcontext.__gregs[_REG_SP])
-#define _UC_MACHINE_FP(uc) ((uc)->uc_mcontext.__gregs[_REG_S8])
#define _UC_MACHINE_PC(uc) ((uc)->uc_mcontext.__gregs[_REG_EPC])
#define _UC_MACHINE_INTRV(uc) ((uc)->uc_mcontext.__gregs[_REG_V0])
Index: src/sys/arch/or1k/include/mcontext.h
diff -u src/sys/arch/or1k/include/mcontext.h:1.1.12.1 src/sys/arch/or1k/include/mcontext.h:1.1.12.2
--- src/sys/arch/or1k/include/mcontext.h:1.1.12.1 Sun Feb 25 23:50:23 2018
+++ src/sys/arch/or1k/include/mcontext.h Mon Feb 26 04:32:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.1.12.1 2018/02/25 23:50:23 snj Exp $ */
+/* $NetBSD: mcontext.h,v 1.1.12.2 2018/02/26 04:32:30 snj Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -88,7 +88,6 @@ typedef struct {
#define _UC_TLSBASE 0x00080000 /* see <sys/ucontext.h> */
#define _UC_MACHINE_SP(uc) ((uc)->uc_mcontext.__gregs[_REG_SP])
-#define _UC_MACHINE_FP(uc) ((uc)->uc_mcontext.__gregs[_REG_R2])
#define _UC_MACHINE_PC(uc) ((uc)->uc_mcontext.__gregs[_REG_PC])
#define _UC_MACHINE_INTRV(uc) ((uc)->uc_mcontext.__gregs[_REG_RV])
Index: src/sys/arch/powerpc/include/mcontext.h
diff -u src/sys/arch/powerpc/include/mcontext.h:1.17.12.1 src/sys/arch/powerpc/include/mcontext.h:1.17.12.2
--- src/sys/arch/powerpc/include/mcontext.h:1.17.12.1 Sun Feb 25 23:50:23 2018
+++ src/sys/arch/powerpc/include/mcontext.h Mon Feb 26 04:32:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.17.12.1 2018/02/25 23:50:23 snj Exp $ */
+/* $NetBSD: mcontext.h,v 1.17.12.2 2018/02/26 04:32:30 snj Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -133,7 +133,6 @@ typedef struct {
#define _UC_TLSBASE 0x00080000 /* thread context valid in R2 */
#define _UC_MACHINE_SP(uc) ((uc)->uc_mcontext.__gregs[_REG_R1])
-#define _UC_MACHINE_FP(uc) ((uc)->uc_mcontext.__gregs[_REG_R31])
#define _UC_MACHINE_PC(uc) ((uc)->uc_mcontext.__gregs[_REG_PC])
#define _UC_MACHINE_INTRV(uc) ((uc)->uc_mcontext.__gregs[_REG_R3])
Index: src/sys/arch/riscv/include/mcontext.h
diff -u src/sys/arch/riscv/include/mcontext.h:1.4.10.1 src/sys/arch/riscv/include/mcontext.h:1.4.10.2
--- src/sys/arch/riscv/include/mcontext.h:1.4.10.1 Sun Feb 25 23:50:23 2018
+++ src/sys/arch/riscv/include/mcontext.h Mon Feb 26 04:32:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.4.10.1 2018/02/25 23:50:23 snj Exp $ */
+/* $NetBSD: mcontext.h,v 1.4.10.2 2018/02/26 04:32:30 snj Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -118,7 +118,6 @@ typedef struct {
#define _UC_TLSBASE 0x00080000 /* see <sys/ucontext.h> */
#define _UC_MACHINE_SP(uc) ((uc)->uc_mcontext.__gregs[_REG_SP])
-#define _UC_MACHINE_FP(uc) ((uc)->uc_mcontext.__gregs[_REG_S0])
#define _UC_MACHINE_PC(uc) ((uc)->uc_mcontext.__gregs[_REG_PC])
#define _UC_MACHINE_INTRV(uc) ((uc)->uc_mcontext.__gregs[_REG_RV])
Index: src/sys/arch/sh3/include/mcontext.h
diff -u src/sys/arch/sh3/include/mcontext.h:1.10.32.1 src/sys/arch/sh3/include/mcontext.h:1.10.32.2
--- src/sys/arch/sh3/include/mcontext.h:1.10.32.1 Sun Feb 25 23:50:23 2018
+++ src/sys/arch/sh3/include/mcontext.h Mon Feb 26 04:32:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.10.32.1 2018/02/25 23:50:23 snj Exp $ */
+/* $NetBSD: mcontext.h,v 1.10.32.2 2018/02/26 04:32:30 snj Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -82,7 +82,6 @@ typedef struct {
} mcontext_t;
#define _UC_MACHINE_SP(uc) ((uc)->uc_mcontext.__gregs[_REG_SP])
-#define _UC_MACHINE_FP(uc) ((uc)->uc_mcontext.__gregs[_REG_R14])
#define _UC_MACHINE_PC(uc) ((uc)->uc_mcontext.__gregs[_REG_PC])
#define _UC_MACHINE_INTRV(uc) ((uc)->uc_mcontext.__gregs[_REG_R0])
Index: src/sys/arch/sparc/include/mcontext.h
diff -u src/sys/arch/sparc/include/mcontext.h:1.13.32.1 src/sys/arch/sparc/include/mcontext.h:1.13.32.2
--- src/sys/arch/sparc/include/mcontext.h:1.13.32.1 Sun Feb 25 23:50:23 2018
+++ src/sys/arch/sparc/include/mcontext.h Mon Feb 26 04:32:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.13.32.1 2018/02/25 23:50:23 snj Exp $ */
+/* $NetBSD: mcontext.h,v 1.13.32.2 2018/02/26 04:32:30 snj Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,11 +30,11 @@
*/
#ifndef _SPARC_MCONTEXT_H_
-#define _SPARC_MCONTEXT_H_
+#define _SPARC_MCONTEXT_H_
-#define _UC_SETSTACK 0x00010000
-#define _UC_CLRSTACK 0x00020000
-#define _UC_TLSBASE 0x00080000
+#define _UC_SETSTACK 0x00010000
+#define _UC_CLRSTACK 0x00020000
+#define _UC_TLSBASE 0x00080000
/*
* Layout of mcontext_t according the System V Application Binary Interface,
@@ -144,13 +144,13 @@ typedef struct {
} mcontext_t;
#ifdef __arch64__
-#define _UC_MACHINE_PAD 8 /* Padding appended to ucontext_t */
-#define _UC_MACHINE_SP(uc) (((uc)->uc_mcontext.__gregs[_REG_O6]) + 0x7ff)
-#define _UC_MACHINE_FP(uc) (((__greg_t *)_UC_MACHINE_SP(uc))[15])
+#define _UC_MACHINE_PAD 8 /* Padding appended to ucontext_t */
+#define _UC_MACHINE_SP(uc) (((uc)->uc_mcontext.__gregs[_REG_O6])+0x7ff)
+#define _UC_MACHINE32_PAD 43 /* compat_netbsd32 variant */
+#define _UC_MACHINE32_SP(uc) ((uc)->uc_mcontext.__gregs[_REG_O6])
#else
-#define _UC_MACHINE_PAD 43 /* Padding appended to ucontext_t */
+#define _UC_MACHINE_PAD 43 /* Padding appended to ucontext_t */
#define _UC_MACHINE_SP(uc) ((uc)->uc_mcontext.__gregs[_REG_O6])
-#define _UC_MACHINE_FP(uc) (((__greg_t *)_UC_MACHINE_SP(uc))[15])
#endif
#define _UC_MACHINE_PC(uc) ((uc)->uc_mcontext.__gregs[_REG_PC])
#define _UC_MACHINE_INTRV(uc) ((uc)->uc_mcontext.__gregs[_REG_O0])
Index: src/sys/arch/sparc64/include/mcontext.h
diff -u src/sys/arch/sparc64/include/mcontext.h:1.9.32.1 src/sys/arch/sparc64/include/mcontext.h:1.9.32.2
--- src/sys/arch/sparc64/include/mcontext.h:1.9.32.1 Sun Feb 25 23:50:23 2018
+++ src/sys/arch/sparc64/include/mcontext.h Mon Feb 26 04:32:30 2018
@@ -1,11 +1,11 @@
-/* $NetBSD: mcontext.h,v 1.9.32.1 2018/02/25 23:50:23 snj Exp $ */
+/* $NetBSD: mcontext.h,v 1.9.32.2 2018/02/26 04:32:30 snj Exp $ */
#ifndef _SPARC64_MCONTEXT_H_
-#define _SPARC64_MCONTEXT_H_
+#define _SPARC64_MCONTEXT_H_
#include <sparc/mcontext.h>
-#define _NGREG32 19 /* %psr, pc, npc, %g1-7, %o0-7 */
+#define _NGREG32 19 /* %psr, pc, npc, %g1-7, %o0-7 */
typedef int __greg32_t;
typedef __greg32_t __gregset32_t[_NGREG32];
@@ -76,8 +76,4 @@ typedef struct {
#define _UC_CLRSTACK 0x00020000
#define _UC_TLSBASE 0x00080000
-#define _UC_MACHINE32_PAD 43 /* compat_netbsd32 variant */
-#define _UC_MACHINE32_SP(uc) ((uc)->uc_mcontext.__gregs[_REG_O6])
-#define _UC_MACHINE32_FP(uc) (((__greg32_t *)_UC_MACHINE32_SP(uc))[15])
-
#endif /* _SPARC64_MCONTEXT_H_ */
Index: src/sys/arch/vax/include/mcontext.h
diff -u src/sys/arch/vax/include/mcontext.h:1.8.40.1 src/sys/arch/vax/include/mcontext.h:1.8.40.2
--- src/sys/arch/vax/include/mcontext.h:1.8.40.1 Sun Feb 25 23:50:23 2018
+++ src/sys/arch/vax/include/mcontext.h Mon Feb 26 04:32:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.8.40.1 2018/02/25 23:50:23 snj Exp $ */
+/* $NetBSD: mcontext.h,v 1.8.40.2 2018/02/26 04:32:30 snj Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -68,7 +68,6 @@ typedef struct {
#define _UC_TLSBASE 0x00080000
#define _UC_MACHINE_SP(uc) ((uc)->uc_mcontext.__gregs[_REG_SP])
-#define _UC_MACHINE_FP(uc) ((uc)->uc_mcontext.__gregs[_REG_FP])
#define _UC_MACHINE_PC(uc) ((uc)->uc_mcontext.__gregs[_REG_PC])
#define _UC_MACHINE_INTRV(uc) ((uc)->uc_mcontext.__gregs[_REG_R0])
Index: src/tests/lib/libc/sys/Makefile
diff -u src/tests/lib/libc/sys/Makefile:1.49.4.1 src/tests/lib/libc/sys/Makefile:1.49.4.2
--- src/tests/lib/libc/sys/Makefile:1.49.4.1 Sun Feb 25 23:50:23 2018
+++ src/tests/lib/libc/sys/Makefile Mon Feb 26 04:32:31 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49.4.1 2018/02/25 23:50:23 snj Exp $
+# $NetBSD: Makefile,v 1.49.4.2 2018/02/26 04:32:31 snj Exp $
MKMAN= no
@@ -96,7 +96,6 @@ CPPFLAGS.t_ptrace_wait4.c += -D_KERNTYPE
CPPFLAGS.t_ptrace_wait6.c += -D_KERNTYPES
CPPFLAGS.t_ptrace_waitid.c += -D_KERNTYPES
CPPFLAGS.t_ptrace_waitpid.c += -D_KERNTYPES
-CPPFLAGS.t_ucontext.c += -D_KERNTYPES
FILES= truncate_test.root_owned
FILESBUILD= yes
Index: src/tests/lib/libc/sys/t_ucontext.c
diff -u src/tests/lib/libc/sys/t_ucontext.c:1.1.34.1 src/tests/lib/libc/sys/t_ucontext.c:1.1.34.2
--- src/tests/lib/libc/sys/t_ucontext.c:1.1.34.1 Sun Feb 25 23:50:23 2018
+++ src/tests/lib/libc/sys/t_ucontext.c Mon Feb 26 04:32:31 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ucontext.c,v 1.1.34.1 2018/02/25 23:50:23 snj Exp $ */
+/* $NetBSD: t_ucontext.c,v 1.1.34.2 2018/02/26 04:32:31 snj Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
__COPYRIGHT("@(#) Copyright (c) 2008\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_ucontext.c,v 1.1.34.1 2018/02/25 23:50:23 snj Exp $");
+__RCSID("$NetBSD: t_ucontext.c,v 1.1.34.2 2018/02/26 04:32:31 snj Exp $");
#include <atf-c.h>
#include <stdio.h>
@@ -68,73 +68,9 @@ ATF_TC_BODY(ucontext_basic, tc)
ATF_REQUIRE_EQ(y, 21);
}
-ATF_TC(ucontext_sp);
-ATF_TC_HEAD(ucontext_sp, tc)
-{
- atf_tc_set_md_var(tc, "descr", "Retrive _UC_MACHINE_SP()");
-}
-
-ATF_TC_BODY(ucontext_sp, tc)
-{
- ucontext_t u;
-
- getcontext(&u);
-
- printf("_UC_MACHINE_SP(u)=%" PRIxREGISTER "\n", _UC_MACHINE_SP(&u));
-}
-
-ATF_TC(ucontext_fp);
-ATF_TC_HEAD(ucontext_fp, tc)
-{
- atf_tc_set_md_var(tc, "descr", "Retrive _UC_MACHINE_FP()");
-}
-
-ATF_TC_BODY(ucontext_fp, tc)
-{
- ucontext_t u;
-
- getcontext(&u);
-
- printf("_UC_MACHINE_FP(u)=%" PRIxREGISTER "\n", _UC_MACHINE_FP(&u));
-}
-
-ATF_TC(ucontext_pc);
-ATF_TC_HEAD(ucontext_pc, tc)
-{
- atf_tc_set_md_var(tc, "descr", "Retrive _UC_MACHINE_PC()");
-}
-
-ATF_TC_BODY(ucontext_pc, tc)
-{
- ucontext_t u;
-
- getcontext(&u);
-
- printf("_UC_MACHINE_PC(u)=%" PRIxREGISTER "\n", _UC_MACHINE_PC(&u));
-}
-
-ATF_TC(ucontext_intrv);
-ATF_TC_HEAD(ucontext_intrv, tc)
-{
- atf_tc_set_md_var(tc, "descr", "Retrive _UC_MACHINE_INTRV()");
-}
-
-ATF_TC_BODY(ucontext_intrv, tc)
-{
- ucontext_t u;
-
- getcontext(&u);
-
- printf("_UC_MACHINE_INTRV(u)=%" PRIxREGISTER "\n", _UC_MACHINE_INTRV(&u));
-}
-
ATF_TP_ADD_TCS(tp)
{
ATF_TP_ADD_TC(tp, ucontext_basic);
- ATF_TP_ADD_TC(tp, ucontext_sp);
- ATF_TP_ADD_TC(tp, ucontext_fp);
- ATF_TP_ADD_TC(tp, ucontext_pc);
- ATF_TP_ADD_TC(tp, ucontext_intrv);
return atf_no_error();
}
