| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | /* $NetBSD: db_trace.c,v 1.10 2011/02/28 21:24:25 skrll Exp $ */ | | 1 | /* $NetBSD: db_trace.c,v 1.11 2012/01/17 10:56:56 skrll Exp $ */ |
2 | | | 2 | |
3 | /* $OpenBSD: db_interface.c,v 1.16 2001/03/22 23:31:45 mickey Exp $ */ | | 3 | /* $OpenBSD: db_interface.c,v 1.16 2001/03/22 23:31:45 mickey Exp $ */ |
4 | | | 4 | |
5 | /* | | 5 | /* |
6 | * Copyright (c) 1999-2003 Michael Shalayeff | | 6 | * Copyright (c) 1999-2003 Michael Shalayeff |
7 | * All rights reserved. | | 7 | * All rights reserved. |
8 | * | | 8 | * |
9 | * Redistribution and use in source and binary forms, with or without | | 9 | * Redistribution and use in source and binary forms, with or without |
10 | * modification, are permitted provided that the following conditions | | 10 | * modification, are permitted provided that the following conditions |
11 | * are met: | | 11 | * are met: |
12 | * 1. Redistributions of source code must retain the above copyright | | 12 | * 1. Redistributions of source code must retain the above copyright |
13 | * notice, this list of conditions and the following disclaimer. | | 13 | * notice, this list of conditions and the following disclaimer. |
14 | * 2. Redistributions in binary form must reproduce the above copyright | | 14 | * 2. Redistributions in binary form must reproduce the above copyright |
| @@ -19,27 +19,27 @@ | | | @@ -19,27 +19,27 @@ |
19 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | | 19 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
20 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | | 20 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
21 | * IN NO EVENT SHALL THE AUTHOR OR HIS RELATIVES BE LIABLE FOR ANY DIRECT, | | 21 | * IN NO EVENT SHALL THE AUTHOR OR HIS RELATIVES BE LIABLE FOR ANY DIRECT, |
22 | * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | | 22 | * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
23 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | | 23 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR |
24 | * SERVICES; LOSS OF MIND, USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | | 24 | * SERVICES; LOSS OF MIND, USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) |
25 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | | 25 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
26 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING | | 26 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING |
27 | * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF | | 27 | * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF |
28 | * THE POSSIBILITY OF SUCH DAMAGE. | | 28 | * THE POSSIBILITY OF SUCH DAMAGE. |
29 | */ | | 29 | */ |
30 | | | 30 | |
31 | #include <sys/cdefs.h> | | 31 | #include <sys/cdefs.h> |
32 | __KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.10 2011/02/28 21:24:25 skrll Exp $"); | | 32 | __KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.11 2012/01/17 10:56:56 skrll Exp $"); |
33 | | | 33 | |
34 | #include <sys/param.h> | | 34 | #include <sys/param.h> |
35 | #include <sys/systm.h> | | 35 | #include <sys/systm.h> |
36 | #include <sys/proc.h> | | 36 | #include <sys/proc.h> |
37 | | | 37 | |
38 | #include <machine/db_machdep.h> | | 38 | #include <machine/db_machdep.h> |
39 | | | 39 | |
40 | #include <ddb/db_access.h> | | 40 | #include <ddb/db_access.h> |
41 | #include <ddb/db_sym.h> | | 41 | #include <ddb/db_sym.h> |
42 | #include <ddb/db_interface.h> | | 42 | #include <ddb/db_interface.h> |
43 | | | 43 | |
44 | void | | 44 | void |
45 | db_stack_trace_print(db_expr_t addr, bool have_addr, db_expr_t count, | | 45 | db_stack_trace_print(db_expr_t addr, bool have_addr, db_expr_t count, |
| @@ -119,34 +119,26 @@ db_stack_trace_print(db_expr_t addr, boo | | | @@ -119,34 +119,26 @@ db_stack_trace_print(db_expr_t addr, boo |
119 | pr(">> %08x %08x %08x\t", fp, pc, rp); | | 119 | pr(">> %08x %08x %08x\t", fp, pc, rp); |
120 | #endif | | 120 | #endif |
121 | | | 121 | |
122 | if (USERMODE(pc)) | | 122 | if (USERMODE(pc)) |
123 | return; | | 123 | return; |
124 | | | 124 | |
125 | sym = db_search_symbol(pc, DB_STGY_ANY, &off); | | 125 | sym = db_search_symbol(pc, DB_STGY_ANY, &off); |
126 | db_symbol_values (sym, &name, NULL); | | 126 | db_symbol_values (sym, &name, NULL); |
127 | | | 127 | |
128 | pr("%s() at ", name); | | 128 | pr("%s() at ", name); |
129 | db_printsym(pc, DB_STGY_PROC, pr); | | 129 | db_printsym(pc, DB_STGY_PROC, pr); |
130 | pr("\n"); | | 130 | pr("\n"); |
131 | | | 131 | |
132 | /* XXX NH - unwind info here */ | | | |
133 | /* aue = ue_find(pc); */ | | | |
134 | | | | |
135 | /* | | | |
136 | * get rp? | | | |
137 | * fp -= ue_total_frame_size(aue) | | | |
138 | */ | | | |
139 | | | | |
140 | /* | | 132 | /* |
141 | * if a terminal frame then report the trapframe and continue | | 133 | * if a terminal frame then report the trapframe and continue |
142 | * after it (if not the last one). | | 134 | * after it (if not the last one). |
143 | */ | | 135 | */ |
144 | if (!fp[0]) { | | 136 | if (!fp[0]) { |
145 | register_t *scargs; | | 137 | register_t *scargs; |
146 | struct trapframe *tf; | | 138 | struct trapframe *tf; |
147 | int scoff; | | 139 | int scoff; |
148 | | | 140 | |
149 | /* Stack space for syscall args */ | | 141 | /* Stack space for syscall args */ |
150 | scoff = HPPA_FRAME_ROUND(HPPA_FRAME_SIZE + HPPA_FRAME_MAXARGS); | | 142 | scoff = HPPA_FRAME_ROUND(HPPA_FRAME_SIZE + HPPA_FRAME_MAXARGS); |
151 | | | 143 | |
152 | scargs = (register_t *)((char *)fp - scoff); | | 144 | scargs = (register_t *)((char *)fp - scoff); |