diff options
author | Nick Clifton <nickc@redhat.com> | 2009-09-11 15:27:38 +0000 |
---|---|---|
committer | Nick Clifton <nickc@redhat.com> | 2009-09-11 15:27:38 +0000 |
commit | 1e9cc1c27b927dc95dfaec390eb492d29bbc7a0b (patch) | |
tree | 53a3c5ddeb73ec0cf10bb3c6e02d1a4b35a727a7 /gas/expr.c | |
parent | e23bb3fc8406336ae8bbfe860ef06d4685ba96eb (diff) | |
download | gdb-1e9cc1c27b927dc95dfaec390eb492d29bbc7a0b.zip gdb-1e9cc1c27b927dc95dfaec390eb492d29bbc7a0b.tar.gz gdb-1e9cc1c27b927dc95dfaec390eb492d29bbc7a0b.tar.bz2 |
* po/bfd.pot: Updated by the Translation project.
* po/binutils.pot: Updated by the Translation project.
* po/gold.pot: Updated by the Translation project.
* po/gold.pot: Updated by the Translation project.
* po/gprof.pot: Updated by the Translation project.
* po/sv.po: Updated Swedish translation.
* po/ld.pot: Updated by the Translation project.
* po/fi.po: Updated Finnish translation.
* po/ld.pot: Updated by the Translation project.
* po/fi.po: Updated Finnish translation.
Updated sources to compile cleanly with -Wc++-compat:
* basic_blocks.c: Add casts.
* cg_dfn.c: Add cast.
* corefile.c: Add casts.
* gmon_io.c: Add casts.
* hist.c: Add cast.
* source.c: Add cast.
* sym_ids.c (struct match): Moved to top level.
Updated soruces in ld/* to compile cleanly with -Wc++-compat:
* ld.h (enum endian_enum,enum symbolic_enum,enum dynamic_list_enum): Move to top level.
* ldcref.c: Add casts.
* ldctor.c: Add casts.
* ldexp.c
* ldexp.h (enum node_tree_enum,enum phase_enum): Move to top level.
* ldlang.c: Add casts. (lang_insert_orphan): Use enum name instead of integer.
* ldlang.h (enum statement_enum): Move to top level.
* ldmain.c: Add casts.
* ldwrite.c: Add casts.
* lexsup.c: Add casts. (enum control_enum): Move to top level.
* mri.c: Add casts. (mri_draw_tree): Use enum name instead of integer.
Updated sources to compile cleanly with -Wc++-compat:
* basic_blocks.c: Add casts.
* cg_dfn.c: Add cast.
* corefile.c: Add casts.
* gmon_io.c: Add casts.
* hist.c: Add cast.
* source.c: Add cast.
* sym_ids.c (struct match): Moved to top level.
* as.c (main): Call dwarf2_init.
* config/obj-elf.c (struct group_list): New field.
(build_group_lists): Use hash lookup.
(free_section_idx): New function.
(elf_frob_file): Adjust.
* dwarf2dbg.c (all_segs_hash, last_seg_ptr): New variables.
(get_line_subseg): Adjust.
(dwarf2_init): New function.
* dwarf2dbg.h (dwarf2_init): New declaration.
Diffstat (limited to 'gas/expr.c')
-rw-r--r-- | gas/expr.c | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -48,7 +48,7 @@ static void mri_char_constant (expressionS *); static void current_location (expressionS *); static void clean_up_expression (expressionS * expressionP); static segT operand (expressionS *, enum expr_mode); -static operatorT operator (int *); +static operatorT operatorf (int *); extern const char EXP_CHARS[], FLT_CHARS[]; @@ -1228,9 +1228,9 @@ operand (expressionS *expressionP, enum expr_mode mode) #ifdef md_operator { - operatorT operator = md_operator (name, 1, &c); + operatorT op = md_operator (name, 1, &c); - switch (operator) + switch (op) { case O_uminus: *input_line_pointer = c; @@ -1250,14 +1250,14 @@ operand (expressionS *expressionP, enum expr_mode mode) default: break; } - if (operator != O_absent && operator != O_illegal) + if (op != O_absent && op != O_illegal) { *input_line_pointer = c; expr (9, expressionP, mode); expressionP->X_add_symbol = make_expr_symbol (expressionP); expressionP->X_op_symbol = NULL; expressionP->X_add_number = 0; - expressionP->X_op = operator; + expressionP->X_op = op; break; } } @@ -1546,10 +1546,10 @@ expr_set_precedence (void) } void -expr_set_rank (operatorT operator, operator_rankT rank) +expr_set_rank (operatorT op, operator_rankT rank) { - gas_assert (operator >= O_md1 && operator < ARRAY_SIZE (op_rank)); - op_rank[operator] = rank; + gas_assert (op >= O_md1 && op < ARRAY_SIZE (op_rank)); + op_rank[op] = rank; } /* Initialize the expression parser. */ @@ -1572,7 +1572,7 @@ expr_begin (void) Does not advance INPUT_LINE_POINTER. */ static inline operatorT -operator (int *num_chars) +operatorf (int *num_chars) { int c; operatorT ret; @@ -1732,7 +1732,7 @@ expr (int rankarg, /* Larger # is higher rank. */ /* operand () gobbles spaces. */ know (*input_line_pointer != ' '); - op_left = operator (&op_chars); + op_left = operatorf (&op_chars); while (op_left != O_illegal && op_rank[(int) op_left] > rank) { segT rightseg; @@ -1763,7 +1763,7 @@ expr (int rankarg, /* Larger # is higher rank. */ } } - op_right = operator (&op_chars); + op_right = operatorf (&op_chars); know (op_right == O_illegal || op_left == O_index || op_rank[(int) op_right] <= op_rank[(int) op_left]); |