| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | /* $NetBSD: db_machdep.c,v 1.25 2018/08/15 06:00:02 skrll Exp $ */ | | 1 | /* $NetBSD: db_machdep.c,v 1.26 2020/03/25 06:02:09 skrll Exp $ */ |
2 | | | 2 | |
3 | /* | | 3 | /* |
4 | * Copyright (c) 1996 Mark Brinicombe | | 4 | * Copyright (c) 1996 Mark Brinicombe |
5 | * | | 5 | * |
6 | * Mach Operating System | | 6 | * Mach Operating System |
7 | * Copyright (c) 1991,1990 Carnegie Mellon University | | 7 | * Copyright (c) 1991,1990 Carnegie Mellon University |
8 | * All Rights Reserved. | | 8 | * All Rights Reserved. |
9 | * | | 9 | * |
10 | * Permission to use, copy, modify and distribute this software and its | | 10 | * Permission to use, copy, modify and distribute this software and its |
11 | * documentation is hereby granted, provided that both the copyright | | 11 | * documentation is hereby granted, provided that both the copyright |
12 | * notice and this permission notice appear in all copies of the | | 12 | * notice and this permission notice appear in all copies of the |
13 | * software, derivative works or modified versions, and any portions | | 13 | * software, derivative works or modified versions, and any portions |
14 | * thereof, and that both notices appear in supporting documentation. | | 14 | * thereof, and that both notices appear in supporting documentation. |
| @@ -24,27 +24,27 @@ | | | @@ -24,27 +24,27 @@ |
24 | * Carnegie Mellon University | | 24 | * Carnegie Mellon University |
25 | * Pittsburgh PA 15213-3890 | | 25 | * Pittsburgh PA 15213-3890 |
26 | * | | 26 | * |
27 | * any improvements or extensions that they make and grant Carnegie the | | 27 | * any improvements or extensions that they make and grant Carnegie the |
28 | * rights to redistribute these changes. | | 28 | * rights to redistribute these changes. |
29 | */ | | 29 | */ |
30 | | | 30 | |
31 | #ifdef _KERNEL_OPT | | 31 | #ifdef _KERNEL_OPT |
32 | #include "opt_cputypes.h" | | 32 | #include "opt_cputypes.h" |
33 | #include "opt_multiprocessor.h" | | 33 | #include "opt_multiprocessor.h" |
34 | #endif | | 34 | #endif |
35 | | | 35 | |
36 | #include <sys/cdefs.h> | | 36 | #include <sys/cdefs.h> |
37 | __KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.25 2018/08/15 06:00:02 skrll Exp $"); | | 37 | __KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.26 2020/03/25 06:02:09 skrll Exp $"); |
38 | | | 38 | |
39 | #include <sys/param.h> | | 39 | #include <sys/param.h> |
40 | #include <sys/cpu.h> | | 40 | #include <sys/cpu.h> |
41 | #include <sys/proc.h> | | 41 | #include <sys/proc.h> |
42 | #include <sys/vnode.h> | | 42 | #include <sys/vnode.h> |
43 | #include <sys/systm.h> | | 43 | #include <sys/systm.h> |
44 | | | 44 | |
45 | #include <arm/arm32/db_machdep.h> | | 45 | #include <arm/arm32/db_machdep.h> |
46 | #include <arm/cpufunc.h> | | 46 | #include <arm/cpufunc.h> |
47 | | | 47 | |
48 | #include <ddb/db_access.h> | | 48 | #include <ddb/db_access.h> |
49 | #include <ddb/db_sym.h> | | 49 | #include <ddb/db_sym.h> |
50 | #include <ddb/db_output.h> | | 50 | #include <ddb/db_output.h> |
| @@ -198,27 +198,27 @@ static void | | | @@ -198,27 +198,27 @@ static void |
198 | tlb_print_asid(bool ng_p, tlb_asid_t asid) | | 198 | tlb_print_asid(bool ng_p, tlb_asid_t asid) |
199 | { | | 199 | { |
200 | if (ng_p) { | | 200 | if (ng_p) { |
201 | db_printf(" %3d", asid); | | 201 | db_printf(" %3d", asid); |
202 | } else { | | 202 | } else { |
203 | db_printf(" ---"); | | 203 | db_printf(" ---"); |
204 | } | | 204 | } |
205 | } | | 205 | } |
206 | | | 206 | |
207 | struct db_tlbinfo { | | 207 | struct db_tlbinfo { |
208 | vaddr_t (*dti_decode_vpn)(size_t, uint32_t, uint32_t); | | 208 | vaddr_t (*dti_decode_vpn)(size_t, uint32_t, uint32_t); |
209 | void (*dti_print_header)(void); | | 209 | void (*dti_print_header)(void); |
210 | void (*dti_print_entry)(size_t, size_t, uint32_t, uint32_t); | | 210 | void (*dti_print_entry)(size_t, size_t, uint32_t, uint32_t); |
211 | u_int dti_index; | | 211 | u_int dti_index; |
212 | }; | | 212 | }; |
213 | | | 213 | |
214 | #if defined(CPU_CORTEXA5) | | 214 | #if defined(CPU_CORTEXA5) |
215 | static void | | 215 | static void |
216 | tlb_print_cortex_a5_header(void) | | 216 | tlb_print_cortex_a5_header(void) |
217 | { | | 217 | { |
218 | tlb_print_common_header(" S TEX C B"); | | 218 | tlb_print_common_header(" S TEX C B"); |
219 | } | | 219 | } |
220 | | | 220 | |
221 | static vaddr_t | | 221 | static vaddr_t |
222 | tlb_decode_cortex_a5_vpn(size_t va_index, uint32_t d0, uint32_t d1) | | 222 | tlb_decode_cortex_a5_vpn(size_t va_index, uint32_t d0, uint32_t d1) |
223 | { | | 223 | { |
224 | const uint64_t d = ((uint64_t)d1 << 32) | d0; | | 224 | const uint64_t d = ((uint64_t)d1 << 32) | d0; |