diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2009-10-28 08:21:44 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@bigpond.net.au> | 2009-10-28 08:21:44 +0000 |
| commit | 74a643c6610a6d1a614df5b0875cf12e133330d2 (patch) | |
| tree | 52980e41f077b8e6c9cc765a0ab39a1ba21c000c /gas/expr.c | |
| parent | 6d973bbbf8a6c2dc90db48b01144224adc92ac5b (diff) | |
| download | binutils-redhat-74a643c6610a6d1a614df5b0875cf12e133330d2.tar.gz | |
PR gas/10856
* expr.c (resolve_expression): Only add "left" value to O_symbol
expression when the symbol is undefined and different from the
original symbol. Simplify negative logic.
* gas/i386/intelpic.d: Correct.
Diffstat (limited to 'gas/expr.c')
| -rw-r--r-- | gas/expr.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/gas/expr.c b/gas/expr.c index b9ce574198..094141f6e3 100644 --- a/gas/expr.c +++ b/gas/expr.c @@ -1997,6 +1997,7 @@ resolve_expression (expressionS *expressionP) /* Help out with CSE. */ valueT final_val = expressionP->X_add_number; symbolS *add_symbol = expressionP->X_add_symbol; + symbolS *orig_add_symbol = add_symbol; symbolS *op_symbol = expressionP->X_op_symbol; operatorT op = expressionP->X_op; valueT left, right; @@ -2078,6 +2079,7 @@ resolve_expression (expressionS *expressionP) left = right; seg_left = seg_right; add_symbol = op_symbol; + orig_add_symbol = expressionP->X_op_symbol; op = O_symbol; break; } @@ -2122,18 +2124,19 @@ resolve_expression (expressionS *expressionP) { if (op == O_bit_exclusive_or || op == O_bit_inclusive_or) { - if (seg_right != absolute_section || right != 0) + if (!(seg_right == absolute_section && right == 0)) { seg_left = seg_right; left = right; add_symbol = op_symbol; + orig_add_symbol = expressionP->X_op_symbol; } op = O_symbol; break; } else if (op == O_left_shift || op == O_right_shift) { - if (seg_left != absolute_section || left != 0) + if (!(seg_left == absolute_section && left == 0)) { op = O_symbol; break; @@ -2149,6 +2152,7 @@ resolve_expression (expressionS *expressionP) seg_left = seg_right; left = right; add_symbol = op_symbol; + orig_add_symbol = expressionP->X_op_symbol; op = O_symbol; break; } @@ -2158,11 +2162,11 @@ resolve_expression (expressionS *expressionP) op = O_symbol; break; } - else if (left != right - || ((seg_left != reg_section || seg_right != reg_section) - && (seg_left != undefined_section - || seg_right != undefined_section - || add_symbol != op_symbol))) + else if (!(left == right + && ((seg_left == reg_section && seg_right == reg_section) + || (seg_left == undefined_section + && seg_right == undefined_section + && add_symbol == op_symbol)))) return 0; else if (op == O_bit_and || op == O_bit_inclusive_or) { @@ -2233,7 +2237,8 @@ resolve_expression (expressionS *expressionP) op = O_constant; else if (seg_left == reg_section && final_val == 0) op = O_register; - else if (add_symbol != expressionP->X_add_symbol) + else if (seg_left == undefined_section + && add_symbol != orig_add_symbol) final_val += left; expressionP->X_add_symbol = add_symbol; } |