Module Name: src
Committed By: skrll
Date: Thu Oct 15 05:43:38 UTC 2020
Modified Files:
src/lib/libc/arch/hppa: genassym.cf
src/lib/libc/arch/hppa/gen: swapcontext.S
src/lib/libc/arch/hppa/sys: getcontext.S
Log Message:
Remove '_OFFSETOF' prefix for genassm(1) generate CPP identifers for
consistency with other arches.
NFCI and libc.so is the same before and after.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/hppa/genassym.cf
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/arch/hppa/gen/swapcontext.S
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/hppa/sys/getcontext.S
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/genassym.cf
diff -u src/lib/libc/arch/hppa/genassym.cf:1.1 src/lib/libc/arch/hppa/genassym.cf:1.2
--- src/lib/libc/arch/hppa/genassym.cf:1.1 Wed Feb 19 13:01:51 2014
+++ src/lib/libc/arch/hppa/genassym.cf Thu Oct 15 05:43:38 2020
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.1 2014/02/19 13:01:51 skrll Exp $
+# $NetBSD: genassym.cf,v 1.2 2020/10/15 05:43:38 skrll Exp $
#
# Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -36,4 +36,4 @@ 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])
+define _UC_GREGS offsetof(ucontext_t, uc_mcontext.__gregs[0])
Index: src/lib/libc/arch/hppa/gen/swapcontext.S
diff -u src/lib/libc/arch/hppa/gen/swapcontext.S:1.7 src/lib/libc/arch/hppa/gen/swapcontext.S:1.8
--- src/lib/libc/arch/hppa/gen/swapcontext.S:1.7 Tue May 5 06:20:55 2020
+++ src/lib/libc/arch/hppa/gen/swapcontext.S Thu Oct 15 05:43:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: swapcontext.S,v 1.7 2020/05/05 06:20:55 skrll Exp $ */
+/* $NetBSD: swapcontext.S,v 1.8 2020/10/15 05:43:38 skrll Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include <machine/mcontext.h>
#if defined(SYSLIBC_SCCS) && !defined(lint)
- RCSID("$NetBSD: swapcontext.S,v 1.7 2020/05/05 06:20:55 skrll Exp $")
+ RCSID("$NetBSD: swapcontext.S,v 1.8 2020/10/15 05:43:38 skrll Exp $")
#endif /* SYSLIBC_SCCS && !lint */
LEAF_ENTRY(swapcontext)
@@ -49,10 +49,10 @@ LEAF_ENTRY(swapcontext)
ldw HPPA_FRAME_CRP(%sp), %rp
ldo 4(%rp), %r1
- stw %r1, (_OFFSETOF_UC_GREGS + _REG_PCOQT * SZREG)(%arg1)
- stw %rp, (_OFFSETOF_UC_GREGS + _REG_PCOQH * SZREG)(%arg1)
+ stw %r1, (_UC_GREGS + _REG_PCOQT * SZREG)(%arg1)
+ stw %rp, (_UC_GREGS + _REG_PCOQH * SZREG)(%arg1)
bl setcontext, %rp
- stw %r0, (_OFFSETOF_UC_GREGS + _REG_RET0 * SZREG)(%arg1)
+ stw %r0, (_UC_GREGS + _REG_RET0 * SZREG)(%arg1)
ldw HPPA_FRAME_CRP(%sp), %rp
bv,n %r0(%rp)
Index: src/lib/libc/arch/hppa/sys/getcontext.S
diff -u src/lib/libc/arch/hppa/sys/getcontext.S:1.6 src/lib/libc/arch/hppa/sys/getcontext.S:1.7
--- src/lib/libc/arch/hppa/sys/getcontext.S:1.6 Tue May 5 06:20:55 2020
+++ src/lib/libc/arch/hppa/sys/getcontext.S Thu Oct 15 05:43:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: getcontext.S,v 1.6 2020/05/05 06:20:55 skrll Exp $ */
+/* $NetBSD: getcontext.S,v 1.7 2020/10/15 05:43:38 skrll Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,9 +38,9 @@ WEAK_ALIAS(getcontext, _getcontext)
ENTRY(_getcontext, 0)
SYSCALL(getcontext)
- stw %rp, (_OFFSETOF_UC_GREGS + _REG_PCOQH * SZREG)(%arg0)
+ stw %rp, (_UC_GREGS + _REG_PCOQH * SZREG)(%arg0)
ldo 4(%rp), %r1
- stw %r1, (_OFFSETOF_UC_GREGS + _REG_PCOQT * SZREG)(%arg0)
+ stw %r1, (_UC_GREGS + _REG_PCOQT * SZREG)(%arg0)
bv %r0(%rp)
- stw %r0, (_OFFSETOF_UC_GREGS + _REG_RET0 * SZREG)(%arg0)
+ stw %r0, (_UC_GREGS + _REG_RET0 * SZREG)(%arg0)
EXIT(_getcontext)
