--- Gnu-Mach/ddb/db_sym.c 2020/09/02 04:43:14 1.1.1.2 +++ Gnu-Mach/ddb/db_sym.c 2020/09/02 04:48:15 1.1.1.4 @@ -28,14 +28,17 @@ * Date: 7/90 */ -#include "mach_kdb.h" #if MACH_KDB +#include #include -#include #include +#include +#include #include #include +#include +#include #include /* vm_map_t */ @@ -49,21 +52,19 @@ int db_nsymtab = 0; db_symtab_t *db_last_symtab; -db_sym_t db_lookup(); /* forward */ - /* * Add symbol table, with given name, to list of symbol tables. */ boolean_t -db_add_symbol_table(type, start, end, name, ref, map_pointer) - int type; - char *start; - char *end; - char *name; - char *ref; - char *map_pointer; +db_add_symbol_table( + int type, + char *start, + char *end, + char *name, + char *ref, + char *map_pointer) { - register db_symtab_t *st; + db_symtab_t *st; extern vm_map_t kernel_map; if (db_nsymtab >= MAXNOSYMTABS) @@ -75,7 +76,8 @@ db_add_symbol_table(type, start, end, na st->end = end; st->private = ref; st->map_pointer = (map_pointer == (char *)kernel_map)? 0: map_pointer; - strcpy(st->name, name); + strncpy(st->name, name, sizeof st->name - 1); + st->name[sizeof st->name - 1] = '\0'; db_nsymtab++; @@ -88,27 +90,27 @@ db_add_symbol_table(type, start, end, na * Note: return value points to static data whose content is * overwritten by each call... but in practice this seems okay. */ -static char * +static char * __attribute__ ((pure)) db_qualify(symname, symtabname) - char *symname; - register char *symtabname; + const char *symname; + const char *symtabname; { static char tmp[256]; - register char *s; + char *s; s = tmp; - while (*s++ = *symtabname++) { + while ((*s++ = *symtabname++)) { } s[-1] = ':'; *s++ = ':'; - while (*s++ = *symname++) { + while ((*s++ = *symname++)) { } return tmp; } boolean_t -db_eqname( char* src, char* dst, char c ) +db_eqname( const char* src, const char* dst, char c ) { if (!strcmp(src, dst)) return (TRUE); @@ -118,9 +120,9 @@ db_eqname( char* src, char* dst, char c } boolean_t -db_value_of_name(name, valuep) - char *name; - db_expr_t *valuep; +db_value_of_name( + char *name, + db_expr_t *valuep) { db_sym_t sym; @@ -128,6 +130,8 @@ db_value_of_name(name, valuep) if (sym == DB_SYM_NULL) return (FALSE); db_symbol_values(0, sym, &name, valuep); + + db_free_symbol(sym); return (TRUE); } @@ -138,14 +142,13 @@ db_value_of_name(name, valuep) * otherwise, all symbol tables will be searched. */ db_sym_t -db_lookup(symstr) - char *symstr; +db_lookup(char *symstr) { db_sym_t sp; - register int i; + int i; int symtab_start = 0; int symtab_end = db_nsymtab; - register char *cp; + char *cp; /* * Look for, remove, and remember any symbol table specifier. @@ -172,10 +175,11 @@ db_lookup(symstr) * Return on first match. */ for (i = symtab_start; i < symtab_end; i++) { - if (sp = X_db_lookup(&db_symtabs[i], symstr)) { + if ((sp = X_db_lookup(&db_symtabs[i], symstr))) { db_last_symtab = &db_symtabs[i]; return sp; } + db_free_symbol(sp); } return 0; } @@ -189,13 +193,13 @@ db_lookup(symstr) * with parsed file name, symbol name and line number. */ db_sym_t -db_sym_parse_and_lookup(func, symtab, symstr) - db_sym_t (*func)(); - db_symtab_t *symtab; - char *symstr; +db_sym_parse_and_lookup( + db_sym_t (*func)(), + db_symtab_t *symtab, + char *symstr) { - register char *p; - register n; + char *p; + int n; int n_name; int line_number; char *file_name = 0; @@ -261,46 +265,46 @@ out: boolean_t db_qualify_ambiguous_names = FALSE; boolean_t -db_name_is_ambiguous(sym_name) - char *sym_name; +db_name_is_ambiguous(char *sym_name) { - register int i; - register + int i; boolean_t found_once = FALSE; if (!db_qualify_ambiguous_names) return FALSE; for (i = 0; i < db_nsymtab; i++) { - if (X_db_lookup(&db_symtabs[i], sym_name)) { + db_sym_t sp = X_db_lookup(&db_symtabs[i], sym_name); + if (sp) { if (found_once) + { + db_free_symbol(sp); return TRUE; + } found_once = TRUE; } + db_free_symbol(sp); } return FALSE; } - -db_sym_t db_search_in_task_symbol(); - /* * Find the closest symbol to val, and return its name * and the difference between val and the symbol found. * * Logic change. If the task argument is non NULL and a - * matching symbol is found in a symbol table which explictly + * matching symbol is found in a symbol table which explicitly * specifies its map to be task->map, that symbol will have * precedence over any symbol from a symbol table will a null * map. This allows overlapping kernel/user maps to work correctly. * */ db_sym_t -db_search_task_symbol(val, strategy, offp, task) - register db_addr_t val; - db_strategy_t strategy; - db_addr_t *offp; /* better be unsigned */ - task_t task; +db_search_task_symbol( + db_addr_t val, + db_strategy_t strategy, + db_addr_t *offp, /* better be unsigned */ + task_t task) { db_sym_t ret; @@ -315,6 +319,7 @@ db_search_task_symbol(val, strategy, off */ if (ret == DB_SYM_NULL || (*offp) > 0x1000000) { + db_free_symbol(ret); task = db_current_task(); ret = db_search_in_task_symbol(val, strategy, offp, task); } @@ -324,15 +329,15 @@ db_search_task_symbol(val, strategy, off } db_sym_t -db_search_in_task_symbol(val, strategy, offp, task) - register db_addr_t val; - db_strategy_t strategy; - db_addr_t *offp; - task_t task; +db_search_in_task_symbol( + db_addr_t val, + db_strategy_t strategy, + db_addr_t *offp, + task_t task) { - register vm_size_t diff; + vm_size_t diff; vm_size_t newdiff; - register int i; + int i; db_symtab_t *sp; db_sym_t ret = DB_SYM_NULL, sym; vm_map_t map_for_val; @@ -353,6 +358,7 @@ db_search_in_task_symbol(val, strategy, { /* first hit */ db_last_symtab = sp; diff = newdiff; + db_free_symbol(ret); ret = sym; continue; } @@ -362,6 +368,7 @@ db_search_in_task_symbol(val, strategy, { /* closer null map match */ db_last_symtab = sp; diff = newdiff; + db_free_symbol(ret); ret = sym; continue; } @@ -375,6 +382,7 @@ db_search_in_task_symbol(val, strategy, */ db_last_symtab = sp; diff = newdiff; + db_free_symbol(ret); ret = sym; continue; } @@ -389,11 +397,11 @@ db_search_in_task_symbol(val, strategy, * Return name and value of a symbol */ void -db_symbol_values(stab, sym, namep, valuep) - db_symtab_t *stab; - db_sym_t sym; - char **namep; - db_expr_t *valuep; +db_symbol_values( + db_symtab_t *stab, + db_sym_t sym, + char **namep, + db_expr_t *valuep) { db_expr_t value; char *name; @@ -432,11 +440,11 @@ db_symbol_values(stab, sym, namep, value * not accept symbols whose value is zero (and use plain hex). */ -unsigned int db_maxoff = 0x4000; +unsigned long db_maxoff = 0x4000; void db_task_printsym(off, strategy, task) - db_expr_t off; + db_addr_t off; db_strategy_t strategy; task_t task; { @@ -449,8 +457,9 @@ db_task_printsym(off, strategy, task) cursym = db_search_task_symbol(off, strategy, &d, task); db_symbol_values(0, cursym, &name, &value); - if (name == 0 || d >= db_maxoff || value == 0) { + if (name == 0 || d >= db_maxoff || value == 0 || *name == 0) { db_printf("%#n", off); + db_free_symbol(cursym); return; } db_printf("%s", name); @@ -464,6 +473,7 @@ db_task_printsym(off, strategy, task) db_printf("]"); } } + db_free_symbol(cursym); } void @@ -479,24 +489,29 @@ db_line_at_pc( sym, filename, linenum, p db_sym_t sym; char **filename; int *linenum; - db_expr_t pc; + db_addr_t pc; { return (db_last_symtab) ? X_db_line_at_pc( db_last_symtab, sym, filename, linenum, pc) : FALSE; } +void db_free_symbol(db_sym_t s) +{ + return (db_last_symtab) ? + X_db_free_symbol( db_last_symtab, s) : + FALSE; +} + /* * Switch into symbol-table specific routines */ -extern boolean_t aout_db_sym_init(), aout_db_line_at_pc(); -extern db_sym_t aout_db_lookup(), aout_db_search_symbol(); -extern void aout_db_symbol_values(); - -extern boolean_t coff_db_sym_init(), coff_db_line_at_pc(); -extern db_sym_t coff_db_lookup(), coff_db_search_symbol(); -extern void coff_db_symbol_values(); +void dummy_db_free_symbol(db_sym_t symbol) { } +boolean_t dummy_db_sym_init(char *a, char *b, char *c, char *d) { + return FALSE; +} + struct db_sym_switch x_db[] = { @@ -505,18 +520,20 @@ struct db_sym_switch x_db[] = { { 0,}, #else /* DB_NO_AOUT */ { aout_db_sym_init, aout_db_lookup, aout_db_search_symbol, - aout_db_line_at_pc, aout_db_symbol_values }, + aout_db_line_at_pc, aout_db_symbol_values, dummy_db_free_symbol }, #endif /* DB_NO_AOUT */ -#ifdef DB_NO_COFF { 0,}, -#else /* DB_NO_COFF */ - { coff_db_sym_init, coff_db_lookup, coff_db_search_symbol, - coff_db_line_at_pc, coff_db_symbol_values }, -#endif /* DB_NO_COFF */ /* Machdep, not inited here */ - { 0,} + { 0,}, + +#ifdef DB_NO_ELF + { 0,}, +#else /* DB_NO_ELF */ + { dummy_db_sym_init, elf_db_lookup, elf_db_search_symbol, + elf_db_line_at_pc, elf_db_symbol_values, dummy_db_free_symbol }, +#endif /* DB_NO_ELF */ };