Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/libc/arch/hppa Remove '_OFFSETOF' prefix for genassm(1) ...



details:   https://anonhg.NetBSD.org/src/rev/abf672b673ca
branches:  trunk
changeset: 1015129:abf672b673ca
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu Oct 15 05:43:38 2020 +0000

description:
Remove '_OFFSETOF' prefix for genassm(1) generate CPP identifers for
consistency with other arches.

NFCI and libc.so is the same before and after.

diffstat:

 lib/libc/arch/hppa/gen/swapcontext.S |  10 +++++-----
 lib/libc/arch/hppa/genassym.cf       |   4 ++--
 lib/libc/arch/hppa/sys/getcontext.S  |   8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diffs (69 lines):

diff -r e0061d877788 -r abf672b673ca lib/libc/arch/hppa/gen/swapcontext.S
--- a/lib/libc/arch/hppa/gen/swapcontext.S      Thu Oct 15 05:27:53 2020 +0000
+++ b/lib/libc/arch/hppa/gen/swapcontext.S      Thu Oct 15 05:43:38 2020 +0000
@@ -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 @@
 
        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)
diff -r e0061d877788 -r abf672b673ca lib/libc/arch/hppa/genassym.cf
--- a/lib/libc/arch/hppa/genassym.cf    Thu Oct 15 05:27:53 2020 +0000
+++ b/lib/libc/arch/hppa/genassym.cf    Thu Oct 15 05:43:38 2020 +0000
@@ -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_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])
diff -r e0061d877788 -r abf672b673ca lib/libc/arch/hppa/sys/getcontext.S
--- a/lib/libc/arch/hppa/sys/getcontext.S       Thu Oct 15 05:27:53 2020 +0000
+++ b/lib/libc/arch/hppa/sys/getcontext.S       Thu Oct 15 05:43:38 2020 +0000
@@ -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 @@
 
 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)



Home | Main Index | Thread Index | Old Index