From 5aafa1cc49c9a87aeb3e0aeaede8155fdf9f1645 Mon Sep 17 00:00:00 2001 From: Pierre Muller Date: Tue, 6 Oct 2009 22:47:20 +0000 Subject: [PATCH 1/1] ARI fix: OP eol rule. * blockframe.c (find_pc_partial_function): Avoid operator at end of line. * buildsym.c (find_symbol_in_list): Idem. (start_subfile, patch_subfile_names): Idem. * c-exp.y (variable, yylex): Idem. * c-typeprint.c (c_print_type, c_type_print_base): Idem. * c-valprint.c (c_val_print): Idem. * coffread.c (patch_opaque_types, process_coff_symbol): Idem. * corelow.c (core_open): Idem. * cris-tdep.c (move_reg_to_mem_movem_op): Idem. * cli/cli-decode.c (help_cmd_list, find_command_name_length): Idem. --- gdb/ChangeLog | 15 +++++++++++++++ gdb/blockframe.c | 6 +++--- gdb/buildsym.c | 12 ++++++------ gdb/c-exp.y | 17 +++++++++-------- gdb/c-typeprint.c | 42 ++++++++++++++++++++---------------------- gdb/c-valprint.c | 4 ++-- gdb/cli/cli-decode.c | 14 +++++++------- gdb/coffread.c | 20 ++++++++++---------- gdb/corelow.c | 4 ++-- gdb/cris-tdep.c | 4 ++-- 10 files changed, 76 insertions(+), 62 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 81ff78105a..d39a1639cd 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,18 @@ +2009-10-06 Pierre Muller + + ARI fix: OP eol rule. + * blockframe.c (find_pc_partial_function): Avoid operator at end of + line. + * buildsym.c (find_symbol_in_list): Idem. + (start_subfile, patch_subfile_names): Idem. + * c-exp.y (variable, yylex): Idem. + * c-typeprint.c (c_print_type, c_type_print_base): Idem. + * c-valprint.c (c_val_print): Idem. + * coffread.c (patch_opaque_types, process_coff_symbol): Idem. + * corelow.c (core_open): Idem. + * cris-tdep.c (move_reg_to_mem_movem_op): Idem. + * cli/cli-decode.c (help_cmd_list, find_command_name_length): Idem. + 2009-10-06 Pierre Muller ARI fix: OP eol rule. diff --git a/gdb/blockframe.c b/gdb/blockframe.c index 09608371f8..f3d631108a 100644 --- a/gdb/blockframe.c +++ b/gdb/blockframe.c @@ -253,9 +253,9 @@ find_pc_partial_function (CORE_ADDR pc, char **name, CORE_ADDR *address, psb = find_pc_sect_psymbol (pst, mapped_pc, section); if (psb - && (msymbol == NULL || - (SYMBOL_VALUE_ADDRESS (psb) - >= SYMBOL_VALUE_ADDRESS (msymbol)))) + && (msymbol == NULL + || (SYMBOL_VALUE_ADDRESS (psb) + >= SYMBOL_VALUE_ADDRESS (msymbol)))) { /* This case isn't being cached currently. */ if (address) diff --git a/gdb/buildsym.c b/gdb/buildsym.c index 9324a14e3f..0385383e20 100644 --- a/gdb/buildsym.c +++ b/gdb/buildsym.c @@ -163,8 +163,8 @@ find_symbol_in_list (struct pending *list, char *name, int length) for (j = list->nsyms; --j >= 0;) { pp = SYMBOL_LINKAGE_NAME (list->symbol[j]); - if (*pp == *name && strncmp (pp, name, length) == 0 && - pp[length] == '\0') + if (*pp == *name && strncmp (pp, name, length) == 0 + && pp[length] == '\0') { return (list->symbol[j]); } @@ -583,8 +583,8 @@ start_subfile (char *name, char *dirname) source file. */ subfile->language = deduce_language_from_filename (subfile->name); - if (subfile->language == language_unknown && - subfile->next != NULL) + if (subfile->language == language_unknown + && subfile->next != NULL) { subfile->language = subfile->next->language; } @@ -656,8 +656,8 @@ patch_subfile_names (struct subfile *subfile, char *name) symbols have been processed for a given source file. */ subfile->language = deduce_language_from_filename (subfile->name); - if (subfile->language == language_unknown && - subfile->next != NULL) + if (subfile->language == language_unknown + && subfile->next != NULL) { subfile->language = subfile->next->language; } diff --git a/gdb/c-exp.y b/gdb/c-exp.y index f5abacf378..6d604c4253 100644 --- a/gdb/c-exp.y +++ b/gdb/c-exp.y @@ -777,9 +777,9 @@ variable: name_not_typename { if (symbol_read_needs_frame (sym)) { - if (innermost_block == 0 || - contained_in (block_found, - innermost_block)) + if (innermost_block == 0 + || contained_in (block_found, + innermost_block)) innermost_block = block_found; } @@ -796,8 +796,9 @@ variable: name_not_typename /* C++: it hangs off of `this'. Must not inadvertently convert from a method call to data ref. */ - if (innermost_block == 0 || - contained_in (block_found, innermost_block)) + if (innermost_block == 0 + || contained_in (block_found, + innermost_block)) innermost_block = block_found; write_exp_elt_opcode (OP_THIS); write_exp_elt_opcode (OP_THIS); @@ -2174,9 +2175,9 @@ yylex (void) /* Input names that aren't symbols but ARE valid hex numbers, when the input radix permits them, can be names or numbers depending on the parse. Note we support radixes > 16 here. */ - if (!sym && - ((tokstart[0] >= 'a' && tokstart[0] < 'a' + input_radix - 10) || - (tokstart[0] >= 'A' && tokstart[0] < 'A' + input_radix - 10))) + if (!sym + && ((tokstart[0] >= 'a' && tokstart[0] < 'a' + input_radix - 10) + || (tokstart[0] >= 'A' && tokstart[0] < 'A' + input_radix - 10))) { YYSTYPE newlval; /* Its value is ignored. */ hextype = parse_number (tokstart, namelen, 0, &newlval); diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c index b193080db8..807eec1678 100644 --- a/gdb/c-typeprint.c +++ b/gdb/c-typeprint.c @@ -70,17 +70,15 @@ c_print_type (struct type *type, char *varstring, struct ui_file *stream, c_type_print_base (type, stream, show, level); code = TYPE_CODE (type); if ((varstring != NULL && *varstring != '\0') - || /* Need a space if going to print stars or brackets; but not if we will print just a type name. */ - ((show > 0 || TYPE_NAME (type) == 0) - && - (code == TYPE_CODE_PTR || code == TYPE_CODE_FUNC - || code == TYPE_CODE_METHOD - || code == TYPE_CODE_ARRAY - || code == TYPE_CODE_MEMBERPTR - || code == TYPE_CODE_METHODPTR - || code == TYPE_CODE_REF))) + || ((show > 0 || TYPE_NAME (type) == 0) + && (code == TYPE_CODE_PTR || code == TYPE_CODE_FUNC + || code == TYPE_CODE_METHOD + || code == TYPE_CODE_ARRAY + || code == TYPE_CODE_MEMBERPTR + || code == TYPE_CODE_METHODPTR + || code == TYPE_CODE_REF))) fputs_filtered (" ", stream); need_post_space = (varstring != NULL && strcmp (varstring, "") != 0); c_type_print_varspec_prefix (type, stream, show, 0, need_post_space); @@ -747,8 +745,8 @@ c_type_print_base (struct type *type, struct ui_file *stream, int show, * tag for unnamed struct/union/enum's, which we don't * want to print. */ - if (TYPE_TAG_NAME (type) != NULL && - strncmp (TYPE_TAG_NAME (type), "{unnamed", 8)) + if (TYPE_TAG_NAME (type) != NULL + && strncmp (TYPE_TAG_NAME (type), "{unnamed", 8)) { fputs_filtered (TYPE_TAG_NAME (type), stream); if (show > 0) @@ -785,8 +783,8 @@ c_type_print_base (struct type *type, struct ui_file *stream, int show, masquerading as a class, if all members are public, there's no need for a "public:" label. */ - if ((TYPE_DECLARED_TYPE (type) == DECLARED_TYPE_CLASS) || - (TYPE_DECLARED_TYPE (type) == DECLARED_TYPE_TEMPLATE)) + if ((TYPE_DECLARED_TYPE (type) == DECLARED_TYPE_CLASS) + || (TYPE_DECLARED_TYPE (type) == DECLARED_TYPE_TEMPLATE)) { QUIT; len = TYPE_NFIELDS (type); @@ -814,8 +812,8 @@ c_type_print_base (struct type *type, struct ui_file *stream, int show, } } } - else if ((TYPE_DECLARED_TYPE (type) == DECLARED_TYPE_STRUCT) || - (TYPE_DECLARED_TYPE (type) == DECLARED_TYPE_UNION)) + else if ((TYPE_DECLARED_TYPE (type) == DECLARED_TYPE_STRUCT) + || (TYPE_DECLARED_TYPE (type) == DECLARED_TYPE_UNION)) { QUIT; len = TYPE_NFIELDS (type); @@ -834,8 +832,8 @@ c_type_print_base (struct type *type, struct ui_file *stream, int show, QUIT; len = TYPE_FN_FIELDLIST_LENGTH (type, j); for (i = 0; i < len; i++) - if (TYPE_FN_FIELD_PRIVATE (TYPE_FN_FIELDLIST1 (type, j), i) || - TYPE_FN_FIELD_PROTECTED (TYPE_FN_FIELDLIST1 (type, j), i)) + if (TYPE_FN_FIELD_PRIVATE (TYPE_FN_FIELDLIST1 (type, j), i) + || TYPE_FN_FIELD_PROTECTED (TYPE_FN_FIELDLIST1 (type, j), i)) { need_access_label = 1; break; @@ -986,9 +984,9 @@ c_type_print_base (struct type *type, struct ui_file *stream, int show, TYPE_FN_FIELD_PHYSNAME (f, j)); break; } - else if (!is_constructor && /* constructors don't have declared types */ - !is_full_physname_constructor && /* " " */ - !is_type_conversion_operator (type, i, j)) + else if (!is_constructor /* constructors don't have declared types */ + && !is_full_physname_constructor /* " " */ + && !is_type_conversion_operator (type, i, j)) { type_print (TYPE_TARGET_TYPE (TYPE_FN_FIELD_TYPE (f, j)), "", stream, -1); @@ -1070,8 +1068,8 @@ c_type_print_base (struct type *type, struct ui_file *stream, int show, "{unnamed struct}"/"{unnamed union}"/"{unnamed enum}" tag for unnamed struct/union/enum's, which we don't want to print. */ - if (TYPE_TAG_NAME (type) != NULL && - strncmp (TYPE_TAG_NAME (type), "{unnamed", 8)) + if (TYPE_TAG_NAME (type) != NULL + && strncmp (TYPE_TAG_NAME (type), "{unnamed", 8)) { fputs_filtered (TYPE_TAG_NAME (type), stream); if (show > 0) diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c index c20bfa7845..e6fbffe61c 100644 --- a/gdb/c-valprint.c +++ b/gdb/c-valprint.c @@ -291,8 +291,8 @@ c_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (vt_address); - if ((msymbol != NULL) && - (vt_address == SYMBOL_VALUE_ADDRESS (msymbol))) + if ((msymbol != NULL) + && (vt_address == SYMBOL_VALUE_ADDRESS (msymbol))) { fputs_filtered (" <", stream); fputs_filtered (SYMBOL_PRINT_NAME (msymbol), stream); diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c index 3e4f6f57f9..41328ff821 100644 --- a/gdb/cli/cli-decode.c +++ b/gdb/cli/cli-decode.c @@ -1051,10 +1051,10 @@ help_cmd_list (struct cmd_list_element *list, enum command_class class, for (c = list; c; c = c->next) { - if (c->abbrev_flag == 0 && - (class == all_commands - || (class == all_classes && c->func == NULL) - || (class == c->class && c->func != NULL))) + if (c->abbrev_flag == 0 + && (class == all_commands + || (class == all_classes && c->func == NULL) + || (class == c->class && c->func != NULL))) { print_help_for_command (c, prefix, recurse, stream); } @@ -1108,11 +1108,11 @@ find_command_name_length (const char *text) used as a suffix for print, examine and display. Note that this is larger than the character set allowed when creating user-defined commands. */ - while (isalnum (*p) || *p == '-' || *p == '_' || + while (isalnum (*p) || *p == '-' || *p == '_' /* Characters used by TUI specific commands. */ - *p == '+' || *p == '<' || *p == '>' || *p == '$' || + || *p == '+' || *p == '<' || *p == '>' || *p == '$' /* Characters used for XDB compatibility. */ - (xdb_commands && (*p == '!' || *p == '/' || *p == '?'))) + || (xdb_commands && (*p == '!' || *p == '/' || *p == '?'))) p++; return p - text; diff --git a/gdb/coffread.c b/gdb/coffread.c index 888f8b4be5..3e68698ef9 100644 --- a/gdb/coffread.c +++ b/gdb/coffread.c @@ -1434,10 +1434,10 @@ patch_opaque_types (struct symtab *s) Remove syms from the chain when their types are stored, but search the whole chain, as there may be several syms from different files with the same name. */ - if (SYMBOL_CLASS (real_sym) == LOC_TYPEDEF && - SYMBOL_DOMAIN (real_sym) == VAR_DOMAIN && - TYPE_CODE (SYMBOL_TYPE (real_sym)) == TYPE_CODE_PTR && - TYPE_LENGTH (TYPE_TARGET_TYPE (SYMBOL_TYPE (real_sym))) != 0) + if (SYMBOL_CLASS (real_sym) == LOC_TYPEDEF + && SYMBOL_DOMAIN (real_sym) == VAR_DOMAIN + && TYPE_CODE (SYMBOL_TYPE (real_sym)) == TYPE_CODE_PTR + && TYPE_LENGTH (TYPE_TARGET_TYPE (SYMBOL_TYPE (real_sym))) != 0) { char *name = SYMBOL_LINKAGE_NAME (real_sym); int hash = hashname (name); @@ -1446,8 +1446,8 @@ patch_opaque_types (struct symtab *s) prev = 0; for (sym = opaque_type_chain[hash]; sym;) { - if (name[0] == SYMBOL_LINKAGE_NAME (sym)[0] && - strcmp (name + 1, SYMBOL_LINKAGE_NAME (sym) + 1) == 0) + if (name[0] == SYMBOL_LINKAGE_NAME (sym)[0] + && strcmp (name + 1, SYMBOL_LINKAGE_NAME (sym) + 1) == 0) { if (prev) { @@ -1632,10 +1632,10 @@ process_coff_symbol (struct coff_symbol *cs, simple forward reference (TYPE_CODE_UNDEF) is not an empty structured type, though; the forward references work themselves out via the magic of coff_lookup_type. */ - if (TYPE_CODE (SYMBOL_TYPE (sym)) == TYPE_CODE_PTR && - TYPE_LENGTH (TYPE_TARGET_TYPE (SYMBOL_TYPE (sym))) == 0 && - TYPE_CODE (TYPE_TARGET_TYPE (SYMBOL_TYPE (sym))) != - TYPE_CODE_UNDEF) + if (TYPE_CODE (SYMBOL_TYPE (sym)) == TYPE_CODE_PTR + && TYPE_LENGTH (TYPE_TARGET_TYPE (SYMBOL_TYPE (sym))) == 0 + && TYPE_CODE (TYPE_TARGET_TYPE (SYMBOL_TYPE (sym))) + != TYPE_CODE_UNDEF) { int i = hashname (SYMBOL_LINKAGE_NAME (sym)); diff --git a/gdb/corelow.c b/gdb/corelow.c index 49de82d635..b1cb8f4cc7 100644 --- a/gdb/corelow.c +++ b/gdb/corelow.c @@ -321,8 +321,8 @@ core_open (char *filename, int from_tty) if (temp_bfd == NULL) perror_with_name (filename); - if (!bfd_check_format (temp_bfd, bfd_core) && - !gdb_check_format (temp_bfd)) + if (!bfd_check_format (temp_bfd, bfd_core) + && !gdb_check_format (temp_bfd)) { /* Do it after the err msg */ /* FIXME: should be checking for errors from bfd_close (for one thing, diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c index 69e7e5bd4b..48f45deb86 100644 --- a/gdb/cris-tdep.c +++ b/gdb/cris-tdep.c @@ -3128,8 +3128,8 @@ move_reg_to_mem_movem_op (unsigned short inst, inst_env_type *inst_env) { /* The assign value is the value after the increment. Normally, the assign value is the value before the increment. */ - if ((cris_get_operand1 (inst) == REG_PC) && - (cris_get_mode (inst) == PREFIX_ASSIGN_MODE)) + if ((cris_get_operand1 (inst) == REG_PC) + && (cris_get_mode (inst) == PREFIX_ASSIGN_MODE)) { /* The prefix handles the problem if we are in a delay slot. */ inst_env->reg[REG_PC] = inst_env->prefix_value; -- 2.34.1