[src/trunk]: src/sys/arch Rename 'mask' -> 'frame', we will use the real 'mas...

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

details:   https://anonhg.NetBSD.org/src/rev/5eeba1d4b870
branches:  trunk
changeset: 445997:5eeba1d4b870
user:      maxv <maxv%NetBSD.org@localhost>
date:      Mon Nov 19 20:28:01 2018 +0000

description:
Rename 'mask' -> 'frame', we will use the real 'mask' soon.

diffstat:

 sys/arch/amd64/include/pmap.h |  4 ++--
 sys/arch/i386/include/pmap.h  |  4 ++--
 sys/arch/x86/include/pmap.h   |  6 +++---
 sys/arch/x86/x86/pmap.c       |  8 ++++----
 sys/arch/x86/x86/svs.c        |  6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)

diffs (120 lines):

diff -r 7e6ad2cc2e1a -r 5eeba1d4b870 sys/arch/amd64/include/pmap.h
--- a/sys/arch/amd64/include/pmap.h     Mon Nov 19 20:05:37 2018 +0000
+++ b/sys/arch/amd64/include/pmap.h     Mon Nov 19 20:28:01 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.h,v 1.56 2018/08/29 06:28:50 maxv Exp $   */
+/*     $NetBSD: pmap.h,v 1.57 2018/11/19 20:28:01 maxv Exp $   */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -150,7 +150,7 @@
 #define NKL2_START_ENTRIES     0
 #define NKL1_START_ENTRIES     0
 
-#define PTP_MASK_INITIALIZER   { L1_FRAME, L2_FRAME, L3_FRAME, L4_FRAME }
+#define PTP_FRAME_INITIALIZER  { L1_FRAME, L2_FRAME, L3_FRAME, L4_FRAME }
 #define PTP_SHIFT_INITIALIZER  { L1_SHIFT, L2_SHIFT, L3_SHIFT, L4_SHIFT }
 #define NKPTP_INITIALIZER      { NKL1_START_ENTRIES, NKL2_START_ENTRIES, \
                                  NKL3_START_ENTRIES, NKL4_START_ENTRIES }
diff -r 7e6ad2cc2e1a -r 5eeba1d4b870 sys/arch/i386/include/pmap.h
--- a/sys/arch/i386/include/pmap.h      Mon Nov 19 20:05:37 2018 +0000
+++ b/sys/arch/i386/include/pmap.h      Mon Nov 19 20:28:01 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.h,v 1.119 2018/07/25 11:47:07 maxv Exp $  */
+/*     $NetBSD: pmap.h,v 1.120 2018/11/19 20:28:01 maxv Exp $  */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -267,7 +267,7 @@
 #endif  /* !XEN */
 #define NPDPG                  (PAGE_SIZE / sizeof (pd_entry_t))
 
-#define PTP_MASK_INITIALIZER   { L1_FRAME, L2_FRAME }
+#define PTP_FRAME_INITIALIZER  { L1_FRAME, L2_FRAME }
 #define PTP_SHIFT_INITIALIZER  { L1_SHIFT, L2_SHIFT }
 #define NKPTP_INITIALIZER      { NKL1_START_ENTRIES, NKL2_START_ENTRIES }
 #define NKPTPMAX_INITIALIZER   { NKL1_MAX_ENTRIES, NKL2_MAX_ENTRIES }
diff -r 7e6ad2cc2e1a -r 5eeba1d4b870 sys/arch/x86/include/pmap.h
--- a/sys/arch/x86/include/pmap.h       Mon Nov 19 20:05:37 2018 +0000
+++ b/sys/arch/x86/include/pmap.h       Mon Nov 19 20:28:01 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.h,v 1.89 2018/11/07 07:14:51 maxv Exp $   */
+/*     $NetBSD: pmap.h,v 1.90 2018/11/19 20:28:01 maxv Exp $   */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -86,9 +86,9 @@
 #define pl3_i(VA)      (((VA_SIGN_POS(VA)) & L3_FRAME) >> L3_SHIFT)
 #define pl4_i(VA)      (((VA_SIGN_POS(VA)) & L4_FRAME) >> L4_SHIFT)
 #define pl_i(va, lvl) \
-        (((VA_SIGN_POS(va)) & ptp_masks[(lvl)-1]) >> ptp_shifts[(lvl)-1])
+        (((VA_SIGN_POS(va)) & ptp_frames[(lvl)-1]) >> ptp_shifts[(lvl)-1])
 
-#define        pl_i_roundup(va, lvl)   pl_i((va)+ ~ptp_masks[(lvl)-1], (lvl))
+#define        pl_i_roundup(va, lvl)   pl_i((va)+ ~ptp_frames[(lvl)-1], (lvl))
 
 /*
  * PTP macros:
diff -r 7e6ad2cc2e1a -r 5eeba1d4b870 sys/arch/x86/x86/pmap.c
--- a/sys/arch/x86/x86/pmap.c   Mon Nov 19 20:05:37 2018 +0000
+++ b/sys/arch/x86/x86/pmap.c   Mon Nov 19 20:28:01 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.310 2018/11/07 07:14:51 maxv Exp $  */
+/*     $NetBSD: pmap.c,v 1.311 2018/11/19 20:28:01 maxv Exp $  */
 
 /*
  * Copyright (c) 2008, 2010, 2016, 2017 The NetBSD Foundation, Inc.
@@ -130,7 +130,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.310 2018/11/07 07:14:51 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.311 2018/11/19 20:28:01 maxv Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
@@ -239,7 +239,7 @@
  *   lock it when adding or removing pmaps from this list.
  */
 
-const vaddr_t ptp_masks[] = PTP_MASK_INITIALIZER;
+const vaddr_t ptp_frames[] = PTP_FRAME_INITIALIZER;
 const int ptp_shifts[] = PTP_SHIFT_INITIALIZER;
 const long nkptpmax[] = NKPTPMAX_INITIALIZER;
 const long nbpd[] = NBPD_INITIALIZER;
@@ -3539,7 +3539,7 @@
                        /*
                         * skip a range corresponding to an invalid pde.
                         */
-                       blkendva = (va & ptp_masks[lvl - 1]) + nbpd[lvl - 1];
+                       blkendva = (va & ptp_frames[lvl - 1]) + nbpd[lvl - 1];
                        continue;
                }
 
diff -r 7e6ad2cc2e1a -r 5eeba1d4b870 sys/arch/x86/x86/svs.c
--- a/sys/arch/x86/x86/svs.c    Mon Nov 19 20:05:37 2018 +0000
+++ b/sys/arch/x86/x86/svs.c    Mon Nov 19 20:28:01 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: svs.c,v 1.20 2018/08/12 12:23:33 maxv Exp $    */
+/*     $NetBSD: svs.c,v 1.21 2018/11/19 20:28:01 maxv Exp $    */
 
 /*
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svs.c,v 1.20 2018/08/12 12:23:33 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svs.c,v 1.21 2018/11/19 20:28:01 maxv Exp $");
 
 #include "opt_svs.h"
 
@@ -237,7 +237,7 @@
 static pd_entry_t *
 svs_tree_add(struct cpu_info *ci, vaddr_t va)
 {
-       extern const vaddr_t ptp_masks[];
+       extern const vaddr_t ptp_frames[];
        extern const int ptp_shifts[];
        extern const long nbpd[];
        pd_entry_t *dstpde;