[src/trunk]: src/sys/arch/sh3/sh3 Revert rename back to OFSET, since the name...

[andvar <andvar%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/31cb38e848e0
branches:  trunk
changeset: 1022600:31cb38e848e0
user:      andvar <andvar%NetBSD.org@localhost>
date:      Mon Jul 26 21:43:11 2021 +0000

description:
Revert rename back to OFSET, since the name follows historical PGOFSET definition. Noted by tsutsui.

diffstat:

 sys/arch/sh3/sh3/exception_vector.S |   6 +++---
 sys/arch/sh3/sh3/pmap.c             |  12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diffs (81 lines):

diff -r 527c4db03e1e -r 31cb38e848e0 sys/arch/sh3/sh3/exception_vector.S
--- a/sys/arch/sh3/sh3/exception_vector.S       Mon Jul 26 20:17:09 2021 +0000
+++ b/sys/arch/sh3/sh3/exception_vector.S       Mon Jul 26 21:43:11 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exception_vector.S,v 1.52 2021/07/24 21:31:35 andvar Exp $     */
+/*     $NetBSD: exception_vector.S,v 1.53 2021/07/26 21:43:11 andvar Exp $     */
 
 /*-
  * Copyright (c) 2002, 2019 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
 #define _ALIGN_TEXT    .align 5
 #include <sh3/asm.h>
 
-__KERNEL_RCSID(0, "$NetBSD: exception_vector.S,v 1.52 2021/07/24 21:31:35 andvar Exp $")
+__KERNEL_RCSID(0, "$NetBSD: exception_vector.S,v 1.53 2021/07/26 21:43:11 andvar Exp $")
 
 
 /*
@@ -220,7 +220,7 @@
        bt/s    .L3_call_tlb_exception
         mov    #-(PGSHIFT - 2), r1
 
-       !! __PMAP_PTP_OFFSET(vpn) - except we pre-shift 2 bits left to
+       !! __PMAP_PTP_OFSET(vpn) - except we pre-shift 2 bits left to
        !! get the array offset directly, as we know bits 10 and 11
        !! are zero (we cleaned them in r5 to get 4K aligned VPN)
        shld    r1, r2          ! vpn >> (PGSHIFT - 2)
diff -r 527c4db03e1e -r 31cb38e848e0 sys/arch/sh3/sh3/pmap.c
--- a/sys/arch/sh3/sh3/pmap.c   Mon Jul 26 20:17:09 2021 +0000
+++ b/sys/arch/sh3/sh3/pmap.c   Mon Jul 26 21:43:11 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.84 2021/07/24 21:31:35 andvar Exp $ */
+/*     $NetBSD: pmap.c,v 1.85 2021/07/26 21:43:11 andvar Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.84 2021/07/24 21:31:35 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.85 2021/07/26 21:43:11 andvar Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -55,7 +55,7 @@
        (((va) + (1 << __PMAP_PTP_SHIFT) - 1) & ~((1 << __PMAP_PTP_SHIFT) - 1))
 #define        __PMAP_PTP_PG_N         (PAGE_SIZE / sizeof(pt_entry_t))
 #define        __PMAP_PTP_INDEX(va)    (((va) >> __PMAP_PTP_SHIFT) & (__PMAP_PTP_N - 1))
-#define        __PMAP_PTP_OFFSET(va)   ((va >> PGSHIFT) & (__PMAP_PTP_PG_N - 1))
+#define        __PMAP_PTP_OFSET(va)    ((va >> PGSHIFT) & (__PMAP_PTP_PG_N - 1))
 
 struct pmap __pmap_kernel;
 struct pmap *const kernel_pmap_ptr = &__pmap_kernel;
@@ -966,7 +966,7 @@
        ptp = (pt_entry_t *)SH3_PHYS_TO_P1SEG(VM_PAGE_TO_PHYS(pg));
        pmap->pm_ptp[__PMAP_PTP_INDEX(va)] = ptp;
 
-       return (ptp + __PMAP_PTP_OFFSET(va));
+       return (ptp + __PMAP_PTP_OFSET(va));
 }
 
 /*
@@ -986,7 +986,7 @@
        if (ptp == NULL)
                return (NULL);
 
-       return (ptp + __PMAP_PTP_OFFSET(va));
+       return (ptp + __PMAP_PTP_OFSET(va));
 }
 
 /*
@@ -1002,7 +1002,7 @@
        if (ptp == NULL)
                return NULL;
 
-       return (ptp + __PMAP_PTP_OFFSET(va));
+       return (ptp + __PMAP_PTP_OFSET(va));
 }
 
 /*