OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* config/tc-sh.c (md_convert_frag) <undefined symbol, conditional 

jump>: Use as_bad_where	instead of as_bad.  Tweak error message
	accordingly.  Stabilize frag by updating fix part and resetting
	variant part.
	<undefined symbol, unconditional jump>: Ditto.
This commit is contained in:
Hans-Peter Nilsson 2000-11-28 23:33:45 +00:00
parent 08c404a59c
commit 99b222b479
2 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gas/ChangeLog
View File

@ -1,3 +1,11 @@
2000-11-28 Hans-Peter Nilsson <hp@bitrange.com>
* config/tc-sh.c (md_convert_frag) <undefined symbol, conditional
jump>: Use as_bad_where instead of as_bad. Tweak error message
accordingly. Stabilize frag by updating fix part and resetting
variant part.
<undefined symbol, unconditional jump>: Ditto.
2000-11-28 Kazu Hirata <kazu@hxi.com>
* config/obj-aout.h: Fix formatting.

39
gas/config/tc-sh.c
View File

@ -2391,17 +2391,19 @@ md_convert_frag (headers, seg, fragP)
case C (UNCOND_JUMP, UNCOND32):
case C (UNCOND_JUMP, UNDEF_WORD_DISP):
if (fragP->fr_symbol == NULL)
as_bad (_("at 0x%lx, displacement overflows 12-bit field"),
(unsigned long) fragP->fr_address);
as_bad_where (fragP->fr_file, fragP->fr_line,
_("displacement overflows 12-bit field"));
else if (S_IS_DEFINED (fragP->fr_symbol))
as_bad (_("at 0x%lx, displacement to defined symbol %s overflows 12-bit field"),
(unsigned long) fragP->fr_address,
S_GET_NAME (fragP->fr_symbol));
as_bad_where (fragP->fr_file, fragP->fr_line,
_("displacement to defined symbol %s overflows 12-bit field"),
S_GET_NAME (fragP->fr_symbol));
else
as_bad (_("at 0x%lx, displacement to undefined symbol %s overflows 12-bit field"),
(unsigned long) fragP->fr_address,
S_GET_NAME (fragP->fr_symbol));
as_bad_where (fragP->fr_file, fragP->fr_line,
_("displacement to undefined symbol %s overflows 12-bit field"),
S_GET_NAME (fragP->fr_symbol));
/* Stabilize this frag, so we don't trip an assert. */
fragP->fr_fix += fragP->fr_var;
fragP->fr_var = 0;
break;
case C (COND_JUMP, COND12):
@ -2474,16 +2476,19 @@ md_convert_frag (headers, seg, fragP)
case C (COND_JUMP, UNDEF_WORD_DISP):
case C (COND_JUMP_DELAY, UNDEF_WORD_DISP):
if (fragP->fr_symbol == NULL)
as_bad (_("at 0x%lx, displacement overflows 8-bit field"),
(unsigned long) fragP->fr_address);
as_bad_where (fragP->fr_file, fragP->fr_line,
_("displacement overflows 8-bit field"));
else if (S_IS_DEFINED (fragP->fr_symbol))
as_bad (_("at 0x%lx, displacement to defined symbol %s overflows 8-bit field "),
(unsigned long) fragP->fr_address,
S_GET_NAME (fragP->fr_symbol));
as_bad_where (fragP->fr_file, fragP->fr_line,
_("displacement to defined symbol %s overflows 8-bit field"),
S_GET_NAME (fragP->fr_symbol));
else
as_bad (_("at 0x%lx, displacement to undefined symbol %s overflows 8-bit field "),
(unsigned long) fragP->fr_address,
S_GET_NAME (fragP->fr_symbol));
as_bad_where (fragP->fr_file, fragP->fr_line,
_("displacement to undefined symbol %s overflows 8-bit field "),
S_GET_NAME (fragP->fr_symbol));
/* Stabilize this frag, so we don't trip an assert. */
fragP->fr_fix += fragP->fr_var;
fragP->fr_var = 0;
break;
default: