Module Name: src
Committed By: maxv
Date: Mon Nov 19 20:28:01 UTC 2018
Modified Files:
src/sys/arch/amd64/include: pmap.h
src/sys/arch/i386/include: pmap.h
src/sys/arch/x86/include: pmap.h
src/sys/arch/x86/x86: pmap.c svs.c
Log Message:
Rename 'mask' -> 'frame', we will use the real 'mask' soon.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/amd64/include/pmap.h
cvs rdiff -u -r1.119 -r1.120 src/sys/arch/i386/include/pmap.h
cvs rdiff -u -r1.89 -r1.90 src/sys/arch/x86/include/pmap.h
cvs rdiff -u -r1.310 -r1.311 src/sys/arch/x86/x86/pmap.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/x86/x86/svs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/include/pmap.h
diff -u src/sys/arch/amd64/include/pmap.h:1.56 src/sys/arch/amd64/include/pmap.h:1.57
--- src/sys/arch/amd64/include/pmap.h:1.56 Wed Aug 29 06:28:50 2018
+++ src/sys/arch/amd64/include/pmap.h Mon Nov 19 20:28:01 2018
@@ -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 @@ extern pt_entry_t *pte_base;
#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 }
Index: src/sys/arch/i386/include/pmap.h
diff -u src/sys/arch/i386/include/pmap.h:1.119 src/sys/arch/i386/include/pmap.h:1.120
--- src/sys/arch/i386/include/pmap.h:1.119 Wed Jul 25 11:47:07 2018
+++ src/sys/arch/i386/include/pmap.h Mon Nov 19 20:28:01 2018
@@ -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 }
Index: src/sys/arch/x86/include/pmap.h
diff -u src/sys/arch/x86/include/pmap.h:1.89 src/sys/arch/x86/include/pmap.h:1.90
--- src/sys/arch/x86/include/pmap.h:1.89 Wed Nov 7 07:14:51 2018
+++ src/sys/arch/x86/include/pmap.h Mon Nov 19 20:28:01 2018
@@ -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:
Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.310 src/sys/arch/x86/x86/pmap.c:1.311
--- src/sys/arch/x86/x86/pmap.c:1.310 Wed Nov 7 07:14:51 2018
+++ src/sys/arch/x86/x86/pmap.c Mon Nov 19 20:28:01 2018
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.3
* 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 @@ pmap_remove(struct pmap *pmap, vaddr_t s
/*
* 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;
}
Index: src/sys/arch/x86/x86/svs.c
diff -u src/sys/arch/x86/x86/svs.c:1.20 src/sys/arch/x86/x86/svs.c:1.21
--- src/sys/arch/x86/x86/svs.c:1.20 Sun Aug 12 12:23:33 2018
+++ src/sys/arch/x86/x86/svs.c Mon Nov 19 20:28:01 2018
@@ -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 @@ struct svs_utls {
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;
