Module Name: src
Committed By: maxv
Date: Tue Mar 19 19:23:39 UTC 2019
Modified Files:
src/tests/lib/libnvmm: h_io_assist.c h_io_assist_asm.S h_mem_assist.c
h_mem_assist_asm.S
Log Message:
Add CVS ids, and rename the PTE bits. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libnvmm/h_io_assist.c
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libnvmm/h_io_assist_asm.S
cvs rdiff -u -r1.6 -r1.7 src/tests/lib/libnvmm/h_mem_assist.c
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libnvmm/h_mem_assist_asm.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libnvmm/h_io_assist.c
diff -u src/tests/lib/libnvmm/h_io_assist.c:1.3 src/tests/lib/libnvmm/h_io_assist.c:1.4
--- src/tests/lib/libnvmm/h_io_assist.c:1.3 Tue Feb 26 12:23:12 2019
+++ src/tests/lib/libnvmm/h_io_assist.c Tue Mar 19 19:23:39 2019
@@ -1,3 +1,5 @@
+/* $NetBSD: h_io_assist.c,v 1.4 2019/03/19 19:23:39 maxv Exp $ */
+
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -183,11 +185,11 @@ map_pages(struct nvmm_machine *mach)
memset(L2, 0, PAGE_SIZE);
memset(L1, 0, PAGE_SIZE);
- L4[0] = PG_V | PG_RW | 0x4000;
- L3[0] = PG_V | PG_RW | 0x5000;
- L2[0] = PG_V | PG_RW | 0x6000;
- L1[0x2000 / PAGE_SIZE] = PG_V | PG_RW | 0x2000;
- L1[0x1000 / PAGE_SIZE] = PG_V | PG_RW | 0x1000;
+ L4[0] = PTE_P | PTE_W | 0x4000;
+ L3[0] = PTE_P | PTE_W | 0x5000;
+ L2[0] = PTE_P | PTE_W | 0x6000;
+ L1[0x2000 / PAGE_SIZE] = PTE_P | PTE_W | 0x2000;
+ L1[0x1000 / PAGE_SIZE] = PTE_P | PTE_W | 0x1000;
}
/* -------------------------------------------------------------------------- */
Index: src/tests/lib/libnvmm/h_io_assist_asm.S
diff -u src/tests/lib/libnvmm/h_io_assist_asm.S:1.1 src/tests/lib/libnvmm/h_io_assist_asm.S:1.2
--- src/tests/lib/libnvmm/h_io_assist_asm.S:1.1 Tue Feb 5 13:00:03 2019
+++ src/tests/lib/libnvmm/h_io_assist_asm.S Tue Mar 19 19:23:39 2019
@@ -1,3 +1,5 @@
+/* $NetBSD: h_io_assist_asm.S,v 1.2 2019/03/19 19:23:39 maxv Exp $ */
+
/*
* Copyright (c) 2019 The NetBSD Foundation, Inc.
* All rights reserved.
Index: src/tests/lib/libnvmm/h_mem_assist.c
diff -u src/tests/lib/libnvmm/h_mem_assist.c:1.6 src/tests/lib/libnvmm/h_mem_assist.c:1.7
--- src/tests/lib/libnvmm/h_mem_assist.c:1.6 Tue Feb 26 12:23:12 2019
+++ src/tests/lib/libnvmm/h_mem_assist.c Tue Mar 19 19:23:39 2019
@@ -1,3 +1,5 @@
+/* $NetBSD: h_mem_assist.c,v 1.7 2019/03/19 19:23:39 maxv Exp $ */
+
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -172,11 +174,11 @@ map_pages(struct nvmm_machine *mach)
memset(L2, 0, PAGE_SIZE);
memset(L1, 0, PAGE_SIZE);
- L4[0] = PG_V | PG_RW | 0x4000;
- L3[0] = PG_V | PG_RW | 0x5000;
- L2[0] = PG_V | PG_RW | 0x6000;
- L1[0x2000 / PAGE_SIZE] = PG_V | PG_RW | 0x2000;
- L1[0x1000 / PAGE_SIZE] = PG_V | PG_RW | 0x1000;
+ L4[0] = PTE_P | PTE_W | 0x4000;
+ L3[0] = PTE_P | PTE_W | 0x5000;
+ L2[0] = PTE_P | PTE_W | 0x6000;
+ L1[0x2000 / PAGE_SIZE] = PTE_P | PTE_W | 0x2000;
+ L1[0x1000 / PAGE_SIZE] = PTE_P | PTE_W | 0x1000;
}
/* -------------------------------------------------------------------------- */
Index: src/tests/lib/libnvmm/h_mem_assist_asm.S
diff -u src/tests/lib/libnvmm/h_mem_assist_asm.S:1.5 src/tests/lib/libnvmm/h_mem_assist_asm.S:1.6
--- src/tests/lib/libnvmm/h_mem_assist_asm.S:1.5 Thu Feb 7 10:58:45 2019
+++ src/tests/lib/libnvmm/h_mem_assist_asm.S Tue Mar 19 19:23:39 2019
@@ -1,3 +1,5 @@
+/* $NetBSD: h_mem_assist_asm.S,v 1.6 2019/03/19 19:23:39 maxv Exp $ */
+
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
* All rights reserved.
