Module Name: src
Committed By: ryo
Date: Sat Feb 29 21:30:19 UTC 2020
Modified Files:
src/sys/arch/aarch64/aarch64: db_machdep.c
Log Message:
use macro
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/aarch64/aarch64/db_machdep.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/aarch64/aarch64/db_machdep.c
diff -u src/sys/arch/aarch64/aarch64/db_machdep.c:1.19 src/sys/arch/aarch64/aarch64/db_machdep.c:1.20
--- src/sys/arch/aarch64/aarch64/db_machdep.c:1.19 Sat Sep 7 09:27:25 2019
+++ src/sys/arch/aarch64/aarch64/db_machdep.c Sat Feb 29 21:30:19 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.c,v 1.19 2019/09/07 09:27:25 ryo Exp $ */
+/* $NetBSD: db_machdep.c,v 1.20 2020/02/29 21:30:19 ryo Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.19 2019/09/07 09:27:25 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.20 2020/02/29 21:30:19 ryo Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd32.h"
@@ -375,7 +375,8 @@ db_md_lwp_cmd(db_expr_t addr, bool have_
static void
db_par_print(uint64_t par, vaddr_t va)
{
- paddr_t pa = (__SHIFTOUT(par, PAR_PA) << 12) + (va & 0xfff);
+ paddr_t pa = (__SHIFTOUT(par, PAR_PA) << PAR_PA_SHIFT) +
+ (va & __BITS(PAR_PA_SHIFT - 1, 0));
db_printf("%016"PRIx64": ATTR=0x%02lx, NS=%ld, S=%ld, SHA=%ld, PTW=%ld"
", FST=%ld, F=%ld, PA=%016"PRIxPADDR"\n",
