Deleted Added
full compact
db_main.c (174910) db_main.c (174914)
1/*-
2 * Mach Operating System
3 * Copyright (c) 1991,1990 Carnegie Mellon University
4 * All Rights Reserved.
5 *
6 * Permission to use, copy, modify and distribute this software and its
7 * documentation is hereby granted, provided that both the copyright
8 * notice and this permission notice appear in all copies of the

--- 11 unchanged lines hidden (view full) ---

20 * Carnegie Mellon University
21 * Pittsburgh PA 15213-3890
22 *
23 * any improvements or extensions that they make and grant Carnegie the
24 * rights to redistribute these changes.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Mach Operating System
3 * Copyright (c) 1991,1990 Carnegie Mellon University
4 * All Rights Reserved.
5 *
6 * Permission to use, copy, modify and distribute this software and its
7 * documentation is hereby granted, provided that both the copyright
8 * notice and this permission notice appear in all copies of the

--- 11 unchanged lines hidden (view full) ---

20 * Carnegie Mellon University
21 * Pittsburgh PA 15213-3890
22 *
23 * any improvements or extensions that they make and grant Carnegie the
24 * rights to redistribute these changes.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/ddb/db_main.c 174910 2007-12-25 23:06:51Z rwatson $");
28__FBSDID("$FreeBSD: head/sys/ddb/db_main.c 174914 2007-12-26 09:33:19Z rwatson $");
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/cons.h>
33#include <sys/linker.h>
34#include <sys/kdb.h>
35#include <sys/kernel.h>
36#include <sys/pcpu.h>

--- 152 unchanged lines hidden (view full) ---

189}
190
191static int
192db_trap(int type, int code)
193{
194 jmp_buf jb;
195 void *prev_jb;
196 boolean_t bkpt, watchpt;
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/cons.h>
33#include <sys/linker.h>
34#include <sys/kdb.h>
35#include <sys/kernel.h>
36#include <sys/pcpu.h>

--- 152 unchanged lines hidden (view full) ---

189}
190
191static int
192db_trap(int type, int code)
193{
194 jmp_buf jb;
195 void *prev_jb;
196 boolean_t bkpt, watchpt;
197 const char *why;
197
198 /*
199 * Don't handle the trap if the console is unavailable (i.e. it
200 * is in graphics mode).
201 */
202 if (cnunavailable())
203 return (0);
204

--- 12 unchanged lines hidden (view full) ---

217 if (bkpt)
218 db_printf("Breakpoint at\t");
219 else if (watchpt)
220 db_printf("Watchpoint at\t");
221 else
222 db_printf("Stopped at\t");
223 db_print_loc_and_inst(db_dot);
224 }
198
199 /*
200 * Don't handle the trap if the console is unavailable (i.e. it
201 * is in graphics mode).
202 */
203 if (cnunavailable())
204 return (0);
205

--- 12 unchanged lines hidden (view full) ---

218 if (bkpt)
219 db_printf("Breakpoint at\t");
220 else if (watchpt)
221 db_printf("Watchpoint at\t");
222 else
223 db_printf("Stopped at\t");
224 db_print_loc_and_inst(db_dot);
225 }
226 why = kdb_why;
227 db_script_kdbenter(why != KDB_WHY_UNSET ? why : "unknown");
225 db_command_loop();
226 (void)kdb_jmpbuf(prev_jb);
227 }
228
229 db_restart_at_pc(watchpt);
230
231 return (1);
232}

--- 12 unchanged lines hidden ---
228 db_command_loop();
229 (void)kdb_jmpbuf(prev_jb);
230 }
231
232 db_restart_at_pc(watchpt);
233
234 return (1);
235}

--- 12 unchanged lines hidden ---