mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-12-03 04:12:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

PR gas/10856

Browse Source 
* 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.
This commit is contained in:
Alan Modra 2009-10-28 08:21:45 +00:00
parent c92e840bf6
commit 14610ad10e
4 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gas/ChangeLog
View File

@ -1,3 +1,10 @@
2009-10-28 Alan Modra <amodra@bigpond.net.au>
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.
2009-10-27 Tristan Gingold <gingold@adacore.com>
* config/tc-avr.c (md_pseudo_table): Add dwarf2 debug pseudo.

21
gas/expr.c
View File

@ -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;
}

4
gas/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2009-10-28 Alan Modra <amodra@bigpond.net.au>
* gas/i386/intelpic.d: Correct.
2009-10-25 Arnold Metselaar <arnold.metselaar@planet.nl>
* gas/z80/equ.d, gas/z80/equ.s: Added test of parsing equ directives.

2
gas/testsuite/gas/i386/intelpic.d
View File

@ -12,6 +12,6 @@ Disassembly of section .text:
0+1 <bar>:
[ ]*[a-f0-9]+: 8d 83 14 00 00 00 lea 0x14\(%ebx\),%eax
[ ]*[a-f0-9]+: 8b 83 00 00 00 00 mov 0x0\(%ebx\),%eax
[ ]*[a-f0-9]+: ff 24 85 1a 00 00 00 jmp \*0x1a\(,%eax,4\)
[ ]*[a-f0-9]+: ff 24 85 0d 00 00 00 jmp \*0xd\(,%eax,4\)
[ ]*[a-f0-9]+: 8d 83 14 00 00 00 lea 0x14\(%ebx\),%eax
#pass