diff options
author | Alan Modra <amodra@gmail.com> | 2001-07-23 13:03:40 +0000 |
---|---|---|
committer | Alan Modra <amodra@gmail.com> | 2001-07-23 13:03:40 +0000 |
commit | ac62c3468da474862067776e9cda6fb291aa53cf (patch) | |
tree | 6d2417c71e130ce8bd652b102de524254cd5a360 /gas/config | |
parent | 677537c186644c0b7ad48edcb759ea29d6c4f80e (diff) | |
download | fsf-binutils-gdb-ac62c3468da474862067776e9cda6fb291aa53cf.zip fsf-binutils-gdb-ac62c3468da474862067776e9cda6fb291aa53cf.tar.gz fsf-binutils-gdb-ac62c3468da474862067776e9cda6fb291aa53cf.tar.bz2 |
* symbols.c (S_GET_VALUE): Don't treat O_constant and local
symbols specially. Always resolve, adding fr_address to value.
* write.c (write_object_file): Don't add fr_address to sym values.
(relax_frag): Likewise.
(relax_segment): Likewise.
* config/obj-ieee.c (do_symbols): Likewise.
* config/tc-cris.c (md_convert_frag): Likewise.
* config/tc-fr30.c (md_convert_frag): Likewise.
* config/tc-i386.c (md_convert_frag): Likewise.
* config/tc-m32r.c (md_convert_frag): Likewise.
* config/tc-m68hc11.c (md_convert_frag): Likewise.
* config/tc-mcore.c (md_convert_frag): Likewise.
* config/tc-mips.c (mips16_extended_frag): Likewise.
* config/tc-ns32k.c (md_convert_frag): Likewise.
* config/tc-m68k.c (md_convert_frag_1): Likewise.
(BRANCHBWL, BRABSJUNC, BRABSJCOND, BRANCHBW, FBRANCH, DBCCLBR,
DBCCABSJ, PCREL1632, PCINDEX, ABSTOPCREL): Decrement.
(md_relax_table): Remove first four entries. Format.
(md_estimate_size_before_relax): Remove old_fix. Don't bother
setting fr_var. Simplify byte branch checks.
Diffstat (limited to 'gas/config')
-rw-r--r-- | gas/config/obj-ieee.c | 2 | ||||
-rw-r--r-- | gas/config/tc-cris.c | 5 | ||||
-rw-r--r-- | gas/config/tc-fr30.c | 1 | ||||
-rw-r--r-- | gas/config/tc-i386.c | 9 | ||||
-rw-r--r-- | gas/config/tc-m32r.c | 1 | ||||
-rw-r--r-- | gas/config/tc-m68hc11.c | 3 | ||||
-rw-r--r-- | gas/config/tc-m68k.c | 176 | ||||
-rw-r--r-- | gas/config/tc-mcore.c | 1 | ||||
-rw-r--r-- | gas/config/tc-mips.c | 2 | ||||
-rw-r--r-- | gas/config/tc-ns32k.c | 3 |
10 files changed, 79 insertions, 124 deletions
diff --git a/gas/config/obj-ieee.c b/gas/config/obj-ieee.c index 8c0e3f2..505bb35 100644 --- a/gas/config/obj-ieee.c +++ b/gas/config/obj-ieee.c @@ -292,7 +292,7 @@ do_symbols (abfd) { ptr->sy_symbol.sy.section = (asection *) (segment_info[ptr->sy_symbol.seg].user_stuff); - S_SET_VALUE (ptr, S_GET_VALUE (ptr) + ptr->sy_frag->fr_address); + S_SET_VALUE (ptr, S_GET_VALUE (ptr)); if (ptr->sy_symbol.sy.flags == 0) ptr->sy_symbol.sy.flags = BSF_LOCAL; } diff --git a/gas/config/tc-cris.c b/gas/config/tc-cris.c index 19ae971..a83cf8a 100644 --- a/gas/config/tc-cris.c +++ b/gas/config/tc-cris.c @@ -495,10 +495,7 @@ md_convert_frag (abfd, sec, fragP) opcodep = fragP->fr_opcode; symbolP = fragP->fr_symbol; - target_address - = (symbolP - ? S_GET_VALUE (symbolP) + symbol_get_frag(fragP->fr_symbol)->fr_address - : 0 ) + fragP->fr_offset; + target_address = (symbolP ? S_GET_VALUE (symbolP) : 0) + fragP->fr_offset; address_of_var_part = fragP->fr_address + var_part_offset; switch (fragP->fr_subtype) diff --git a/gas/config/tc-fr30.c b/gas/config/tc-fr30.c index 1acebb8..98f5729 100644 --- a/gas/config/tc-fr30.c +++ b/gas/config/tc-fr30.c @@ -387,7 +387,6 @@ md_convert_frag (abfd, sec, fragP) { /* Address we want to reach in file space. */ target_address = S_GET_VALUE (fragP->fr_symbol) + fragP->fr_offset; - target_address += symbol_get_frag (fragP->fr_symbol)->fr_address; addend = (target_address - (opcode_address & -4)) >> 2; } diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c index 6172eb9..bea0f4d 100644 --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -4088,15 +4088,6 @@ md_convert_frag (abfd, sec, fragP) /* Address we want to reach in file space. */ target_address = S_GET_VALUE (fragP->fr_symbol) + fragP->fr_offset; -#ifdef BFD_ASSEMBLER - /* Not needed otherwise? */ - { - /* Local symbols which have already been resolved have a NULL frag. */ - fragS *sym_frag = symbol_get_frag (fragP->fr_symbol); - if (sym_frag) - target_address += sym_frag->fr_address; - } -#endif /* Address opcode resides at in file space. */ opcode_address = fragP->fr_address + fragP->fr_fix; diff --git a/gas/config/tc-m32r.c b/gas/config/tc-m32r.c index b3d2bc4..272889a 100644 --- a/gas/config/tc-m32r.c +++ b/gas/config/tc-m32r.c @@ -1564,7 +1564,6 @@ md_convert_frag (abfd, sec, fragP) { /* Address we want to reach in file space. */ target_address = S_GET_VALUE (fragP->fr_symbol) + fragP->fr_offset; - target_address += symbol_get_frag (fragP->fr_symbol)->fr_address; addend = (target_address - (opcode_address & -4)) >> 2; } diff --git a/gas/config/tc-m68hc11.c b/gas/config/tc-m68hc11.c index 23ef335..c73f575 100644 --- a/gas/config/tc-m68hc11.c +++ b/gas/config/tc-m68hc11.c @@ -2441,9 +2441,8 @@ md_convert_frag (abfd, sec, fragP) buffer_address += fragP->fr_fix; /* The displacement of the address, from current location. */ - value = fragP->fr_symbol ? S_GET_VALUE (fragP->fr_symbol) : 0; + value = S_GET_VALUE (fragP->fr_symbol); disp = (value + fragP->fr_offset) - object_address; - disp += symbol_get_frag (fragP->fr_symbol)->fr_address; switch (fragP->fr_subtype) { diff --git a/gas/config/tc-m68k.c b/gas/config/tc-m68k.c index 32e18f7..4bbffea 100644 --- a/gas/config/tc-m68k.c +++ b/gas/config/tc-m68k.c @@ -432,10 +432,10 @@ static const int n_archs = sizeof (archs) / sizeof (archs[0]); BYTE and SHORT forms, punting if that isn't enough. This gives us four different relaxation modes for branches: */ -#define BRANCHBWL 1 /* branch byte, word, or long */ -#define BRABSJUNC 2 /* absolute jump for LONG, unconditional */ -#define BRABSJCOND 3 /* absolute jump for LONG, conditional */ -#define BRANCHBW 4 /* branch byte or word */ +#define BRANCHBWL 0 /* branch byte, word, or long */ +#define BRABSJUNC 1 /* absolute jump for LONG, unconditional */ +#define BRABSJCOND 2 /* absolute jump for LONG, conditional */ +#define BRANCHBW 3 /* branch byte or word */ /* We also relax coprocessor branches and DBcc's. All CPUs that support coprocessor branches support them in word and long forms, so we have only @@ -445,9 +445,9 @@ static const int n_archs = sizeof (archs) / sizeof (archs[0]); This gives us two relaxation modes. If long branches are not available and absolute jumps are not acceptable, we don't relax DBcc's. */ -#define FBRANCH 5 /* coprocessor branch */ -#define DBCCLBR 6 /* DBcc relaxable with a long branch */ -#define DBCCABSJ 7 /* DBcc relaxable with an absolute jump */ +#define FBRANCH 4 /* coprocessor branch */ +#define DBCCLBR 5 /* DBcc relaxable with a long branch */ +#define DBCCABSJ 6 /* DBcc relaxable with an absolute jump */ /* That's all for instruction relaxation. However, we also relax PC-relative operands. Specifically, we have three operand relaxation modes. On the @@ -460,9 +460,9 @@ static const int n_archs = sizeof (archs) / sizeof (archs[0]); form of the PC+displacement+index operand. Finally, some absolute operands can be relaxed down to 16-bit PC-relative. */ -#define PCREL1632 8 /* 16-bit or 32-bit PC-relative */ -#define PCINDEX 9 /* PC+displacement+index */ -#define ABSTOPCREL 10 /* absolute relax down to 16-bit PC-relative */ +#define PCREL1632 7 /* 16-bit or 32-bit PC-relative */ +#define PCINDEX 8 /* PC+displacement+index */ +#define ABSTOPCREL 9 /* absolute relax down to 16-bit PC-relative */ /* Note that calls to frag_var need to specify the maximum expansion needed; this is currently 10 bytes for DBCC. */ @@ -475,60 +475,55 @@ static const int n_archs = sizeof (archs) / sizeof (archs[0]); */ relax_typeS md_relax_table[] = { - {1, 1, 0, 0}, /* First entries aren't used */ - {1, 1, 0, 0}, /* For no good reason except */ - {1, 1, 0, 0}, /* that the VAX doesn't either */ - {1, 1, 0, 0}, - - {(127), (-128), 0, TAB (BRANCHBWL, SHORT)}, - {(32767), (-32768), 2, TAB (BRANCHBWL, LONG)}, - {0, 0, 4, 0}, - {1, 1, 0, 0}, - - {(127), (-128), 0, TAB (BRABSJUNC, SHORT)}, - {(32767), (-32768), 2, TAB (BRABSJUNC, LONG)}, - {0, 0, 4, 0}, - {1, 1, 0, 0}, - - {(127), (-128), 0, TAB (BRABSJCOND, SHORT)}, - {(32767), (-32768), 2, TAB (BRABSJCOND, LONG)}, - {0, 0, 6, 0}, - {1, 1, 0, 0}, - - {(127), (-128), 0, TAB (BRANCHBW, SHORT)}, - {0, 0, 2, 0}, - {1, 1, 0, 0}, - {1, 1, 0, 0}, - - {1, 1, 0, 0}, /* FBRANCH doesn't come BYTE */ - {(32767), (-32768), 2, TAB (FBRANCH, LONG)}, - {0, 0, 4, 0}, - {1, 1, 0, 0}, - - {1, 1, 0, 0}, /* DBCC doesn't come BYTE */ - {(32767), (-32768), 2, TAB (DBCCLBR, LONG)}, - {0, 0, 10, 0}, - {1, 1, 0, 0}, - - {1, 1, 0, 0}, /* DBCC doesn't come BYTE */ - {(32767), (-32768), 2, TAB (DBCCABSJ, LONG)}, - {0, 0, 10, 0}, - {1, 1, 0, 0}, - - {1, 1, 0, 0}, /* PCREL1632 doesn't come BYTE */ - {32767, -32768, 2, TAB (PCREL1632, LONG)}, - {0, 0, 6, 0}, - {1, 1, 0, 0}, - - {125, -130, 0, TAB (PCINDEX, SHORT)}, - {32765, -32770, 2, TAB (PCINDEX, LONG)}, - {0, 0, 4, 0}, - {1, 1, 0, 0}, - - {1, 1, 0, 0}, /* ABSTOPCREL doesn't come BYTE */ - {(32767), (-32768), 2, TAB (ABSTOPCREL, LONG)}, - {0, 0, 4, 0}, - {1, 1, 0, 0}, + { 127, -128, 0, TAB (BRANCHBWL, SHORT) }, + { 32767, -32768, 2, TAB (BRANCHBWL, LONG) }, + { 0, 0, 4, 0 }, + { 1, 1, 0, 0 }, + + { 127, -128, 0, TAB (BRABSJUNC, SHORT) }, + { 32767, -32768, 2, TAB (BRABSJUNC, LONG) }, + { 0, 0, 4, 0 }, + { 1, 1, 0, 0 }, + + { 127, -128, 0, TAB (BRABSJCOND, SHORT) }, + { 32767, -32768, 2, TAB (BRABSJCOND, LONG) }, + { 0, 0, 6, 0 }, + { 1, 1, 0, 0 }, + + { 127, -128, 0, TAB (BRANCHBW, SHORT) }, + { 0, 0, 2, 0 }, + { 1, 1, 0, 0 }, + { 1, 1, 0, 0 }, + + { 1, 1, 0, 0 }, /* FBRANCH doesn't come BYTE */ + { 32767, -32768, 2, TAB (FBRANCH, LONG) }, + { 0, 0, 4, 0 }, + { 1, 1, 0, 0 }, + + { 1, 1, 0, 0 }, /* DBCC doesn't come BYTE */ + { 32767, -32768, 2, TAB (DBCCLBR, LONG) }, + { 0, 0, 10, 0 }, + { 1, 1, 0, 0 }, + + { 1, 1, 0, 0 }, /* DBCC doesn't come BYTE */ + { 32767, -32768, 2, TAB (DBCCABSJ, LONG) }, + { 0, 0, 10, 0 }, + { 1, 1, 0, 0 }, + + { 1, 1, 0, 0 }, /* PCREL1632 doesn't come BYTE */ + { 32767, -32768, 2, TAB (PCREL1632, LONG) }, + { 0, 0, 6, 0 }, + { 1, 1, 0, 0 }, + + { 125, -130, 0, TAB (PCINDEX, SHORT) }, + { 32765, -32770, 2, TAB (PCINDEX, LONG) }, + { 0, 0, 4, 0 }, + { 1, 1, 0, 0 }, + + { 1, 1, 0, 0 }, /* ABSTOPCREL doesn't come BYTE */ + { 32767, -32768, 2, TAB (ABSTOPCREL, LONG) }, + { 0, 0, 4, 0 }, + { 1, 1, 0, 0 }, }; /* These are the machine dependent pseudo-ops. These are included so @@ -4375,10 +4370,6 @@ md_convert_frag_1 (fragP) disp = fragP->fr_symbol ? S_GET_VALUE (fragP->fr_symbol) : 0; disp = (disp + fragP->fr_offset) - object_address; -#ifdef BFD_ASSEMBLER - disp += symbol_get_frag (fragP->fr_symbol)->fr_address; -#endif - switch (fragP->fr_subtype) { case TAB (BRANCHBWL, BYTE): @@ -4594,10 +4585,6 @@ md_estimate_size_before_relax (fragP, segment) register fragS *fragP; segT segment; { - int old_fix; - - old_fix = fragP->fr_fix; - /* Handle SZ_UNDEF first, it can be changed to BYTE or SHORT. */ switch (fragP->fr_subtype) { @@ -4694,44 +4681,31 @@ md_estimate_size_before_relax (fragP, segment) case TAB (BRABSJCOND, BYTE): case TAB (BRANCHBW, BYTE): /* We can't do a short jump to the next instruction, so in that - case we force word mode. At this point S_GET_VALUE should - return the offset of the symbol within its frag. If the - symbol is at the start of a frag, and it is the next frag - with any data in it (usually this is just the next frag, but - assembler listings may introduce empty frags), we must use - word mode. */ - if (fragP->fr_symbol && S_GET_VALUE (fragP->fr_symbol) == 0) + case we force word mode. If the symbol is at the start of a + frag, and it is the next frag with any data in it (usually + this is just the next frag, but assembler listings may + introduce empty frags), we must use word mode. */ + if (fragP->fr_symbol) { - fragS *stop; - fragS *l; + fragS *sym_frag; - stop = symbol_get_frag (fragP->fr_symbol); - - for (l = fragP->fr_next; l != stop; l = l->fr_next) + sym_frag = symbol_get_frag (fragP->fr_symbol); + if (S_GET_VALUE (fragP->fr_symbol) == sym_frag->fr_address) { - /* Catch empty alignment frags whoes fr_offset field - is an alignment requirement of 2 bytes. The check - below will misinterpret this as evidence that real - code exists between the symbol and the instruction - and so will not convert the short jump into a word - jump. */ - if (l->fr_fix == 0 - && l->fr_var == 1 - && (l->fr_type == rs_align || l->fr_type == rs_align_code)) - continue; - - if (l->fr_fix + l->fr_var != 0) - break; + fragS *l; + + for (l = fragP->fr_next; l != sym_frag; l = l->fr_next) + if (l->fr_fix != 0) + break; + if (l == sym_frag) + fragP->fr_subtype = TAB (TABTYPE (fragP->fr_subtype), SHORT); } - if (l == stop) - fragP->fr_subtype = TAB (TABTYPE (fragP->fr_subtype), SHORT); } break; default: break; } - fragP->fr_var = md_relax_table[fragP->fr_subtype].rlx_length; - return fragP->fr_var + fragP->fr_fix - old_fix; + return md_relax_table[fragP->fr_subtype].rlx_length; } #if defined(OBJ_AOUT) | defined(OBJ_BOUT) diff --git a/gas/config/tc-mcore.c b/gas/config/tc-mcore.c index bb61d57..0af3dc1 100644 --- a/gas/config/tc-mcore.c +++ b/gas/config/tc-mcore.c @@ -1900,7 +1900,6 @@ md_convert_frag (abfd, sec, fragP) int targ_addr = S_GET_VALUE (fragP->fr_symbol) + fragP->fr_offset; buffer = (unsigned char *) (fragP->fr_fix + fragP->fr_literal); - targ_addr += symbol_get_frag (fragP->fr_symbol)->fr_address; switch (fragP->fr_subtype) { diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index 82c7564..e7061eb 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -10895,7 +10895,7 @@ mips16_extended_frag (fragp, sec, stretch) } sym_frag = symbol_get_frag (fragp->fr_symbol); - val = S_GET_VALUE (fragp->fr_symbol) + sym_frag->fr_address; + val = S_GET_VALUE (fragp->fr_symbol); symsec = S_GET_SEGMENT (fragp->fr_symbol); if (op->pcrel) diff --git a/gas/config/tc-ns32k.c b/gas/config/tc-ns32k.c index f8f01c6..dfc9b50 100644 --- a/gas/config/tc-ns32k.c +++ b/gas/config/tc-ns32k.c @@ -2051,9 +2051,6 @@ md_convert_frag (abfd, sec, fragP) /* The displacement of the address, from current location. */ disp = (S_GET_VALUE (fragP->fr_symbol) + fragP->fr_offset) - object_address; -#ifdef BFD_ASSEMBLER - disp += symbol_get_frag (fragP->fr_symbol)->fr_address; -#endif disp += md_pcrel_adjust (fragP); md_number_to_disp (buffer_address, (long) disp, (int) ext); |