Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Rename __MD_CANONICAL_BASE -> __MD_KERNMEM_BASE for...
details: https://anonhg.NetBSD.org/src/rev/2d34876135c3
branches: trunk
changeset: 935062:2d34876135c3
user: maxv <maxv%NetBSD.org@localhost>
date: Tue Jun 23 17:21:55 2020 +0000
description:
Rename __MD_CANONICAL_BASE -> __MD_KERNMEM_BASE for clarity.
diffstat:
sys/arch/aarch64/include/asan.h | 6 +++---
sys/arch/amd64/include/asan.h | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diffs (54 lines):
diff -r 10f2ac88ea93 -r 2d34876135c3 sys/arch/aarch64/include/asan.h
--- a/sys/arch/aarch64/include/asan.h Tue Jun 23 16:08:46 2020 +0000
+++ b/sys/arch/aarch64/include/asan.h Tue Jun 23 17:21:55 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: asan.h,v 1.6 2019/04/08 21:18:22 ryo Exp $ */
+/* $NetBSD: asan.h,v 1.7 2020/06/23 17:21:55 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
#include <aarch64/machdep.h>
#define __MD_VIRTUAL_SHIFT 48 /* 49bit address space, cut half */
-#define __MD_CANONICAL_BASE 0xFFFF000000000000
+#define __MD_KERNMEM_BASE 0xFFFF000000000000 /* kern mem base address */
#define __MD_SHADOW_SIZE (1ULL << (__MD_VIRTUAL_SHIFT - KASAN_SHADOW_SCALE_SHIFT))
#define KASAN_MD_SHADOW_START (AARCH64_KSEG_END)
@@ -52,7 +52,7 @@
{
vaddr_t va = (vaddr_t)addr;
return (int8_t *)(KASAN_MD_SHADOW_START +
- ((va - __MD_CANONICAL_BASE) >> KASAN_SHADOW_SCALE_SHIFT));
+ ((va - __MD_KERNMEM_BASE) >> KASAN_SHADOW_SCALE_SHIFT));
}
static inline bool
diff -r 10f2ac88ea93 -r 2d34876135c3 sys/arch/amd64/include/asan.h
--- a/sys/arch/amd64/include/asan.h Tue Jun 23 16:08:46 2020 +0000
+++ b/sys/arch/amd64/include/asan.h Tue Jun 23 17:21:55 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: asan.h,v 1.6 2020/05/02 16:28:37 maxv Exp $ */
+/* $NetBSD: asan.h,v 1.7 2020/06/23 17:21:55 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
#endif
#define __MD_VIRTUAL_SHIFT 47 /* 48bit address space, cut half */
-#define __MD_CANONICAL_BASE 0xFFFF800000000000
+#define __MD_KERNMEM_BASE 0xFFFF800000000000 /* kern mem base address */
#define __MD_SHADOW_SIZE (1ULL << (__MD_VIRTUAL_SHIFT - KASAN_SHADOW_SCALE_SHIFT))
#define KASAN_MD_SHADOW_START (VA_SIGN_NEG((L4_SLOT_KASAN * NBPD_L4)))
@@ -113,7 +113,7 @@
{
vaddr_t va = (vaddr_t)addr;
return (int8_t *)(KASAN_MD_SHADOW_START +
- ((va - __MD_CANONICAL_BASE) >> KASAN_SHADOW_SCALE_SHIFT));
+ ((va - __MD_KERNMEM_BASE) >> KASAN_SHADOW_SCALE_SHIFT));
}
static inline bool
Home |
Main Index |
Thread Index |
Old Index