Index: sys/conf/files =================================================================== --- sys/conf/files (revision 299195) +++ sys/conf/files (working copy) @@ -579,7 +579,6 @@ ddb/db_lex.c optional ddb ddb/db_main.c optional ddb ddb/db_output.c optional ddb -ddb/db_print.c optional ddb ddb/db_ps.c optional ddb ddb/db_run.c optional ddb ddb/db_script.c optional ddb Index: sys/ddb/db_command.c =================================================================== --- sys/ddb/db_command.c (revision 299195) +++ sys/ddb/db_command.c (working copy) @@ -52,8 +52,11 @@ #include #include #include +#include +#include #include +#include #include /* @@ -75,6 +78,8 @@ static db_cmdfcn_t db_stack_trace_all; static db_cmdfcn_t db_watchdog; +void db_show_regs(db_expr_t , bool , db_expr_t , char *); + /* * 'show' commands */ @@ -824,6 +829,31 @@ } } +void +db_show_regs(db_expr_t _1, bool _2, db_expr_t _3, char *_4) +{ + struct db_variable *regp; + db_expr_t value, offset; + const char *name; + + for (regp = db_regs; regp < db_eregs; regp++) { + if (!db_read_variable(regp, &value)) + continue; + db_printf("%-12s%#*lr", regp->name, + (int)(sizeof(unsigned long) * 2 + 2), (unsigned long)value); + db_find_xtrn_sym_and_offset((db_addr_t)value, &name, &offset); + if (name != NULL && offset <= (unsigned long)db_maxoff && + offset != value) { + db_printf("\t%s", name); + if (offset != 0) + db_printf("+%+#lr", (long)offset); + } + db_printf("\n"); + } + db_print_loc_and_inst(PC_REGS()); +} + + /* * Take the parsed expression value from the command line that was parsed * as a hexadecimal value and convert it as if the expression was parsed Index: sys/ddb/db_print.c =================================================================== --- sys/ddb/db_print.c (revision 299195) +++ sys/ddb/db_print.c (nonexistent) @@ -1,71 +0,0 @@ -/*- - * Mach Operating System - * Copyright (c) 1991,1990 Carnegie Mellon University - * All Rights Reserved. - * - * Permission to use, copy, modify and distribute this software and its - * documentation is hereby granted, provided that both the copyright - * notice and this permission notice appear in all copies of the - * software, derivative works or modified versions, and any portions - * thereof, and that both notices appear in supporting documentation. - * - * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS - * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR - * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * Carnegie Mellon requests users of this software to return to - * - * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU - * School of Computer Science - * Carnegie Mellon University - * Pittsburgh PA 15213-3890 - * - * any improvements or extensions that they make and grant Carnegie the - * rights to redistribute these changes. - * - */ -/* - * Author: David B. Golub, Carnegie Mellon University - * Date: 7/90 - */ - -/* - * Miscellaneous printing. - */ - -#include -__FBSDID("$FreeBSD$"); - -#include -#include -#include - -#include - -#include -#include -#include - -void -db_show_regs(db_expr_t _1, bool _2, db_expr_t _3, char *_4) -{ - struct db_variable *regp; - db_expr_t value, offset; - const char *name; - - for (regp = db_regs; regp < db_eregs; regp++) { - if (!db_read_variable(regp, &value)) - continue; - db_printf("%-12s%#*lr", regp->name, - (int)(sizeof(unsigned long) * 2 + 2), (unsigned long)value); - db_find_xtrn_sym_and_offset((db_addr_t)value, &name, &offset); - if (name != NULL && offset <= (unsigned long)db_maxoff && - offset != value) { - db_printf("\t%s", name); - if (offset != 0) - db_printf("+%+#lr", (long)offset); - } - db_printf("\n"); - } - db_print_loc_and_inst(PC_REGS()); -} Property changes on: sys/ddb/db_print.c ___________________________________________________________________ Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: sys/ddb/ddb.h =================================================================== --- sys/ddb/ddb.h (revision 299195) +++ sys/ddb/ddb.h (working copy) @@ -245,7 +245,6 @@ db_cmdfcn_t db_search_cmd; db_cmdfcn_t db_set_cmd; db_cmdfcn_t db_set_thread; -db_cmdfcn_t db_show_regs; db_cmdfcn_t db_show_threads; db_cmdfcn_t db_single_step_cmd; db_cmdfcn_t db_textdump_cmd;