| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | /* $NetBSD: db_machdep.c,v 1.6 2012/03/29 20:31:49 skrll Exp $ */ | | 1 | /* $NetBSD: db_machdep.c,v 1.7 2012/04/02 13:18:04 skrll Exp $ */ |
2 | | | 2 | |
3 | /*- | | 3 | /*- |
4 | * Copyright (c) 2010 The NetBSD Foundation, Inc. | | 4 | * Copyright (c) 2010 The NetBSD Foundation, Inc. |
5 | * All rights reserved. | | 5 | * All rights reserved. |
6 | * | | 6 | * |
7 | * This code is derived from software contributed to The NetBSD Foundation | | 7 | * This code is derived from software contributed to The NetBSD Foundation |
8 | * by Nick Hudson | | 8 | * by Nick Hudson |
9 | * | | 9 | * |
10 | * Redistribution and use in source and binary forms, with or without | | 10 | * Redistribution and use in source and binary forms, with or without |
11 | * modification, are permitted provided that the following conditions | | 11 | * modification, are permitted provided that the following conditions |
12 | * are met: | | 12 | * are met: |
13 | * 1. Redistributions of source code must retain the above copyright | | 13 | * 1. Redistributions of source code must retain the above copyright |
14 | * notice, this list of conditions and the following disclaimer. | | 14 | * notice, this list of conditions and the following disclaimer. |
| @@ -20,38 +20,43 @@ | | | @@ -20,38 +20,43 @@ |
20 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | | 20 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED |
21 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | | 21 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
22 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | | 22 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS |
23 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | | 23 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
24 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | | 24 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
25 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | | 25 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
26 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | | 26 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
27 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | | 27 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
28 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | | 28 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
29 | * POSSIBILITY OF SUCH DAMAGE. | | 29 | * POSSIBILITY OF SUCH DAMAGE. |
30 | */ | | 30 | */ |
31 | | | 31 | |
32 | #include <sys/cdefs.h> | | 32 | #include <sys/cdefs.h> |
33 | __KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.6 2012/03/29 20:31:49 skrll Exp $"); | | 33 | __KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.7 2012/04/02 13:18:04 skrll Exp $"); |
34 | | | 34 | |
35 | #include <sys/param.h> | | 35 | #include <sys/param.h> |
36 | #include <sys/lwp.h> | | 36 | #include <sys/lwp.h> |
37 | | | 37 | |
38 | #include <machine/db_machdep.h> | | 38 | #include <machine/db_machdep.h> |
| | | 39 | #include <machine/psl.h> |
39 | | | 40 | |
40 | #include <ddb/db_command.h> | | 41 | #include <ddb/db_command.h> |
41 | #include <ddb/db_output.h> | | 42 | #include <ddb/db_output.h> |
42 | #include <ddb/db_variables.h> | | 43 | #include <ddb/db_variables.h> |
43 | #include <ddb/db_access.h> | | 44 | #include <ddb/db_access.h> |
44 | | | 45 | |
| | | 46 | #ifndef _KERNEL |
| | | 47 | #include <util.h> |
| | | 48 | #endif |
| | | 49 | |
45 | db_regs_t ddb_regs; | | 50 | db_regs_t ddb_regs; |
46 | const struct db_variable db_regs[] = { | | 51 | const struct db_variable db_regs[] = { |
47 | { "flags", (long *)&ddb_regs.tf_flags, FCN_NULL, NULL }, | | 52 | { "flags", (long *)&ddb_regs.tf_flags, FCN_NULL, NULL }, |
48 | { "r1", (long *)&ddb_regs.tf_r1, FCN_NULL, NULL }, | | 53 | { "r1", (long *)&ddb_regs.tf_r1, FCN_NULL, NULL }, |
49 | { "r2(rp)", (long *)&ddb_regs.tf_rp, FCN_NULL, NULL }, | | 54 | { "r2(rp)", (long *)&ddb_regs.tf_rp, FCN_NULL, NULL }, |
50 | { "r3(fp)", (long *)&ddb_regs.tf_r3, FCN_NULL, NULL }, | | 55 | { "r3(fp)", (long *)&ddb_regs.tf_r3, FCN_NULL, NULL }, |
51 | { "r4", (long *)&ddb_regs.tf_r4, FCN_NULL, NULL }, | | 56 | { "r4", (long *)&ddb_regs.tf_r4, FCN_NULL, NULL }, |
52 | { "r5", (long *)&ddb_regs.tf_r5, FCN_NULL, NULL }, | | 57 | { "r5", (long *)&ddb_regs.tf_r5, FCN_NULL, NULL }, |
53 | { "r6", (long *)&ddb_regs.tf_r6, FCN_NULL, NULL }, | | 58 | { "r6", (long *)&ddb_regs.tf_r6, FCN_NULL, NULL }, |
54 | { "r7", (long *)&ddb_regs.tf_r7, FCN_NULL, NULL }, | | 59 | { "r7", (long *)&ddb_regs.tf_r7, FCN_NULL, NULL }, |
55 | { "r8", (long *)&ddb_regs.tf_r8, FCN_NULL, NULL }, | | 60 | { "r8", (long *)&ddb_regs.tf_r8, FCN_NULL, NULL }, |
56 | { "r9", (long *)&ddb_regs.tf_r9, FCN_NULL, NULL }, | | 61 | { "r9", (long *)&ddb_regs.tf_r9, FCN_NULL, NULL }, |
57 | { "r10", (long *)&ddb_regs.tf_r10, FCN_NULL, NULL }, | | 62 | { "r10", (long *)&ddb_regs.tf_r10, FCN_NULL, NULL }, |