From ad0290bdbe1d3d0b90a508e476cea91a2b1141dd Mon Sep 17 00:00:00 2001 From: Robert Garrett Date: Sat, 26 Jul 2003 14:18:51 +0000 Subject: [PATCH] Register keyword removal Approved by: Matt Dillon --- sys/ddb/db_access.c | 14 +++++++------- sys/ddb/db_aout.c | 28 ++++++++++++++-------------- sys/ddb/db_break.c | 22 +++++++++++----------- sys/ddb/db_command.c | 18 +++++++++--------- sys/ddb/db_examine.c | 6 +++--- sys/ddb/db_input.c | 8 ++++---- sys/ddb/db_kld.c | 3 +-- sys/ddb/db_output.c | 6 +++--- sys/ddb/db_print.c | 4 ++-- sys/ddb/db_run.c | 12 ++++++------ sys/ddb/db_sym.c | 18 +++++++++--------- sys/ddb/db_watch.c | 18 +++++++++--------- sys/ddb/db_write_cmd.c | 6 ++---- 13 files changed, 80 insertions(+), 83 deletions(-) diff --git a/sys/ddb/db_access.c b/sys/ddb/db_access.c index e9a72b6c06..e8e243ef3d 100644 --- a/sys/ddb/db_access.c +++ b/sys/ddb/db_access.c @@ -24,7 +24,7 @@ * rights to redistribute these changes. * * $FreeBSD: src/sys/ddb/db_access.c,v 1.15 1999/08/28 00:41:04 peter Exp $ - * $DragonFly: src/sys/ddb/db_access.c,v 1.2 2003/06/17 04:28:20 dillon Exp $ + * $DragonFly: src/sys/ddb/db_access.c,v 1.3 2003/07/26 14:18:51 rob Exp $ */ /* @@ -51,12 +51,12 @@ static unsigned db_extend[] = { /* table for sign-extending */ db_expr_t db_get_value(addr, size, is_signed) db_addr_t addr; - register int size; + int size; boolean_t is_signed; { char data[sizeof(int)]; - register db_expr_t value; - register int i; + db_expr_t value; + int i; db_read_bytes(addr, size, data); @@ -80,11 +80,11 @@ db_get_value(addr, size, is_signed) void db_put_value(addr, size, value) db_addr_t addr; - register int size; - register db_expr_t value; + int size; + db_expr_t value; { char data[sizeof(int)]; - register int i; + int i; #if BYTE_MSF for (i = size - 1; i >= 0; i--) diff --git a/sys/ddb/db_aout.c b/sys/ddb/db_aout.c index 15dd4234d8..a80a7d7c1a 100644 --- a/sys/ddb/db_aout.c +++ b/sys/ddb/db_aout.c @@ -24,7 +24,7 @@ * rights to redistribute these changes. * * $FreeBSD: src/sys/ddb/db_aout.c,v 1.27 1999/08/28 00:41:05 peter Exp $ - * $DragonFly: src/sys/ddb/db_aout.c,v 1.2 2003/06/17 04:28:20 dillon Exp $ + * $DragonFly: src/sys/ddb/db_aout.c,v 1.3 2003/07/26 14:18:51 rob Exp $ */ /* @@ -79,10 +79,10 @@ X_db_sym_init(symtab, esymtab, name) boundary */ char * name; { - register struct nlist *sym_start, *sym_end; - register struct nlist *sp; - register char * strtab; - register int strlen; + struct nlist *sym_start, *sym_end; + struct nlist *sp; + char * strtab; + int strlen; if (*symtab < 4) { printf ("DDB: no symbols\n"); @@ -105,7 +105,7 @@ X_db_sym_init(symtab, esymtab, name) esymtab - (char *)symtab, name); for (sp = sym_start; sp < sym_end; sp++) { - register int strx; + int strx; strx = sp->n_un.n_strx; if (strx != 0) { if (strx > strlen) { @@ -126,7 +126,7 @@ X_db_lookup(stab, symstr) db_symtab_t *stab; const char * symstr; { - register struct nlist *sp, *ep; + struct nlist *sp, *ep; sp = (struct nlist *)stab->start; ep = (struct nlist *)stab->end; @@ -147,14 +147,14 @@ X_db_lookup(stab, symstr) c_db_sym_t X_db_search_symbol(symtab, off, strategy, diffp) db_symtab_t * symtab; - register + db_addr_t off; db_strategy_t strategy; db_expr_t *diffp; /* in/out */ { - register unsigned int diff = *diffp; - register struct nlist *symp = 0; - register struct nlist *sp, *ep; + unsigned int diff = *diffp; + struct nlist *symp = 0; + struct nlist *sp, *ep; sp = (struct nlist *)symtab->start; ep = (struct nlist *)symtab->end; @@ -205,7 +205,7 @@ X_db_symbol_values(symtab, sym, namep, valuep) const char **namep; db_expr_t *valuep; { - register const struct nlist *sp; + const struct nlist *sp; sp = (const struct nlist *)sym; if (namep) @@ -223,7 +223,7 @@ X_db_line_at_pc(symtab, cursym, filename, linenum, off) int *linenum; db_expr_t off; { - register struct nlist *sp, *ep; + struct nlist *sp, *ep; unsigned long sodiff = -1UL, lndiff = -1UL, ln = 0; char *fname = NULL; @@ -288,7 +288,7 @@ X_db_sym_numargs(symtab, cursym, nargp, argnamep) int *nargp; char **argnamep; { - register struct nlist *sp, *ep; + struct nlist *sp, *ep; u_long addr; int maxnarg = *nargp, nargs = 0; diff --git a/sys/ddb/db_break.c b/sys/ddb/db_break.c index ee9a32a9fb..da8c1e714e 100644 --- a/sys/ddb/db_break.c +++ b/sys/ddb/db_break.c @@ -24,7 +24,7 @@ * rights to redistribute these changes. * * $FreeBSD: src/sys/ddb/db_break.c,v 1.18 1999/08/28 00:41:05 peter Exp $ - * $DragonFly: src/sys/ddb/db_break.c,v 1.2 2003/06/17 04:28:20 dillon Exp $ + * $DragonFly: src/sys/ddb/db_break.c,v 1.3 2003/07/26 14:18:51 rob Exp $ */ /* @@ -61,7 +61,7 @@ static void db_set_breakpoint __P((vm_map_t map, db_addr_t addr, static db_breakpoint_t db_breakpoint_alloc() { - register db_breakpoint_t bkpt; + db_breakpoint_t bkpt; if ((bkpt = db_free_breakpoints) != 0) { db_free_breakpoints = bkpt->link; @@ -79,7 +79,7 @@ db_breakpoint_alloc() static void db_breakpoint_free(bkpt) - register db_breakpoint_t bkpt; + db_breakpoint_t bkpt; { bkpt->link = db_free_breakpoints; db_free_breakpoints = bkpt; @@ -91,7 +91,7 @@ db_set_breakpoint(map, addr, count) db_addr_t addr; int count; { - register db_breakpoint_t bkpt; + db_breakpoint_t bkpt; if (db_find_breakpoint(map, addr)) { db_printf("Already set.\n"); @@ -119,8 +119,8 @@ db_delete_breakpoint(map, addr) vm_map_t map; db_addr_t addr; { - register db_breakpoint_t bkpt; - register db_breakpoint_t *prev; + db_breakpoint_t bkpt; + db_breakpoint_t *prev; for (prev = &db_breakpoint_list; (bkpt = *prev) != 0; @@ -144,7 +144,7 @@ db_find_breakpoint(map, addr) vm_map_t map; db_addr_t addr; { - register db_breakpoint_t bkpt; + db_breakpoint_t bkpt; for (bkpt = db_breakpoint_list; bkpt != 0; @@ -169,7 +169,7 @@ static boolean_t db_breakpoints_inserted = TRUE; void db_set_breakpoints() { - register db_breakpoint_t bkpt; + db_breakpoint_t bkpt; if (!db_breakpoints_inserted) { @@ -191,7 +191,7 @@ db_set_breakpoints() void db_clear_breakpoints() { - register db_breakpoint_t bkpt; + db_breakpoint_t bkpt; if (db_breakpoints_inserted) { @@ -215,7 +215,7 @@ db_breakpoint_t db_set_temp_breakpoint(addr) db_addr_t addr; { - register db_breakpoint_t bkpt; + db_breakpoint_t bkpt; bkpt = db_breakpoint_alloc(); if (bkpt == 0) { @@ -249,7 +249,7 @@ db_delete_temp_breakpoint(bkpt) static void db_list_breakpoints() { - register db_breakpoint_t bkpt; + db_breakpoint_t bkpt; if (db_breakpoint_list == 0) { db_printf("No breakpoints set\n"); diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c index e33f8a3fb5..79ab9c165d 100644 --- a/sys/ddb/db_command.c +++ b/sys/ddb/db_command.c @@ -24,7 +24,7 @@ * rights to redistribute these changes. * * $FreeBSD: src/sys/ddb/db_command.c,v 1.34.2.2 2001/07/29 22:48:36 kris Exp $ - * $DragonFly: src/sys/ddb/db_command.c,v 1.2 2003/06/17 04:28:20 dillon Exp $ + * $DragonFly: src/sys/ddb/db_command.c,v 1.3 2003/07/26 14:18:51 rob Exp $ */ /* @@ -118,9 +118,9 @@ db_cmd_search(name, table, aux_tablep, cmdp) int result = CMD_NONE; for (cmd = table; cmd->name != 0; cmd++) { - register char *lp; - register char *rp; - register int c; + char *lp; + char *rp; + int c; lp = name; rp = cmd->name; @@ -150,9 +150,9 @@ db_cmd_search(name, table, aux_tablep, 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; + char *lp; + char *rp; + int c; lp = name; rp = (*aux_cmdp)->name; @@ -193,8 +193,8 @@ db_cmd_list(table, aux_tablep) struct command *table; struct command **aux_tablep; { - register struct command *cmd; - register struct command **aux_cmdp; + struct command *cmd; + struct command **aux_cmdp; for (cmd = table; cmd->name != 0; cmd++) { db_printf("%-12s", cmd->name); diff --git a/sys/ddb/db_examine.c b/sys/ddb/db_examine.c index f47ecc3e67..c073985fb7 100644 --- a/sys/ddb/db_examine.c +++ b/sys/ddb/db_examine.c @@ -24,7 +24,7 @@ * rights to redistribute these changes. * * $FreeBSD: src/sys/ddb/db_examine.c,v 1.27 1999/08/28 00:41:07 peter Exp $ - * $DragonFly: src/sys/ddb/db_examine.c,v 1.2 2003/06/17 04:28:20 dillon Exp $ + * $DragonFly: src/sys/ddb/db_examine.c,v 1.3 2003/07/26 14:18:51 rob Exp $ */ /* @@ -70,7 +70,7 @@ db_examine_cmd(addr, have_addr, count, modif) static void db_examine(addr, fmt, count) - register + db_addr_t addr; char * fmt; /* format string */ int count; /* repeat count */ @@ -322,7 +322,7 @@ db_search_cmd(dummy1, dummy2, dummy3, dummy4) static void db_search(addr, size, value, mask, count) - register + db_addr_t addr; int size; db_expr_t value; diff --git a/sys/ddb/db_input.c b/sys/ddb/db_input.c index 5ff6cb684c..44a6d0458b 100644 --- a/sys/ddb/db_input.c +++ b/sys/ddb/db_input.c @@ -24,7 +24,7 @@ * rights to redistribute these changes. * * $FreeBSD: src/sys/ddb/db_input.c,v 1.28.2.1 2002/03/08 16:37:10 yar Exp $ - * $DragonFly: src/sys/ddb/db_input.c,v 1.2 2003/06/17 04:28:20 dillon Exp $ + * $DragonFly: src/sys/ddb/db_input.c,v 1.3 2003/07/26 14:18:51 rob Exp $ */ /* @@ -98,7 +98,7 @@ db_delete(n, bwd) int n; int bwd; { - register char *p; + char *p; if (bwd) { db_lc -= n; @@ -276,7 +276,7 @@ db_inputchar(c) cnputc('\007'); } else if (c >= ' ' && c <= '~') { - register char *p; + char *p; for (p = db_le; p > db_lc; p--) *p = *(p-1); @@ -344,7 +344,7 @@ db_readline(lstart, lsize) void db_check_interrupt() { - register int c; + int c; c = cnmaygetc(); switch (c) { diff --git a/sys/ddb/db_kld.c b/sys/ddb/db_kld.c index 38054b1c4f..824052d3f3 100644 --- a/sys/ddb/db_kld.c +++ b/sys/ddb/db_kld.c @@ -24,7 +24,7 @@ * rights to redistribute these changes. * * $FreeBSD: src/sys/ddb/db_kld.c,v 1.9 2000/01/11 13:25:12 peter Exp $ - * $DragonFly: src/sys/ddb/db_kld.c,v 1.2 2003/06/17 04:28:20 dillon Exp $ + * $DragonFly: src/sys/ddb/db_kld.c,v 1.3 2003/07/26 14:18:51 rob Exp $ * from db_aout.c,v 1.20 1998/06/07 17:09:36 dfr Exp */ @@ -59,7 +59,6 @@ X_db_lookup(stab, symstr) c_db_sym_t X_db_search_symbol(symtab, off, strategy, diffp) db_symtab_t * symtab; - register db_addr_t off; db_strategy_t strategy; db_expr_t *diffp; /* in/out */ diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c index d21833de5c..4e788e8da6 100644 --- a/sys/ddb/db_output.c +++ b/sys/ddb/db_output.c @@ -24,7 +24,7 @@ * rights to redistribute these changes. * * $FreeBSD: src/sys/ddb/db_output.c,v 1.26 1999/08/28 00:41:09 peter Exp $ - * $DragonFly: src/sys/ddb/db_output.c,v 1.2 2003/06/17 04:28:20 dillon Exp $ + * $DragonFly: src/sys/ddb/db_output.c,v 1.3 2003/07/26 14:18:51 rob Exp $ */ /* @@ -72,7 +72,7 @@ static void db_putchar __P((int c, void *arg)); void db_force_whitespace() { - register int last_print, next_tab; + int last_print, next_tab; last_print = db_last_non_space; while (last_print < db_output_position) { @@ -176,7 +176,7 @@ db_iprintf(fmt) const char *fmt; #endif { - register int i; + int i; va_list listp; for (i = db_indent; i >= 8; i -= 8) diff --git a/sys/ddb/db_print.c b/sys/ddb/db_print.c index 9429e3f583..e0fbc30f47 100644 --- a/sys/ddb/db_print.c +++ b/sys/ddb/db_print.c @@ -24,7 +24,7 @@ * rights to redistribute these changes. * * $FreeBSD: src/sys/ddb/db_print.c,v 1.26 1999/08/28 00:41:09 peter Exp $ - * $DragonFly: src/sys/ddb/db_print.c,v 1.2 2003/06/17 04:28:20 dillon Exp $ + * $DragonFly: src/sys/ddb/db_print.c,v 1.3 2003/07/26 14:18:51 rob Exp $ */ /* @@ -48,7 +48,7 @@ db_show_regs(dummy1, dummy2, dummy3, dummy4) db_expr_t dummy3; char * dummy4; { - register struct db_variable *regp; + struct db_variable *regp; db_expr_t value, offset; const char * name; diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c index 48ffa0fbfd..f7b33304b3 100644 --- a/sys/ddb/db_run.c +++ b/sys/ddb/db_run.c @@ -24,7 +24,7 @@ * rights to redistribute these changes. * * $FreeBSD: src/sys/ddb/db_run.c,v 1.18 1999/08/28 00:41:10 peter Exp $ - * $DragonFly: src/sys/ddb/db_run.c,v 1.2 2003/06/17 04:28:20 dillon Exp $ + * $DragonFly: src/sys/ddb/db_run.c,v 1.3 2003/07/26 14:18:51 rob Exp $ */ /* @@ -75,8 +75,8 @@ boolean_t db_stop_at_pc(is_breakpoint) boolean_t *is_breakpoint; { - register db_addr_t pc; - register db_breakpoint_t bkpt; + db_addr_t pc; + db_breakpoint_t bkpt; db_clear_single_step(DDB_REGS); db_clear_breakpoints(); @@ -138,7 +138,7 @@ db_stop_at_pc(is_breakpoint) (!inst_return(ins) || --db_call_depth != 0)) { if (db_sstep_print) { if (inst_call(ins) || inst_return(ins)) { - register int i; + int i; db_printf("[after %6d] ", db_inst_count); for (i = db_call_depth; --i > 0; ) @@ -171,7 +171,7 @@ void db_restart_at_pc(watchpt) boolean_t watchpt; { - register db_addr_t pc = PC_REGS(DDB_REGS); + db_addr_t pc = PC_REGS(DDB_REGS); if ((db_run_mode == STEP_COUNT) || (db_run_mode == STEP_RETURN) || @@ -262,7 +262,7 @@ db_breakpoint_t db_taken_bkpt = 0; void db_set_single_step(regs) - register db_regs_t *regs; + db_regs_t *regs; { db_addr_t pc = PC_REGS(regs), brpc; unsigned inst; diff --git a/sys/ddb/db_sym.c b/sys/ddb/db_sym.c index 330633061b..0fcd2a4732 100644 --- a/sys/ddb/db_sym.c +++ b/sys/ddb/db_sym.c @@ -24,7 +24,7 @@ * rights to redistribute these changes. * * $FreeBSD: src/sys/ddb/db_sym.c,v 1.32 1999/08/28 00:41:10 peter Exp $ - * $DragonFly: src/sys/ddb/db_sym.c,v 1.2 2003/06/17 04:28:20 dillon Exp $ + * $DragonFly: src/sys/ddb/db_sym.c,v 1.3 2003/07/26 14:18:51 rob Exp $ */ /* @@ -86,7 +86,7 @@ db_add_symbol_table(start, end, name, ref) static char * db_qualify(sym, symtabname) c_db_sym_t sym; - register char *symtabname; + char *symtabname; { const char *symname; static char tmp[256]; @@ -136,10 +136,10 @@ db_lookup(symstr) const char *symstr; { c_db_sym_t sp; - register int i; + int i; int symtab_start = 0; int symtab_end = db_nsymtab; - register const char *cp; + const char *cp; /* * Look for, remove, and remember any symbol table specifier. @@ -194,8 +194,8 @@ db_symbol_is_ambiguous(sym) c_db_sym_t sym; { const char *sym_name; - register int i; - register + int i; + boolean_t found_once = FALSE; if (!db_qualify_ambiguous_names) @@ -218,14 +218,14 @@ db_symbol_is_ambiguous(sym) */ c_db_sym_t db_search_symbol( val, strategy, offp) - register db_addr_t val; + db_addr_t val; db_strategy_t strategy; db_expr_t *offp; { - register + unsigned int diff; size_t newdiff; - register int i; + int i; c_db_sym_t ret = C_DB_SYM_NULL, sym; newdiff = diff = ~0; diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c index da7681a288..f1c15a98d5 100644 --- a/sys/ddb/db_watch.c +++ b/sys/ddb/db_watch.c @@ -24,7 +24,7 @@ * rights to redistribute these changes. * * $FreeBSD: src/sys/ddb/db_watch.c,v 1.20.2.1 2001/07/25 01:00:08 bsd Exp $ - * $DragonFly: src/sys/ddb/db_watch.c,v 1.2 2003/06/17 04:28:20 dillon Exp $ + * $DragonFly: src/sys/ddb/db_watch.c,v 1.3 2003/07/26 14:18:51 rob Exp $ */ /* @@ -75,7 +75,7 @@ void db_md_list_watchpoints __P((void)); db_watchpoint_t db_watchpoint_alloc() { - register db_watchpoint_t watch; + db_watchpoint_t watch; if ((watch = db_free_watchpoints) != 0) { db_free_watchpoints = watch->link; @@ -93,7 +93,7 @@ db_watchpoint_alloc() void db_watchpoint_free(watch) - register db_watchpoint_t watch; + db_watchpoint_t watch; { watch->link = db_free_watchpoints; db_free_watchpoints = watch; @@ -105,7 +105,7 @@ db_set_watchpoint(map, addr, size) db_addr_t addr; vm_size_t size; { - register db_watchpoint_t watch; + db_watchpoint_t watch; if (map == NULL) { db_printf("No map.\n"); @@ -147,8 +147,8 @@ db_delete_watchpoint(map, addr) vm_map_t map; db_addr_t addr; { - register db_watchpoint_t watch; - register db_watchpoint_t *prev; + db_watchpoint_t watch; + db_watchpoint_t *prev; for (prev = &db_watchpoint_list; (watch = *prev) != 0; @@ -167,7 +167,7 @@ db_delete_watchpoint(map, addr) static void db_list_watchpoints() { - register db_watchpoint_t watch; + db_watchpoint_t watch; if (db_watchpoint_list == 0) { db_printf("No watchpoints set\n"); @@ -230,7 +230,7 @@ DB_SHOW_COMMAND(watches, db_listwatch_cmd) void db_set_watchpoints() { - register db_watchpoint_t watch; + db_watchpoint_t watch; if (!db_watchpoints_inserted) { for (watch = db_watchpoint_list; @@ -258,7 +258,7 @@ db_find_watchpoint(map, addr, regs) db_addr_t addr; db_regs_t *regs; { - register db_watchpoint_t watch; + db_watchpoint_t watch; db_watchpoint_t found = 0; for (watch = db_watchpoint_list; diff --git a/sys/ddb/db_write_cmd.c b/sys/ddb/db_write_cmd.c index ed2d7ec536..5a9f1dc870 100644 --- a/sys/ddb/db_write_cmd.c +++ b/sys/ddb/db_write_cmd.c @@ -24,7 +24,7 @@ * rights to redistribute these changes. * * $FreeBSD: src/sys/ddb/db_write_cmd.c,v 1.13 1999/08/28 00:41:12 peter Exp $ - * $DragonFly: src/sys/ddb/db_write_cmd.c,v 1.2 2003/06/17 04:28:20 dillon Exp $ + * $DragonFly: src/sys/ddb/db_write_cmd.c,v 1.3 2003/07/26 14:18:51 rob Exp $ */ /* @@ -50,12 +50,10 @@ db_write_cmd(address, have_addr, count, modif) db_expr_t count; char * modif; { - register db_addr_t addr; - register db_expr_t old_value; db_expr_t new_value; - register int size; + int size; boolean_t wrote_one = FALSE; addr = (db_addr_t) address; -- 2.41.0