Module Name: src
Committed By: skrll
Date: Sat Oct 12 12:27:33 UTC 2024
Modified Files:
src/distrib/sets/lists/comp: ad.riscv
src/sys/arch/riscv/include: Makefile pte.h
Log Message:
Install pte.h for libkvm
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/comp/ad.riscv
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/riscv/include/Makefile
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/riscv/include/pte.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/ad.riscv
diff -u src/distrib/sets/lists/comp/ad.riscv:1.22 src/distrib/sets/lists/comp/ad.riscv:1.23
--- src/distrib/sets/lists/comp/ad.riscv:1.22 Thu Jul 11 20:41:06 2024
+++ src/distrib/sets/lists/comp/ad.riscv Sat Oct 12 12:27:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.riscv,v 1.22 2024/07/11 20:41:06 riastradh Exp $
+# $NetBSD: ad.riscv,v 1.23 2024/10/12 12:27:33 skrll Exp $
#
./usr/include/g++/bits/riscv32 comp-c-include arch64,compat
./usr/include/g++/bits/riscv32/c++config.h comp-c-include arch64,gcc,compat
@@ -46,6 +46,7 @@
./usr/include/riscv/pmc.h comp-obsolete obsolete
./usr/include/riscv/proc.h comp-c-include
./usr/include/riscv/profile.h comp-c-include
+./usr/include/riscv/pte.h comp-c-include
./usr/include/riscv/ptrace.h comp-c-include
./usr/include/riscv/reg.h comp-c-include
./usr/include/riscv/rwlock.h comp-c-include
Index: src/sys/arch/riscv/include/Makefile
diff -u src/sys/arch/riscv/include/Makefile:1.2 src/sys/arch/riscv/include/Makefile:1.3
--- src/sys/arch/riscv/include/Makefile:1.2 Thu Jul 12 10:46:46 2018
+++ src/sys/arch/riscv/include/Makefile Sat Oct 12 12:27:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/07/12 10:46:46 maxv Exp $
+# $NetBSD: Makefile,v 1.3 2024/10/12 12:27:33 skrll Exp $
INCSDIR= /usr/include/riscv
@@ -14,7 +14,7 @@ INCS= ansi.h aout_machdep.h asm.h \
limits.h lock.h \
math.h mcontext.h mutex.h \
param.h pcb.h pmap.h \
- proc.h profile.h ptrace.h \
+ proc.h profile.h pte.h ptrace.h \
reg.h rwlock.h \
setjmp.h signal.h sysarch.h sysreg.h \
types.h \
Index: src/sys/arch/riscv/include/pte.h
diff -u src/sys/arch/riscv/include/pte.h:1.13 src/sys/arch/riscv/include/pte.h:1.14
--- src/sys/arch/riscv/include/pte.h:1.13 Sun May 7 12:41:48 2023
+++ src/sys/arch/riscv/include/pte.h Sat Oct 12 12:27:33 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: pte.h,v 1.13 2023/05/07 12:41:48 skrll Exp $ */
+/* $NetBSD: pte.h,v 1.14 2024/10/12 12:27:33 skrll Exp $ */
/*
* Copyright (c) 2014, 2019, 2021 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@ typedef uint32_t pd_entry_t;
#define PTE_PPN_SHIFT 10
-#define NPTEPG (PAGE_SIZE / sizeof(pt_entry_t))
+#define NPTEPG (NBPG / sizeof(pt_entry_t))
#define NSEGPG NPTEPG
#define NPDEPG NPTEPG
@@ -86,10 +86,10 @@ typedef uint32_t pd_entry_t;
#define PTE_ISLEAF_P(pte) (((pte) & PTE_RWX) != 0)
-#define PA_TO_PTE(pa) (((pa) >> PAGE_SHIFT) << PTE_PPN_SHIFT)
-#define PTE_TO_PA(pte) (((pte) >> PTE_PPN_SHIFT) << PAGE_SHIFT)
-
+#define PA_TO_PTE(pa) (((pa) >> PGSHIFT) << PTE_PPN_SHIFT)
+#define PTE_TO_PA(pte) (((pte) >> PTE_PPN_SHIFT) << PGSHIFT)
+#if defined(_KERNEL)
static inline bool
pte_valid_p(pt_entry_t pte)
@@ -251,13 +251,13 @@ pte_invalid_pde(void)
static inline pd_entry_t
pte_pde_pdetab(paddr_t pa, bool kernel_p)
{
- return PTE_V | (pa >> PAGE_SHIFT) << PTE_PPN_SHIFT;
+ return PTE_V | PA_TO_PTE(pa);
}
static inline pd_entry_t
pte_pde_ptpage(paddr_t pa, bool kernel_p)
{
- return PTE_V | (pa >> PAGE_SHIFT) << PTE_PPN_SHIFT;
+ return PTE_V | PA_TO_PTE(pa);
}
static inline bool
@@ -294,11 +294,12 @@ pte_pde_set(pd_entry_t *pdep, pd_entry_t
*pdep = npde;
}
-
static inline pt_entry_t
pte_value(pt_entry_t pte)
{
return pte;
}
+#endif /* _KERNEL */
+
#endif /* _RISCV_PTE_H_ */
