mirror of
https://github.com/opnsense/src.git
synced 2026-05-28 04:12:45 -04:00
Support statically attaching of ddb commands in non-ddb modules.
The details are hidden in the DB_COMMAND(cmd_name, func_name) and DB_SHOW_COMMAND(cmd_name, func_name) macros. DB_COMMAND() adds to the top-level ddb command table and DB_SHOW_COMMAND adds to the `show' subtable. Most external commands will probably be `show' commands with no side effects. They should check their pointer args more carefully than `show map' :-), or ddb should trap internal faults better (like it does for memory accesses). The vm ddb commands are temporarily unattached. ddb.h: Also declare `db_indent' and db_iprintf() which will replace vm's `indent' and iprintf().
This commit is contained in:
Bruce Evans
parent
2280509ca1
commit
6337f4efa8
2 changed files with 111 additions and 41 deletions
|
|
@ -23,7 +23,7 @@
|
|||
* any improvements or extensions that they make and grant Carnegie the
|
||||
* rights to redistribute these changes.
|
||||
*
|
||||
* $Id: db_command.c,v 1.18 1995/12/10 19:07:49 bde Exp $
|
||||
* $Id: db_command.c,v 1.19 1996/08/27 19:46:28 pst Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
@ -35,12 +35,10 @@
|
|||
* Command dispatcher.
|
||||
*/
|
||||
#include <sys/param.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/reboot.h>
|
||||
#include <sys/systm.h>
|
||||
|
||||
#include <vm/vm.h>
|
||||
#include <vm/vm_extern.h>
|
||||
|
||||
#include <ddb/ddb.h>
|
||||
#include <ddb/db_command.h>
|
||||
#include <ddb/db_lex.h>
|
||||
|
|
@ -51,17 +49,22 @@
|
|||
/*
|
||||
* Exported global variables
|
||||
*/
|
||||
struct linker_set db_cmd_set;
|
||||
boolean_t db_cmd_loop_done;
|
||||
jmp_buf db_jmpbuf;
|
||||
db_addr_t db_dot;
|
||||
jmp_buf db_jmpbuf;
|
||||
db_addr_t db_last_addr;
|
||||
db_addr_t db_prev;
|
||||
db_addr_t db_next;
|
||||
struct linker_set db_show_cmd_set;
|
||||
|
||||
static db_cmdfcn_t db_fncall;
|
||||
static db_cmdfcn_t db_gdb;
|
||||
static db_cmdfcn_t db_panic;
|
||||
|
||||
/* XXX this is actually forward-static. */
|
||||
extern struct command db_show_cmds[];
|
||||
|
||||
/*
|
||||
* if 'ed' style: 'dot' is set at start of last item printed,
|
||||
* and '+' points to next line.
|
||||
|
|
@ -81,20 +84,6 @@ db_skip_to_eol()
|
|||
} while (t != tEOL);
|
||||
}
|
||||
|
||||
/*
|
||||
* Command table
|
||||
*/
|
||||
struct command {
|
||||
char * name; /* command name */
|
||||
db_cmdfcn_t *fcn; /* function to call */
|
||||
int flag; /* extra info: */
|
||||
#define CS_OWN 0x1 /* non-standard syntax */
|
||||
#define CS_MORE 0x2 /* standard syntax, but may have other
|
||||
words at end */
|
||||
#define CS_SET_DOT 0x100 /* set dot after command */
|
||||
struct command *more; /* another level of command */
|
||||
};
|
||||
|
||||
/*
|
||||
* Results of command search.
|
||||
*/
|
||||
|
|
@ -104,22 +93,27 @@ struct command {
|
|||
#define CMD_AMBIGUOUS 3
|
||||
#define CMD_HELP 4
|
||||
|
||||
static void db_cmd_list __P((struct command *table));
|
||||
static void db_cmd_list __P((struct command *table,
|
||||
struct command **aux_tablep));
|
||||
static int db_cmd_search __P((char *name, struct command *table,
|
||||
struct command **aux_tablep,
|
||||
struct command **cmdp));
|
||||
static void db_command __P((struct command **last_cmdp,
|
||||
struct command *cmd_table));
|
||||
struct command *cmd_table,
|
||||
struct command **aux_cmd_tablep));
|
||||
|
||||
/*
|
||||
* Search for command prefix.
|
||||
*/
|
||||
static int
|
||||
db_cmd_search(name, table, cmdp)
|
||||
db_cmd_search(name, table, aux_tablep, cmdp)
|
||||
char * name;
|
||||
struct command *table;
|
||||
struct command **aux_tablep;
|
||||
struct command **cmdp; /* out */
|
||||
{
|
||||
struct command *cmd;
|
||||
struct command **aux_cmdp;
|
||||
int result = CMD_NONE;
|
||||
|
||||
for (cmd = table; cmd->name != 0; cmd++) {
|
||||
|
|
@ -152,6 +146,38 @@ db_cmd_search(name, table, cmdp)
|
|||
}
|
||||
}
|
||||
}
|
||||
if (result == CMD_NONE && aux_tablep != 0)
|
||||
/* XXX repeat too much code. */
|
||||
for (aux_cmdp = aux_tablep; *aux_cmdp != 0; aux_cmdp++) {
|
||||
register char *lp;
|
||||
register char *rp;
|
||||
register int c;
|
||||
|
||||
lp = name;
|
||||
rp = (*aux_cmdp)->name;
|
||||
while ((c = *lp) == *rp) {
|
||||
if (c == 0) {
|
||||
/* complete match */
|
||||
*cmdp = *aux_cmdp;
|
||||
return (CMD_UNIQUE);
|
||||
}
|
||||
lp++;
|
||||
rp++;
|
||||
}
|
||||
if (c == 0) {
|
||||
/* end of name, not end of command -
|
||||
partial match */
|
||||
if (result == CMD_FOUND) {
|
||||
result = CMD_AMBIGUOUS;
|
||||
/* but keep looking for a full match -
|
||||
this lets us match single letters */
|
||||
}
|
||||
else {
|
||||
*cmdp = *aux_cmdp;
|
||||
result = CMD_FOUND;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (result == CMD_NONE) {
|
||||
/* check for 'help' */
|
||||
if (name[0] == 'h' && name[1] == 'e'
|
||||
|
|
@ -162,21 +188,30 @@ db_cmd_search(name, table, cmdp)
|
|||
}
|
||||
|
||||
static void
|
||||
db_cmd_list(table)
|
||||
db_cmd_list(table, aux_tablep)
|
||||
struct command *table;
|
||||
struct command **aux_tablep;
|
||||
{
|
||||
register struct command *cmd;
|
||||
register struct command **aux_cmdp;
|
||||
|
||||
for (cmd = table; cmd->name != 0; cmd++) {
|
||||
db_printf("%-12s", cmd->name);
|
||||
db_end_line();
|
||||
}
|
||||
if (aux_tablep == 0)
|
||||
return;
|
||||
for (aux_cmdp = aux_tablep; *aux_cmdp != 0; aux_cmdp++) {
|
||||
db_printf("%-12s", (*aux_cmdp)->name);
|
||||
db_end_line();
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
db_command(last_cmdp, cmd_table)
|
||||
db_command(last_cmdp, cmd_table, aux_cmd_tablep)
|
||||
struct command **last_cmdp; /* IN_OUT */
|
||||
struct command *cmd_table;
|
||||
struct command **aux_cmd_tablep;
|
||||
{
|
||||
struct command *cmd;
|
||||
int t;
|
||||
|
|
@ -210,6 +245,7 @@ db_command(last_cmdp, cmd_table)
|
|||
while (cmd_table) {
|
||||
result = db_cmd_search(db_tok_string,
|
||||
cmd_table,
|
||||
aux_cmd_tablep,
|
||||
&cmd);
|
||||
switch (result) {
|
||||
case CMD_NONE:
|
||||
|
|
@ -221,16 +257,22 @@ db_command(last_cmdp, cmd_table)
|
|||
db_flush_lex();
|
||||
return;
|
||||
case CMD_HELP:
|
||||
db_cmd_list(cmd_table);
|
||||
db_cmd_list(cmd_table, aux_cmd_tablep);
|
||||
db_flush_lex();
|
||||
return;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
if ((cmd_table = cmd->more) != 0) {
|
||||
/* XXX usually no more aux's. */
|
||||
aux_cmd_tablep = 0;
|
||||
if (cmd_table == db_show_cmds)
|
||||
aux_cmd_tablep =
|
||||
(struct command **)&db_show_cmd_set.ls_items[0];
|
||||
|
||||
t = db_read_token();
|
||||
if (t != tIDENT) {
|
||||
db_cmd_list(cmd_table);
|
||||
db_cmd_list(cmd_table, aux_cmd_tablep);
|
||||
db_flush_lex();
|
||||
return;
|
||||
}
|
||||
|
|
@ -331,11 +373,6 @@ static struct command db_show_cmds[] = {
|
|||
{ "watches", db_listwatch_cmd, 0, 0 },
|
||||
#if 0
|
||||
{ "thread", db_show_one_thread, 0, 0 },
|
||||
#endif
|
||||
{ "map", vm_map_print, 0, 0 },
|
||||
{ "object", vm_object_print, 0, 0 },
|
||||
#if 0
|
||||
{ "page", vm_page_print, 0, 0 },
|
||||
#endif
|
||||
#if 0
|
||||
{ "port", ipc_port_print, 0, 0 },
|
||||
|
|
@ -418,7 +455,8 @@ db_command_loop()
|
|||
db_printf("db> ");
|
||||
(void) db_read_line();
|
||||
|
||||
db_command(&db_last_command, db_command_table);
|
||||
db_command(&db_last_command, db_command_table,
|
||||
(struct command **)&db_cmd_set.ls_items[0]);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: ddb.h,v 1.10 1995/12/10 13:32:43 phk Exp $
|
||||
* $Id: ddb.h,v 1.11 1996/05/08 04:28:36 gpalmer Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
@ -42,11 +42,32 @@
|
|||
typedef void db_cmdfcn_t __P((db_expr_t addr, boolean_t have_addr,
|
||||
db_expr_t count, char *modif));
|
||||
|
||||
/*
|
||||
* Global variables...
|
||||
*/
|
||||
#define DB_COMMAND(cmd_name, func_name) \
|
||||
DB_SET(cmd_name, func_name, db_cmd_set)
|
||||
#define DB_SHOW_COMMAND(cmd_name, func_name) \
|
||||
DB_SET(cmd_name, func_name, db_show_cmd_set)
|
||||
|
||||
#define DB_SET(cmd_name, func_name, set) \
|
||||
static db_cmdfcn_t func_name; \
|
||||
\
|
||||
static const struct command __CONCAT(func_name,_cmd) = { \
|
||||
__STRING(cmd_name), \
|
||||
func_name, \
|
||||
0, \
|
||||
0, \
|
||||
}; \
|
||||
TEXT_SET(set, __CONCAT(func_name,_cmd)); \
|
||||
\
|
||||
static void \
|
||||
func_name(addr, have_addr, count, modif) \
|
||||
db_expr_t addr; \
|
||||
boolean_t have_addr; \
|
||||
db_expr_t count; \
|
||||
char *modif;
|
||||
|
||||
extern char *esym;
|
||||
extern unsigned int db_maxoff;
|
||||
extern int db_indent;
|
||||
extern int db_inst_count;
|
||||
extern int db_load_count;
|
||||
extern int db_store_count;
|
||||
|
|
@ -54,11 +75,7 @@ extern int db_radix;
|
|||
extern int db_max_width;
|
||||
extern int db_tab_stop_width;
|
||||
|
||||
struct vm_map; /* forward declaration */
|
||||
|
||||
/*
|
||||
* Functions...
|
||||
*/
|
||||
struct vm_map;
|
||||
|
||||
void cnpollc __P((int));
|
||||
void db_check_interrupt __P((void));
|
||||
|
|
@ -68,6 +85,7 @@ db_addr_t db_disasm __P((db_addr_t loc, boolean_t altfmt));
|
|||
void db_error __P((char *s));
|
||||
int db_expression __P((db_expr_t *valuep));
|
||||
int db_get_variable __P((db_expr_t *valuep));
|
||||
void db_iprintf __P((const char *,...));
|
||||
struct vm_map *db_map_addr __P((vm_offset_t));
|
||||
boolean_t db_map_current __P((struct vm_map *));
|
||||
boolean_t db_map_equal __P((struct vm_map *, struct vm_map *));
|
||||
|
|
@ -115,4 +133,18 @@ db_cmdfcn_t ipc_port_print;
|
|||
db_cmdfcn_t vm_page_print;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Command table.
|
||||
*/
|
||||
struct command {
|
||||
char * name; /* command name */
|
||||
db_cmdfcn_t *fcn; /* function to call */
|
||||
int flag; /* extra info: */
|
||||
#define CS_OWN 0x1 /* non-standard syntax */
|
||||
#define CS_MORE 0x2 /* standard syntax, but may have other words
|
||||
* at end */
|
||||
#define CS_SET_DOT 0x100 /* set dot after command */
|
||||
struct command *more; /* another level of command */
|
||||
};
|
||||
|
||||
#endif /* !_DDB_DDB_H_ */
|
||||
|
|
|
|||
Loading…
Reference in a new issue