FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* config.bfd: Remove trailing blanks.

Browse source 
* elf32-mips.c (gprel16_with_gp): Remove superfluous casts.
	* strings.c (get_char): Initialize value.
	* config/tc-mips.c (mips_cpreturn_offset): Better comment.
	(load_register): Better error message. Cast away signedness
	mismatches. Add casts needed for varargs.
	(load_address): Replace checks of HAVE_64BIT_ADDRESS with dbl.
	Remove superfluous casts.
	(macro): Cast away signedness mismatches. Remove superfluous casts.
	(s_cpload): Fix wrong comment.
	(s_mips_weakext): Standardize output message.
	(get_number): Likewise.
This commit is contained in:
Thiemo Seufer 2001-12-04 14:38:48 +00:00
parent 956c53ee28
commit 956cd1d64d
7 changed files with 60 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

5
bfd/ChangeLog
View file

@ -1,3 +1,8 @@
2001-12-04 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
* config.bfd: Remove trailing blanks.
* elf32-mips.c (gprel16_with_gp): Remove superfluous casts.
2001-12-04 Alexandre Oliva <aoliva@redhat.com> 2001-12-04 Alexandre Oliva <aoliva@redhat.com>
* elf32-d10v.c (elf_d10v_howto_table): Adjust bit-size of * elf32-d10v.c (elf_d10v_howto_table): Adjust bit-size of

2
bfd/config.bfd
View file

@ -389,7 +389,7 @@ case "${targ}" in
targ_defvec=bfd_elf32_i386_vec targ_defvec=bfd_elf32_i386_vec
targ_selvecs="i386linux_vec bfd_efi_app_ia32_vec" targ_selvecs="i386linux_vec bfd_efi_app_ia32_vec"
;; ;;
#ifdef BFD64 #ifdef BFD64
x86_64-*-freebsd*) x86_64-*-freebsd*)
targ_defvec=bfd_elf64_x86_64_vec targ_defvec=bfd_elf64_x86_64_vec
targ_selvecs="bfd_elf32_i386_vec i386coff_vec bfd_efi_app_ia32_vec" targ_selvecs="bfd_elf32_i386_vec i386coff_vec bfd_efi_app_ia32_vec"

4
bfd/elf32-mips.c
View file

@ -2094,8 +2094,8 @@ gprel16_with_gp (abfd, symbol, reloc_entry, input_section, relocateable, data,
|| (symbol->flags & BSF_SECTION_SYM) != 0) || (symbol->flags & BSF_SECTION_SYM) != 0)
val += relocation - gp; val += relocation - gp;
insn = (insn &~ (bfd_vma) 0xffff) | (val & 0xffff); insn = (insn & ~0xffff) | (val & 0xffff);
bfd_put_32 (abfd, (bfd_vma) insn, (bfd_byte *) data + reloc_entry->address); bfd_put_32 (abfd, insn, (bfd_byte *) data + reloc_entry->address);
if (relocateable) if (relocateable)
reloc_entry->address += input_section->output_offset; reloc_entry->address += input_section->output_offset;

4
binutils/ChangeLog
View file

@ -1,3 +1,7 @@
2001-12-04 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
* strings.c (get_char): Initialize value.
2001-12-04 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de> 2001-12-04 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
* arlex.l: Silence compile warnings. * arlex.l: Silence compile warnings.

2
binutils/strings.c
View file

@ -421,7 +421,7 @@ get_char (stream, address, magiccount, magic)
char **magic; char **magic;
{ {
int c, i; int c, i;
long r; long r = EOF;
unsigned char buf[4]; unsigned char buf[4];
for (i = 0; i < encoding_bytes; i++) for (i = 0; i < encoding_bytes; i++)

12
gas/ChangeLog
View file

@ -1,3 +1,15 @@
2001-12-04 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
* config/tc-mips.c (mips_cpreturn_offset): Better comment.
(load_register): Better error message. Cast away signedness
mismatches. Add casts needed for varargs.
(load_address): Replace checks of HAVE_64BIT_ADDRESS with dbl.
Remove superfluous casts.
(macro): Cast away signedness mismatches. Remove superfluous casts.
(s_cpload): Fix wrong comment.
(s_mips_weakext): Standardize output message.
(get_number): Likewise.
2001-12-04 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de> 2001-12-04 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
* config/tc-mips.c (append_insn): Add jump address range overflow * config/tc-mips.c (append_insn): Add jump address range overflow

78
gas/config/tc-mips.c
View file

@ -407,7 +407,7 @@ static offsetT mips_cprestore_offset = -1;
/* Similiar for NewABI PIC code, where $gp is callee-saved. NewABI has some /* Similiar for NewABI PIC code, where $gp is callee-saved. NewABI has some
more optimizations, it can use a register value instead of a memory-saved more optimizations, it can use a register value instead of a memory-saved
offset and even an other than GP as global pointer. */ offset and even an other register than $gp as global pointer. */
static offsetT mips_cpreturn_offset = -1; static offsetT mips_cpreturn_offset = -1;
static int mips_cpreturn_register = -1; static int mips_cpreturn_register = -1;
static int mips_gp_register = GP; static int mips_gp_register = GP;
@ -3339,7 +3339,8 @@ load_register (counter, reg, ep, dbl)
if (HAVE_32BIT_GPRS) if (HAVE_32BIT_GPRS)
{ {
as_bad (_("Number larger than 32 bits")); as_bad (_("Number (0x%lx) larger than 32 bits"),
(unsigned long) ep->X_add_number);
macro_build ((char *) NULL, counter, ep, "addiu", "t,r,j", reg, 0, macro_build ((char *) NULL, counter, ep, "addiu", "t,r,j", reg, 0,
(int) BFD_RELOC_LO16); (int) BFD_RELOC_LO16);
return; return;
@ -3374,7 +3375,7 @@ load_register (counter, reg, ep, dbl)
int shift, bit; int shift, bit;
unsigned long hi, lo; unsigned long hi, lo;
if (hi32.X_add_number == 0xffffffff) if (hi32.X_add_number == (offsetT) 0xffffffff)
{ {
if ((lo32.X_add_number & 0xffff8000) == 0xffff8000) if ((lo32.X_add_number & 0xffff8000) == 0xffff8000)
{ {
@ -3513,27 +3514,27 @@ load_register (counter, reg, ep, dbl)
{ {
expressionS mid16; expressionS mid16;
if ((freg == 0) && (lo32.X_add_number == 0xffffffff)) if ((freg == 0) && (lo32.X_add_number == (offsetT) 0xffffffff))
{ {
macro_build ((char *) NULL, counter, &lo32, "lui", "t,u", reg, macro_build ((char *) NULL, counter, &lo32, "lui", "t,u", reg,
(int) BFD_RELOC_HI16); (int) BFD_RELOC_HI16);
macro_build ((char *) NULL, counter, NULL, "dsrl32", "d,w,<", reg, macro_build ((char *) NULL, counter, (expressionS *) NULL,
reg, 0); "dsrl32", "d,w,<", reg, reg, 0);
return; return;
} }
if (freg != 0) if (freg != 0)
{ {
macro_build ((char *) NULL, counter, NULL, "dsll", "d,w,<", reg, macro_build ((char *) NULL, counter, (expressionS *) NULL, "dsll",
freg, 16); "d,w,<", reg, freg, 16);
freg = reg; freg = reg;
} }
mid16 = lo32; mid16 = lo32;
mid16.X_add_number >>= 16; mid16.X_add_number >>= 16;
macro_build ((char *) NULL, counter, &mid16, "ori", "t,r,i", reg, macro_build ((char *) NULL, counter, &mid16, "ori", "t,r,i", reg,
freg, (int) BFD_RELOC_LO16); freg, (int) BFD_RELOC_LO16);
macro_build ((char *) NULL, counter, NULL, "dsll", "d,w,<", reg, macro_build ((char *) NULL, counter, (expressionS *) NULL, "dsll",
reg, 16); "d,w,<", reg, reg, 16);
freg = reg; freg = reg;
} }
if ((lo32.X_add_number & 0xffff) != 0) if ((lo32.X_add_number & 0xffff) != 0)
@ -3592,7 +3593,7 @@ load_address (counter, reg, ep, dbl, used_at)
dsll $reg,16 dsll $reg,16
daddiu $reg,<sym> (BFD_RELOC_LO16) daddiu $reg,<sym> (BFD_RELOC_LO16)
*/ */
if (HAVE_64BIT_ADDRESSES) if (dbl)
{ {
p = NULL; p = NULL;
@ -3644,13 +3645,12 @@ load_address (counter, reg, ep, dbl, used_at)
p = frag_var (rs_machine_dependent, 8, 0, p = frag_var (rs_machine_dependent, 8, 0,
RELAX_ENCODE (4, 8, 0, 4, 0, RELAX_ENCODE (4, 8, 0, 4, 0,
mips_opts.warn_about_macros), mips_opts.warn_about_macros),
ep->X_add_symbol, (offsetT) 0, (char *) NULL); ep->X_add_symbol, 0, NULL);
} }
macro_build_lui (p, counter, ep, reg); macro_build_lui (p, counter, ep, reg);
if (p != NULL) if (p != NULL)
p += 4; p += 4;
macro_build (p, counter, ep, macro_build (p, counter, ep, dbl ? "daddiu" : "addiu",
HAVE_32BIT_ADDRESSES ? "addiu" : "daddiu",
"t,r,j", reg, reg, (int) BFD_RELOC_LO16); "t,r,j", reg, reg, (int) BFD_RELOC_LO16);
} }
} }
@ -3713,15 +3713,13 @@ load_address (counter, reg, ep, dbl, used_at)
macro_build ((char *) NULL, counter, ep, "lui", "t,u", reg, macro_build ((char *) NULL, counter, ep, "lui", "t,u", reg,
(int) BFD_RELOC_MIPS_GOT_HI16); (int) BFD_RELOC_MIPS_GOT_HI16);
macro_build ((char *) NULL, counter, (expressionS *) NULL, macro_build ((char *) NULL, counter, (expressionS *) NULL,
HAVE_32BIT_ADDRESSES ? "addu" : "daddu", dbl ? "daddu" : "addu", "d,v,t", reg, reg, GP);
"d,v,t", reg, reg, GP); macro_build ((char *) NULL, counter, ep, dbl ? "ld" : "lw",
macro_build ((char *) NULL, counter, ep,
HAVE_32BIT_ADDRESSES ? "lw" : "ld",
"t,o(b)", reg, (int) BFD_RELOC_MIPS_GOT_LO16, reg); "t,o(b)", reg, (int) BFD_RELOC_MIPS_GOT_LO16, reg);
p = frag_var (rs_machine_dependent, 12 + off, 0, p = frag_var (rs_machine_dependent, 12 + off, 0,
RELAX_ENCODE (12, 12 + off, off, 8 + off, 0, RELAX_ENCODE (12, 12 + off, off, 8 + off, 0,
mips_opts.warn_about_macros), mips_opts.warn_about_macros),
ep->X_add_symbol, (offsetT) 0, (char *) NULL); ep->X_add_symbol, 0, NULL);
if (off > 0) if (off > 0)
{ {
/* We need a nop before loading from $gp. This special /* We need a nop before loading from $gp. This special
@ -3731,20 +3729,19 @@ load_address (counter, reg, ep, dbl, used_at)
macro_build (p, counter, (expressionS *) NULL, "nop", ""); macro_build (p, counter, (expressionS *) NULL, "nop", "");
p += 4; p += 4;
} }
macro_build (p, counter, ep, HAVE_32BIT_ADDRESSES ? "lw" : "ld", macro_build (p, counter, ep, dbl ? "ld" : "lw",
"t,o(b)", reg, (int) BFD_RELOC_MIPS_GOT16, GP); "t,o(b)", reg, (int) BFD_RELOC_MIPS_GOT16, GP);
p += 4; p += 4;
macro_build (p, counter, (expressionS *) NULL, "nop", ""); macro_build (p, counter, (expressionS *) NULL, "nop", "");
p += 4; p += 4;
macro_build (p, counter, ep, HAVE_32BIT_ADDRESSES ? "addiu" : "daddiu", macro_build (p, counter, ep, dbl ? "daddiu" : "addiu",
"t,r,j", reg, reg, (int) BFD_RELOC_LO16); "t,r,j", reg, reg, (int) BFD_RELOC_LO16);
if (ex.X_add_number != 0) if (ex.X_add_number != 0)
{ {
if (ex.X_add_number < -0x8000 || ex.X_add_number >= 0x8000) if (ex.X_add_number < -0x8000 || ex.X_add_number >= 0x8000)
as_bad (_("PIC code offset overflow (max 16 signed bits)")); as_bad (_("PIC code offset overflow (max 16 signed bits)"));
ex.X_op = O_constant; ex.X_op = O_constant;
macro_build ((char *) NULL, counter, &ex, macro_build ((char *) NULL, counter, &ex, dbl ? "daddiu" : "addiu",
HAVE_32BIT_ADDRESSES ? "addiu" : "daddiu",
"t,r,j", reg, reg, (int) BFD_RELOC_LO16); "t,r,j", reg, reg, (int) BFD_RELOC_LO16);
} }
} }
@ -4071,7 +4068,7 @@ macro (ip)
if (sreg == 0 if (sreg == 0
|| (HAVE_32BIT_GPRS || (HAVE_32BIT_GPRS
&& imm_expr.X_op == O_constant && imm_expr.X_op == O_constant
&& imm_expr.X_add_number == 0xffffffff)) && imm_expr.X_add_number == (offsetT) 0xffffffff))
goto do_false; goto do_false;
if (imm_expr.X_op != O_constant) if (imm_expr.X_op != O_constant)
as_bad (_("Unsupported large constant")); as_bad (_("Unsupported large constant"));
@ -4216,7 +4213,7 @@ macro (ip)
if (sreg == 0 if (sreg == 0
|| (HAVE_32BIT_GPRS || (HAVE_32BIT_GPRS
&& imm_expr.X_op == O_constant && imm_expr.X_op == O_constant
&& imm_expr.X_add_number == 0xffffffff)) && imm_expr.X_add_number == (offsetT) 0xffffffff))
goto do_true; goto do_true;
if (imm_expr.X_op != O_constant) if (imm_expr.X_op != O_constant)
as_bad (_("Unsupported large constant")); as_bad (_("Unsupported large constant"));
@ -4632,8 +4629,7 @@ macro (ip)
p = frag_var (rs_machine_dependent, 8, 0, p = frag_var (rs_machine_dependent, 8, 0,
RELAX_ENCODE (4, 8, 0, 4, 0, RELAX_ENCODE (4, 8, 0, 4, 0,
mips_opts.warn_about_macros), mips_opts.warn_about_macros),
offset_expr.X_add_symbol, (offsetT) 0, offset_expr.X_add_symbol, 0, NULL);
(char *) NULL);
} }
macro_build_lui (p, &icnt, &offset_expr, tempreg); macro_build_lui (p, &icnt, &offset_expr, tempreg);
if (p != NULL) if (p != NULL)
@ -5507,8 +5503,7 @@ macro (ip)
(mips_opts.warn_about_macros (mips_opts.warn_about_macros
|| (used_at || (used_at
&& mips_opts.noat))), && mips_opts.noat))),
offset_expr.X_add_symbol, (offsetT) 0, offset_expr.X_add_symbol, 0, NULL);
(char *) NULL);
used_at = 0; used_at = 0;
} }
macro_build_lui (p, &icnt, &offset_expr, tempreg); macro_build_lui (p, &icnt, &offset_expr, tempreg);
@ -5532,8 +5527,7 @@ macro (ip)
treg, (int) BFD_RELOC_GPREL16, tempreg); treg, (int) BFD_RELOC_GPREL16, tempreg);
p = frag_var (rs_machine_dependent, 12, 0, p = frag_var (rs_machine_dependent, 12, 0,
RELAX_ENCODE (8, 12, 0, 8, 0, 0), RELAX_ENCODE (8, 12, 0, 8, 0, 0),
offset_expr.X_add_symbol, (offsetT) 0, offset_expr.X_add_symbol, 0, NULL);
(char *) NULL);
} }
macro_build_lui (p, &icnt, &offset_expr, tempreg); macro_build_lui (p, &icnt, &offset_expr, tempreg);
if (p != NULL) if (p != NULL)
@ -5757,8 +5751,7 @@ macro (ip)
upper 16 bits of the address. */ upper 16 bits of the address. */
if (mips_pic == NO_PIC) if (mips_pic == NO_PIC)
{ {
/* FIXME: This won't work for a 64 bit address. */ macro_build_lui (NULL, &icnt, &offset_expr, AT);
macro_build_lui ((char *) NULL, &icnt, &offset_expr, AT);
} }
else if (mips_pic == SVR4_PIC) else if (mips_pic == SVR4_PIC)
{ {
@ -5862,7 +5855,7 @@ macro (ip)
else else
{ {
/* FIXME: This won't work for a 64 bit address. */ /* FIXME: This won't work for a 64 bit address. */
macro_build_lui ((char *) NULL, &icnt, &offset_expr, AT); macro_build_lui (NULL, &icnt, &offset_expr, AT);
} }
if (mips_opts.isa != ISA_MIPS1) if (mips_opts.isa != ISA_MIPS1)
@ -6065,8 +6058,7 @@ macro (ip)
p = frag_var (rs_machine_dependent, 12 + off, 0, p = frag_var (rs_machine_dependent, 12 + off, 0,
RELAX_ENCODE (8 + off, 12 + off, 0, 4 + off, 1, RELAX_ENCODE (8 + off, 12 + off, 0, 4 + off, 1,
used_at && mips_opts.noat), used_at && mips_opts.noat),
offset_expr.X_add_symbol, (offsetT) 0, offset_expr.X_add_symbol, 0, NULL);
(char *) NULL);
/* We just generated two relocs. When tc_gen_reloc /* We just generated two relocs. When tc_gen_reloc
handles this case, it will skip the first reloc and handles this case, it will skip the first reloc and
@ -11280,14 +11272,14 @@ s_cpload (ignore)
If offset is given, this results in: If offset is given, this results in:
sd $gp, offset($sp) sd $gp, offset($sp)
lui $gp, %gp_rel(%neg(%hi(label))) lui $gp, %hi(%neg(%gp_rel(label)))
daddiu $gp, $gp, %gp_rel(%neg(%lo(label))) daddiu $gp, $gp, %lo(%neg(%gp_rel(label)))
addu $gp, $gp, $reg1 addu $gp, $gp, $reg1
If $reg2 is given, this results in: If $reg2 is given, this results in:
daddu $reg2, $gp, $0 daddu $reg2, $gp, $0
lui $gp, %gp_rel(%neg(%hi(label))) lui $gp, %hi(%neg(%gp_rel(label)))
daddiu $gp, $gp, %gp_rel(%neg(%lo(label))) daddiu $gp, $gp, %lo(%neg(%gp_rel(label)))
addu $gp, $gp, $reg1 addu $gp, $gp, $reg1
*/ */
static void static void
@ -11606,7 +11598,7 @@ s_mips_weakext (ignore)
{ {
if (S_IS_DEFINED (symbolP)) if (S_IS_DEFINED (symbolP))
{ {
as_bad ("Ignoring attempt to redefine symbol `%s'.", as_bad ("ignoring attempt to redefine symbol %s",
S_GET_NAME (symbolP)); S_GET_NAME (symbolP));
ignore_rest_of_line (); ignore_rest_of_line ();
return; return;
@ -12681,7 +12673,7 @@ get_number ()
negative = 1; negative = 1;
} }
if (!ISDIGIT (*input_line_pointer)) if (!ISDIGIT (*input_line_pointer))
as_bad (_("Expected simple number.")); as_bad (_("expected simple number"));
if (input_line_pointer[0] == '0') if (input_line_pointer[0] == '0')
{ {
if (input_line_pointer[1] == 'x') if (input_line_pointer[1] == 'x')
@ -12709,7 +12701,7 @@ get_number ()
{ {
printf (_(" *input_line_pointer == '%c' 0x%02x\n"), printf (_(" *input_line_pointer == '%c' 0x%02x\n"),
*input_line_pointer, *input_line_pointer); *input_line_pointer, *input_line_pointer);
as_warn (_("Invalid number")); as_warn (_("invalid number"));
return -1; return -1;
} }
while (ISDIGIT (*input_line_pointer)) while (ISDIGIT (*input_line_pointer))