FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARI fix: OP eol rule.

Browse source 
* doublest.c (floatformat_from_length): Avoid operator at end of line.
	* dwarf2-frame.c (dwarf2_build_frame_info): Idem.
	* dwarf2read.c (read_array_order, dwarf_decode_macros): Idem.
	* eval.c (evaluate_subexp_standard): Idem.
	* event-loop.c (create_timer, handle_timer_event): Idem.
	* expprint.c (print_subexp_standard): Idem.
	* f-exp.y (variable): Idem.
	* f-typeprint.c (f_print_type): Idem.
This commit is contained in:
Pierre Muller 2009-10-06 23:27:05 +00:00
parent 364c7fa5c9
commit 905e0470f4
9 changed files with 54 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

12
gdb/ChangeLog
View file

@ -1,3 +1,15 @@
2009-10-07 Pierre Muller <muller@ics.u-strasbg.fr>
ARI fix: OP eol rule.
* doublest.c (floatformat_from_length): Avoid operator at end of line.
* dwarf2-frame.c (dwarf2_build_frame_info): Idem.
* dwarf2read.c (read_array_order, dwarf_decode_macros): Idem.
* eval.c (evaluate_subexp_standard): Idem.
* event-loop.c (create_timer, handle_timer_event): Idem.
* expprint.c (print_subexp_standard): Idem.
* f-exp.y (variable): Idem.
* f-typeprint.c (f_print_type): Idem.
2009-10-06 Pierre Muller <muller@ics.u-strasbg.fr> 2009-10-06 Pierre Muller <muller@ics.u-strasbg.fr>
ARI fix: OP eol rule. ARI fix: OP eol rule.

4
gdb/doublest.c
View file

@ -778,8 +778,8 @@ floatformat_from_length (struct gdbarch *gdbarch, int len)
both in processor and in memory. both in processor and in memory.
The code below accepts the real bit size. */ The code below accepts the real bit size. */
else if ((gdbarch_long_double_format (gdbarch) != NULL) else if ((gdbarch_long_double_format (gdbarch) != NULL)
&& (len * TARGET_CHAR_BIT == && (len * TARGET_CHAR_BIT
gdbarch_long_double_format (gdbarch)[0]->totalsize)) == gdbarch_long_double_format (gdbarch)[0]->totalsize))
format = gdbarch_long_double_format (gdbarch) format = gdbarch_long_double_format (gdbarch)
[gdbarch_byte_order (gdbarch)]; [gdbarch_byte_order (gdbarch)];
else else

4
gdb/dwarf2-frame.c
View file

@ -2112,8 +2112,8 @@ dwarf2_build_frame_info (struct objfile *objfile)
obstack_grow (&objfile->objfile_obstack, &fde_table.entries[j], obstack_grow (&objfile->objfile_obstack, &fde_table.entries[j],
sizeof (fde_table.entries[0])); sizeof (fde_table.entries[0]));
while (++j < fde_table.num_entries while (++j < fde_table.num_entries
&& (fde_table.entries[k]->initial_location == && (fde_table.entries[k]->initial_location
fde_table.entries[j]->initial_location)) == fde_table.entries[j]->initial_location))
/* Skip. */; /* Skip. */;
} }
fde_table2->entries = obstack_finish (&objfile->objfile_obstack); fde_table2->entries = obstack_finish (&objfile->objfile_obstack);

22
gdb/dwarf2read.c
View file

@ -5383,8 +5383,8 @@ read_array_order (struct die_info *die, struct dwarf2_cu *cu)
version checking. version checking.
*/ */
if (cu->language == language_fortran && if (cu->language == language_fortran
cu->producer && strstr (cu->producer, "GNU F77")) && cu->producer && strstr (cu->producer, "GNU F77"))
{ {
return DW_ORD_row_major; return DW_ORD_row_major;
} }
@ -11156,20 +11156,22 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
complaint (&symfile_complaints, complaint (&symfile_complaints,
_("debug info with no main source gives macro %s " _("debug info with no main source gives macro %s "
"on line %d: %s"), "on line %d: %s"),
macinfo_type == macinfo_type == DW_MACINFO_define ?
DW_MACINFO_define ? _("definition") : macinfo_type == _("definition") :
DW_MACINFO_undef ? _("undefinition") : macinfo_type == DW_MACINFO_undef ?
"something-or-other", line, body); _("undefinition") :
_("something-or-other"), line, body);
break; break;
} }
if ((line == 0 && !at_commandline) || (line != 0 && at_commandline)) if ((line == 0 && !at_commandline) || (line != 0 && at_commandline))
complaint (&symfile_complaints, complaint (&symfile_complaints,
_("debug info gives %s macro %s with %s line %d: %s"), _("debug info gives %s macro %s with %s line %d: %s"),
at_commandline ? _("command-line") : _("in-file"), at_commandline ? _("command-line") : _("in-file"),
macinfo_type == macinfo_type == DW_MACINFO_define ?
DW_MACINFO_define ? _("definition") : macinfo_type == _("definition") :
DW_MACINFO_undef ? _("undefinition") : macinfo_type == DW_MACINFO_undef ?
"something-or-other", _("undefinition") :
_("something-or-other"),
line == 0 ? _("zero") : _("non-zero"), line, body); line == 0 ? _("zero") : _("non-zero"), line, body);
if (macinfo_type == DW_MACINFO_define) if (macinfo_type == DW_MACINFO_define)

20
gdb/eval.c
View file

@ -884,8 +884,8 @@ evaluate_subexp_standard (struct type *expect_type,
LONGEST low_bound, high_bound; LONGEST low_bound, high_bound;
/* get targettype of elementtype */ /* get targettype of elementtype */
while (TYPE_CODE (check_type) == TYPE_CODE_RANGE || while (TYPE_CODE (check_type) == TYPE_CODE_RANGE
TYPE_CODE (check_type) == TYPE_CODE_TYPEDEF) || TYPE_CODE (check_type) == TYPE_CODE_TYPEDEF)
check_type = TYPE_TARGET_TYPE (check_type); check_type = TYPE_TARGET_TYPE (check_type);
if (get_discrete_bounds (element_type, &low_bound, &high_bound) < 0) if (get_discrete_bounds (element_type, &low_bound, &high_bound) < 0)
@ -919,14 +919,14 @@ evaluate_subexp_standard (struct type *expect_type,
range_low_type = TYPE_TARGET_TYPE (range_low_type); range_low_type = TYPE_TARGET_TYPE (range_low_type);
if (TYPE_CODE (range_high_type) == TYPE_CODE_RANGE) if (TYPE_CODE (range_high_type) == TYPE_CODE_RANGE)
range_high_type = TYPE_TARGET_TYPE (range_high_type); range_high_type = TYPE_TARGET_TYPE (range_high_type);
if ((TYPE_CODE (range_low_type) != TYPE_CODE (range_high_type)) || if ((TYPE_CODE (range_low_type) != TYPE_CODE (range_high_type))
(TYPE_CODE (range_low_type) == TYPE_CODE_ENUM && || (TYPE_CODE (range_low_type) == TYPE_CODE_ENUM
(range_low_type != range_high_type))) && (range_low_type != range_high_type)))
/* different element modes */ /* different element modes */
error (_("POWERSET tuple elements of different mode")); error (_("POWERSET tuple elements of different mode"));
if ((TYPE_CODE (check_type) != TYPE_CODE (range_low_type)) || if ((TYPE_CODE (check_type) != TYPE_CODE (range_low_type))
(TYPE_CODE (check_type) == TYPE_CODE_ENUM && || (TYPE_CODE (check_type) == TYPE_CODE_ENUM
range_low_type != check_type)) && range_low_type != check_type))
error (_("incompatible POWERSET tuple elements")); error (_("incompatible POWERSET tuple elements"));
if (range_low > range_high) if (range_low > range_high)
{ {
@ -1662,8 +1662,8 @@ evaluate_subexp_standard (struct type *expect_type,
struct value_print_options opts; struct value_print_options opts;
get_user_print_options (&opts); get_user_print_options (&opts);
if (opts.objectprint && TYPE_TARGET_TYPE(type) && if (opts.objectprint && TYPE_TARGET_TYPE(type)
(TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_CLASS)) && (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_CLASS))
{ {
real_type = value_rtti_target_type (arg1, &full, &top, &using_enc); real_type = value_rtti_target_type (arg1, &full, &top, &using_enc);
if (real_type) if (real_type)

10
gdb/event-loop.c
View file

@ -1212,8 +1212,8 @@ create_timer (int milliseconds, timer_handler_func * proc, gdb_client_data clien
{ {
/* If the seconds field is greater or if it is the same, but the /* If the seconds field is greater or if it is the same, but the
microsecond field is greater. */ microsecond field is greater. */
if ((timer_index->when.tv_sec > timer_ptr->when.tv_sec) || if ((timer_index->when.tv_sec > timer_ptr->when.tv_sec)
((timer_index->when.tv_sec == timer_ptr->when.tv_sec) || ((timer_index->when.tv_sec == timer_ptr->when.tv_sec)
&& (timer_index->when.tv_usec > timer_ptr->when.tv_usec))) && (timer_index->when.tv_usec > timer_ptr->when.tv_usec)))
break; break;
} }
@ -1288,9 +1288,9 @@ handle_timer_event (event_data dummy)
while (timer_ptr != NULL) while (timer_ptr != NULL)
{ {
if ((timer_ptr->when.tv_sec > time_now.tv_sec) || if ((timer_ptr->when.tv_sec > time_now.tv_sec)
((timer_ptr->when.tv_sec == time_now.tv_sec) && || ((timer_ptr->when.tv_sec == time_now.tv_sec)
(timer_ptr->when.tv_usec > time_now.tv_usec))) && (timer_ptr->when.tv_usec > time_now.tv_usec)))
break; break;
/* Get rid of the timer from the beginning of the list. */ /* Get rid of the timer from the beginning of the list. */

4
gdb/expprint.c
View file

@ -413,8 +413,8 @@ print_subexp_standard (struct expression *exp, int *pos,
(*pos) += 2; (*pos) += 2;
if ((int) prec > (int) PREC_PREFIX) if ((int) prec > (int) PREC_PREFIX)
fputs_filtered ("(", stream); fputs_filtered ("(", stream);
if (TYPE_CODE (exp->elts[pc + 1].type) == TYPE_CODE_FUNC && if (TYPE_CODE (exp->elts[pc + 1].type) == TYPE_CODE_FUNC
exp->elts[pc + 3].opcode == OP_LONG) && exp->elts[pc + 3].opcode == OP_LONG)
{ {
struct value_print_options opts; struct value_print_options opts;

4
gdb/f-exp.y
View file

@ -492,8 +492,8 @@ variable: name_not_typename
{ {
if (symbol_read_needs_frame (sym)) if (symbol_read_needs_frame (sym))
{ {
if (innermost_block == 0 || if (innermost_block == 0
contained_in (block_found, || contained_in (block_found,
innermost_block)) innermost_block))
innermost_block = block_found; innermost_block = block_found;
} }

6
gdb/f-typeprint.c
View file

@ -60,12 +60,10 @@ f_print_type (struct type *type, char *varstring, struct ui_file *stream,
f_type_print_base (type, stream, show, level); f_type_print_base (type, stream, show, level);
code = TYPE_CODE (type); code = TYPE_CODE (type);
if ((varstring != NULL && *varstring != '\0') if ((varstring != NULL && *varstring != '\0')
||
/* Need a space if going to print stars or brackets; /* Need a space if going to print stars or brackets;
but not if we will print just a type name. */ but not if we will print just a type name. */
((show > 0 || TYPE_NAME (type) == 0) || ((show > 0 || TYPE_NAME (type) == 0)
&& && (code == TYPE_CODE_PTR || code == TYPE_CODE_FUNC
(code == TYPE_CODE_PTR || code == TYPE_CODE_FUNC
|| code == TYPE_CODE_METHOD || code == TYPE_CODE_METHOD
|| code == TYPE_CODE_ARRAY || code == TYPE_CODE_ARRAY
|| code == TYPE_CODE_REF))) || code == TYPE_CODE_REF)))