From f86f5ca3f51ad4cd6a84f094bc9ea7b0e97f132c Mon Sep 17 00:00:00 2001 From: "Paul N. Hilfinger" Date: Tue, 9 Sep 2003 08:05:43 +0000 Subject: [PATCH] 2003-09-09 Paul N. Hilfinger * p-lang.c: Eliminate "register". * c-lang.c: Ditto. * expprint.c: Ditto. * f-lang.c: Ditto. * jv-lang.c: Ditto. * language.c: Ditto. * m2-lang.c: Ditto. * parse.c: Ditto. * scm-lang.c: Ditto. * objc-lang.c: Ditto. --- gdb/ChangeLog | 14 +++++++++++++ gdb/c-lang.c | 6 +++--- gdb/expprint.c | 12 ++++++------ gdb/f-lang.c | 6 +++--- gdb/jv-lang.c | 4 ++-- gdb/language.c | 4 ++-- gdb/m2-lang.c | 6 +++--- gdb/objc-lang.c | 18 ++++++++--------- gdb/p-lang.c | 8 ++++---- gdb/parse.c | 52 ++++++++++++++++++++++++------------------------- gdb/scm-lang.c | 4 ++-- 11 files changed, 74 insertions(+), 60 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index df34a7f5a6..9723adaf36 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,16 @@ +2003-09-09 Paul N. Hilfinger + + * p-lang.c: Eliminate "register". + * c-lang.c: Ditto. + * expprint.c: Ditto. + * f-lang.c: Ditto. + * jv-lang.c: Ditto. + * language.c: Ditto. + * m2-lang.c: Ditto. + * parse.c: Ditto. + * scm-lang.c: Ditto. + * objc-lang.c: Ditto. + 2003-09-09 Nick Clifton * v850-tdep.c (v850_processor_type_table): Add bfd_mach_v850e1. @@ -408,6 +421,7 @@ frame_unwind_register_unsigned instead of frame_unwind_unsigned_register. +>>>>>>> current-public.22/gdb/ChangeLog Mon, 08 Sep 2003 21:54:22 -0700 hilfingr (GdbPub/g/3_ChangeLog 1.15.1.2.1.1 644) 2003-08-30 Mark Kettenis * configure.in: Search for gethostbyname in libnsl. diff --git a/gdb/c-lang.c b/gdb/c-lang.c index bdbbb54172..4a5a3628ef 100644 --- a/gdb/c-lang.c +++ b/gdb/c-lang.c @@ -42,7 +42,7 @@ static void c_emit_char (int c, struct ui_file * stream, int quoter); characters and strings is language specific. */ static void -c_emit_char (register int c, struct ui_file *stream, int quoter) +c_emit_char (int c, struct ui_file *stream, int quoter) { const char *escape; int host_char; @@ -88,7 +88,7 @@ void c_printstr (struct ui_file *stream, char *string, unsigned int length, int width, int force_ellipses) { - register unsigned int i; + unsigned int i; unsigned int things_printed = 0; int in_quotes = 0; int need_comma = 0; @@ -207,7 +207,7 @@ c_printstr (struct ui_file *stream, char *string, unsigned int length, struct type * c_create_fundamental_type (struct objfile *objfile, int typeid) { - register struct type *type = NULL; + struct type *type = NULL; switch (typeid) { diff --git a/gdb/expprint.c b/gdb/expprint.c index bbc63e7395..a3001b1b33 100644 --- a/gdb/expprint.c +++ b/gdb/expprint.c @@ -54,14 +54,14 @@ print_expression (struct expression *exp, struct ui_file *stream) parentheses are needed here. */ static void -print_subexp (register struct expression *exp, register int *pos, +print_subexp (struct expression *exp, int *pos, struct ui_file *stream, enum precedence prec) { - register unsigned tem; - register const struct op_print *op_print_tab; - register int pc; + unsigned tem; + const struct op_print *op_print_tab; + int pc; unsigned nargs; - register char *op_str; + char *op_str; int assign_modify = 0; enum exp_opcode opcode; enum precedence myprec = PREC_NULL; @@ -535,7 +535,7 @@ char * op_string (enum exp_opcode op) { int tem; - register const struct op_print *op_print_tab; + const struct op_print *op_print_tab; op_print_tab = current_language->la_op_print_tab; for (tem = 0; op_print_tab[tem].opcode != OP_NULL; tem++) diff --git a/gdb/f-lang.c b/gdb/f-lang.c index 9ed2d6f150..52f56b3607 100644 --- a/gdb/f-lang.c +++ b/gdb/f-lang.c @@ -100,7 +100,7 @@ static void f_emit_char (int c, struct ui_file * stream, int quoter); be replaced with a true F77 version. */ static void -f_emit_char (register int c, struct ui_file *stream, int quoter) +f_emit_char (int c, struct ui_file *stream, int quoter) { c &= 0xFF; /* Avoid sign bit follies */ @@ -164,7 +164,7 @@ static void f_printstr (struct ui_file *stream, char *string, unsigned int length, int width, int force_ellipses) { - register unsigned int i; + unsigned int i; unsigned int things_printed = 0; int in_quotes = 0; int need_comma = 0; @@ -250,7 +250,7 @@ f_printstr (struct ui_file *stream, char *string, unsigned int length, static struct type * f_create_fundamental_type (struct objfile *objfile, int typeid) { - register struct type *type = NULL; + struct type *type = NULL; switch (typeid) { diff --git a/gdb/jv-lang.c b/gdb/jv-lang.c index e3ae1882df..b76796301e 100644 --- a/gdb/jv-lang.c +++ b/gdb/jv-lang.c @@ -850,8 +850,8 @@ java_emit_char (int c, struct ui_file *stream, int quoter) } static struct value * -evaluate_subexp_java (struct type *expect_type, register struct expression *exp, - register int *pos, enum noside noside) +evaluate_subexp_java (struct type *expect_type, struct expression *exp, + int *pos, enum noside noside) { int pc = *pos; int i; diff --git a/gdb/language.c b/gdb/language.c index a98c9d6578..9d195d89b9 100644 --- a/gdb/language.c +++ b/gdb/language.c @@ -1192,13 +1192,13 @@ unk_lang_error (char *msg) } static void -unk_lang_emit_char (register int c, struct ui_file *stream, int quoter) +unk_lang_emit_char (int c, struct ui_file *stream, int quoter) { error ("internal error - unimplemented function unk_lang_emit_char called."); } static void -unk_lang_printchar (register int c, struct ui_file *stream) +unk_lang_printchar (int c, struct ui_file *stream) { error ("internal error - unimplemented function unk_lang_printchar called."); } diff --git a/gdb/m2-lang.c b/gdb/m2-lang.c index 528484f0f2..a54d188d0a 100644 --- a/gdb/m2-lang.c +++ b/gdb/m2-lang.c @@ -45,7 +45,7 @@ static void m2_emit_char (int, struct ui_file *, int); */ static void -m2_emit_char (register int c, struct ui_file *stream, int quoter) +m2_emit_char (int c, struct ui_file *stream, int quoter) { c &= 0xFF; /* Avoid sign bit follies */ @@ -112,7 +112,7 @@ static void m2_printstr (struct ui_file *stream, char *string, unsigned int length, int width, int force_ellipses) { - register unsigned int i; + unsigned int i; unsigned int things_printed = 0; int in_quotes = 0; int need_comma = 0; @@ -198,7 +198,7 @@ m2_printstr (struct ui_file *stream, char *string, unsigned int length, static struct type * m2_create_fundamental_type (struct objfile *objfile, int typeid) { - register struct type *type = NULL; + struct type *type = NULL; switch (typeid) { diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c index 9a983b7da3..e399818224 100644 --- a/gdb/objc-lang.c +++ b/gdb/objc-lang.c @@ -83,7 +83,7 @@ struct objc_method { struct symbol * lookup_struct_typedef (char *name, struct block *block, int noerr) { - register struct symbol *sym; + struct symbol *sym; sym = lookup_symbol (name, block, STRUCT_DOMAIN, 0, (struct symtab **) NULL); @@ -274,7 +274,7 @@ objc_demangle (const char *mangled, int options) for printing characters and strings is language specific. */ static void -objc_emit_char (register int c, struct ui_file *stream, int quoter) +objc_emit_char (int c, struct ui_file *stream, int quoter) { c &= 0xFF; /* Avoid sign bit follies. */ @@ -337,7 +337,7 @@ static void objc_printstr (struct ui_file *stream, char *string, unsigned int length, int width, int force_ellipses) { - register unsigned int i; + unsigned int i; unsigned int things_printed = 0; int in_quotes = 0; int need_comma = 0; @@ -449,7 +449,7 @@ objc_printstr (struct ui_file *stream, char *string, static struct type * objc_create_fundamental_type (struct objfile *objfile, int typeid) { - register struct type *type = NULL; + struct type *type = NULL; switch (typeid) { @@ -703,7 +703,7 @@ static char *msglist_sel; void start_msglist(void) { - register struct selname *new = + struct selname *new = (struct selname *) xmalloc (sizeof (struct selname)); new->next = selname_chain; @@ -749,9 +749,9 @@ add_msglist(struct stoken *str, int addcolon) int end_msglist(void) { - register int val = msglist_len; - register struct selname *sel = selname_chain; - register char *p = msglist_sel; + int val = msglist_len; + struct selname *sel = selname_chain; + char *p = msglist_sel; int selid; selname_chain = sel->next; @@ -1533,7 +1533,7 @@ print_object_command (char *args, int from_tty) { struct expression *expr = parse_expression (args); - register struct cleanup *old_chain = + struct cleanup *old_chain = make_cleanup (free_current_contents, &expr); int pc = 0; diff --git a/gdb/p-lang.c b/gdb/p-lang.c index 59e196aa4b..836f5f32b7 100644 --- a/gdb/p-lang.c +++ b/gdb/p-lang.c @@ -99,7 +99,7 @@ static void pascal_one_char (int, struct ui_file *, int *); In_quotes is reset to 0 if a char is written with #4 notation */ static void -pascal_one_char (register int c, struct ui_file *stream, int *in_quotes) +pascal_one_char (int c, struct ui_file *stream, int *in_quotes) { c &= 0xFF; /* Avoid sign bit follies */ @@ -132,7 +132,7 @@ static void pascal_emit_char (int c, struct ui_file *stream, int quoter); characters and strings is language specific. */ static void -pascal_emit_char (register int c, struct ui_file *stream, int quoter) +pascal_emit_char (int c, struct ui_file *stream, int quoter) { int in_quotes = 0; pascal_one_char (c, stream, &in_quotes); @@ -158,7 +158,7 @@ void pascal_printstr (struct ui_file *stream, char *string, unsigned int length, int width, int force_ellipses) { - register unsigned int i; + unsigned int i; unsigned int things_printed = 0; int in_quotes = 0; int need_comma = 0; @@ -274,7 +274,7 @@ pascal_printstr (struct ui_file *stream, char *string, unsigned int length, struct type * pascal_create_fundamental_type (struct objfile *objfile, int typeid) { - register struct type *type = NULL; + struct type *type = NULL; switch (typeid) { diff --git a/gdb/parse.c b/gdb/parse.c index c16d313b29..6a02fe4518 100644 --- a/gdb/parse.c +++ b/gdb/parse.c @@ -112,7 +112,7 @@ static struct funcall *funcall_chain; void start_arglist (void) { - register struct funcall *new; + struct funcall *new; new = (struct funcall *) xmalloc (sizeof (struct funcall)); new->next = funcall_chain; @@ -127,8 +127,8 @@ start_arglist (void) int end_arglist (void) { - register int val = arglist_len; - register struct funcall *call = funcall_chain; + int val = arglist_len; + struct funcall *call = funcall_chain; funcall_chain = call->next; arglist_len = call->arglist_len; xfree (call); @@ -141,7 +141,7 @@ end_arglist (void) static void free_funcalls (void *ignore) { - register struct funcall *call, *next; + struct funcall *call, *next; for (call = funcall_chain; call; call = next) { @@ -263,9 +263,9 @@ write_exp_elt_intern (struct internalvar *expelt) void write_exp_string (struct stoken str) { - register int len = str.length; - register int lenelt; - register char *strdata; + int len = str.length; + int lenelt; + char *strdata; /* Compute the number of expression elements required to hold the string (including a null byte terminator), along with one expression element @@ -312,10 +312,10 @@ write_exp_string (struct stoken str) void write_exp_bitstring (struct stoken str) { - register int bits = str.length; /* length in bits */ - register int len = (bits + HOST_CHAR_BIT - 1) / HOST_CHAR_BIT; - register int lenelt; - register char *strdata; + int bits = str.length; /* length in bits */ + int len = (bits + HOST_CHAR_BIT - 1) / HOST_CHAR_BIT; + int lenelt; + char *strdata; /* Compute the number of expression elements required to hold the bitstring, along with one expression element at each end to record the actual @@ -564,7 +564,7 @@ parse_nested_classes_for_hpacc (char *name, int len, char **token, consider *prefixes* of the string; there is no need to look up "B::C" separately as a symbol in the previous example. */ - register char *p; + char *p; char *start, *end; char *prefix = NULL; char *tmp; @@ -769,12 +769,12 @@ copy_name (struct stoken token) to prefix form (in which we can conveniently print or execute it). */ static void -prefixify_expression (register struct expression *expr) +prefixify_expression (struct expression *expr) { - register int len = + int len = sizeof (struct expression) + EXP_ELEM_TO_BYTES (expr->nelts); - register struct expression *temp; - register int inpos = expr->nelts, outpos = 0; + struct expression *temp; + int inpos = expr->nelts, outpos = 0; temp = (struct expression *) alloca (len); @@ -788,11 +788,11 @@ prefixify_expression (register struct expression *expr) whose last exp_element is at index ENDPOS - 1 in EXPR. */ int -length_of_subexp (register struct expression *expr, register int endpos) +length_of_subexp (struct expression *expr, int endpos) { - register int oplen = 1; - register int args = 0; - register int i; + int oplen = 1; + int args = 0; + int i; if (endpos < 1) error ("?error in length_of_subexp"); @@ -930,12 +930,12 @@ length_of_subexp (register struct expression *expr, register int endpos) In the process, convert it from suffix to prefix form. */ static void -prefixify_subexp (register struct expression *inexpr, - struct expression *outexpr, register int inend, int outbeg) +prefixify_subexp (struct expression *inexpr, + struct expression *outexpr, int inend, int outbeg) { - register int oplen = 1; - register int args = 0; - register int i; + int oplen = 1; + int args = 0; + int i; int *arglens; enum exp_opcode opcode; @@ -1175,7 +1175,7 @@ parse_exp_1 (char **stringptr, struct block *block, int comma) struct expression * parse_expression (char *string) { - register struct expression *exp; + struct expression *exp; exp = parse_exp_1 (&string, 0, 0); if (*string) error ("Junk after end of expression."); diff --git a/gdb/scm-lang.c b/gdb/scm-lang.c index 0a59ea94ae..83d88ccd63 100644 --- a/gdb/scm-lang.c +++ b/gdb/scm-lang.c @@ -202,8 +202,8 @@ scm_evaluate_string (char *str, int len) } static struct value * -evaluate_subexp_scm (struct type *expect_type, register struct expression *exp, - register int *pos, enum noside noside) +evaluate_subexp_scm (struct type *expect_type, struct expression *exp, + int *pos, enum noside noside) { enum exp_opcode op = exp->elts[*pos].opcode; int len, pc; -- 2.34.1