From a77f5182c7d7ee65904c073161053e330bc8eed1 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 22 Jun 1999 14:35:19 +0000 Subject: [PATCH] * config/tc-arc.c (get_arc_exp_reloc_type): Change uses of sy_value with appropriate accessor functions. * config/tc-arm.c (md_apply_fix3): Likewise. * config/tc-d10v.c (AT_WORD_P): Likewise. * config/tc-v850.c (reg_name_search): Likewise. --- gas/ChangeLog | 6 ++++++ gas/config/tc-arc.c | 13 +++++++------ gas/config/tc-arm.c | 2 +- gas/config/tc-d10v.c | 4 ++-- gas/config/tc-v850.c | 4 ++-- 5 files changed, 18 insertions(+), 11 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 8959b51cbc5..6e0057627d7 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,5 +1,11 @@ 1999-06-22 Ian Lance Taylor + * config/tc-arc.c (get_arc_exp_reloc_type): Change uses of + sy_value with appropriate accessor functions. + * config/tc-arm.c (md_apply_fix3): Likewise. + * config/tc-d10v.c (AT_WORD_P): Likewise. + * config/tc-v850.c (reg_name_search): Likewise. + * config/obj-ecoff.c (obj_ecoff_set_ext): Change uses of bsym to use symbol_get_bfdsym instead. * config/tc-ppc.c (md_assemble): Likewise. diff --git a/gas/config/tc-arc.c b/gas/config/tc-arc.c index 55543da3361..ccacd259d73 100644 --- a/gas/config/tc-arc.c +++ b/gas/config/tc-arc.c @@ -1242,13 +1242,13 @@ get_arc_exp_reloc_type (data_p, default_type, exp, expnew) if (exp->X_op == O_right_shift && exp->X_op_symbol != NULL - && exp->X_op_symbol->sy_value.X_op == O_constant - && exp->X_op_symbol->sy_value.X_add_number == 2 + && symbol_constant_p (exp->X_op_symbol) + && S_GET_VALUE (exp->X_op_symbol) == 2 && exp->X_add_number == 0) { if (exp->X_add_symbol != NULL - && (exp->X_add_symbol->sy_value.X_op == O_constant - || exp->X_add_symbol->sy_value.X_op == O_symbol)) + && (symbol_constant_p (exp->X_add_symbol) + || symbol_equated_p (exp->X_add_symbol))) { *expnew = *exp; expnew->X_op = O_symbol; @@ -1256,9 +1256,10 @@ get_arc_exp_reloc_type (data_p, default_type, exp, expnew) return data_p ? BFD_RELOC_ARC_B26 : arc_operand_map['J']; } else if (exp->X_add_symbol != NULL - && exp->X_add_symbol->sy_value.X_op == O_subtract) + && (symbol_get_value_expression (exp->X_add_symbol)->X_op + == O_subtract)) { - *expnew = exp->X_add_symbol->sy_value; + *expnew = *symbol_get_value_expression (exp->X_add_symbol); return data_p ? BFD_RELOC_ARC_B26 : arc_operand_map['J']; } } diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index f22fee03866..9900b3199c0 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -5279,7 +5279,7 @@ md_apply_fix3 (fixP, val, seg) /* Note whether this will delete the relocation. */ #if 0 /* patch from REarnshaw to JDavis (disabled for the moment, since it doesn't work fully) */ - if ((fixP->fx_addsy == 0 || fixP->fx_addsy->sy_value.X_op == O_constant) + if ((fixP->fx_addsy == 0 || symbol_constant_p (fixP->fx_addsy)) && !fixP->fx_pcrel) #else if (fixP->fx_addsy == 0 && !fixP->fx_pcrel) diff --git a/gas/config/tc-d10v.c b/gas/config/tc-d10v.c index 2af3e3ea3ad..33926fb9f91 100644 --- a/gas/config/tc-d10v.c +++ b/gas/config/tc-d10v.c @@ -36,8 +36,8 @@ int Optimizing = 0; #define AT_WORD_P(X) ((X)->X_op == O_right_shift \ && (X)->X_op_symbol != NULL \ - && (X)->X_op_symbol->sy_value.X_op == O_constant \ - && (X)->X_op_symbol->sy_value.X_add_number == AT_WORD_RIGHT_SHIFT) + && symbol_constant_p ((X)->X_op_symbol) \ + && S_GET_VALUE ((X)->X_op_symbol) == AT_WORD_RIGHT_SHIFT) #define AT_WORD_RIGHT_SHIFT 2 diff --git a/gas/config/tc-v850.c b/gas/config/tc-v850.c index a480c8d750d..32d20af4b09 100644 --- a/gas/config/tc-v850.c +++ b/gas/config/tc-v850.c @@ -726,9 +726,9 @@ reg_name_search (regs, regcount, name, accept_numbers) { /* If the symbol is an alias for another name then use that. If the symbol is an alias for a number, then return the number. */ - if (symbolP->sy_value.X_op == O_symbol) + if (symbol_equated_p (symbolP)) { - name = S_GET_NAME (symbolP->sy_value.X_add_symbol); + name = S_GET_NAME (symbol_get_value_expression (symbolP)->X_add_symbol); } else if (accept_numbers) { -- 2.30.2