From 3ec2b351bd81ef7a827c8853e04c5612d00be84a Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 5 Jul 2005 15:07:46 +0000 Subject: [PATCH] Fix compile time warnings from a GCC 4.0 compiler --- bfd/ChangeLog | 4 ++++ bfd/elf64-ppc.c | 4 ++-- cpu/ChangeLog | 10 ++++++++++ cpu/iq2000.opc | 4 ++-- cpu/ms1.opc | 31 +++++++++++-------------------- gas/ChangeLog | 6 ++++++ gas/config/tc-pdp11.c | 2 +- opcodes/ChangeLog | 5 +++++ opcodes/iq2000-asm.c | 4 ++-- opcodes/ms1-asm.c | 31 +++++++++++-------------------- 10 files changed, 54 insertions(+), 47 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index e7cdd85e0c..67a8e79559 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,7 @@ +2005-07-05 Nick Clifton + + * elf64-ppc.c (ppc64_elf_info_to_howto): Fix typo. + 2005-05-07 Paul Brook * config.bfd: Add separate case for ppc-vxworks. diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c index 656e822755..f05262b9c2 100644 --- a/bfd/elf64-ppc.c +++ b/bfd/elf64-ppc.c @@ -2121,8 +2121,8 @@ ppc64_elf_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *cache_ptr, / sizeof (ppc64_elf_howto_table[0]))) { (*_bfd_error_handler) (_("%B: invalid relocation type %d"), - abfd, (int) r_type); - r_type = R_PPC64_NONE; + abfd, (int) type); + type = R_PPC64_NONE; } cache_ptr->howto = ppc64_elf_howto_table[type]; } diff --git a/cpu/ChangeLog b/cpu/ChangeLog index 0186195be2..7facd5a550 100644 --- a/cpu/ChangeLog +++ b/cpu/ChangeLog @@ -1,3 +1,13 @@ +2005-07-05 Nick Clifton + + * iq2000.opc (parse_lo16, parse_mlo16): Make value parameter + unsigned in order to avoid compile time warnings about sign + conflicts. + + * ms1.opc (parse_*): Likewise. + (parse_imm16): Use a "void *" as it is passed both signed and + unsigned arguments. + 2005-07-01 Nick Clifton * frv.opc: Update to ISO C90 function declaration style. diff --git a/cpu/iq2000.opc b/cpu/iq2000.opc index 5da6911a1c..63ef0768dd 100644 --- a/cpu/iq2000.opc +++ b/cpu/iq2000.opc @@ -259,7 +259,7 @@ static const char * parse_lo16 (CGEN_CPU_DESC cd, const char **strp, int opindex, - long *valuep) + unsigned long *valuep) { if (strncasecmp (*strp, "%lo(", 4) == 0) { @@ -291,7 +291,7 @@ static const char * parse_mlo16 (CGEN_CPU_DESC cd, const char **strp, int opindex, - long *valuep) + unsigned long *valuep) { if (strncasecmp (*strp, "%lo(", 4) == 0) { diff --git a/cpu/ms1.opc b/cpu/ms1.opc index 57c2913bd1..f61de6cd3d 100644 --- a/cpu/ms1.opc +++ b/cpu/ms1.opc @@ -89,16 +89,6 @@ ms1_asm_hash (const char* insn) /* -- asm.c */ -static int signed_out_of_bounds (long); -static const char * parse_imm16 (CGEN_CPU_DESC, const char **, int, long *); -static const char * parse_dup (CGEN_CPU_DESC, const char **, int, long *); -static const char * parse_ball (CGEN_CPU_DESC, const char **, int, long *); -static const char * parse_xmode (CGEN_CPU_DESC, const char **, int, long *); -static const char * parse_rc (CGEN_CPU_DESC, const char **, int, long *); -static const char * parse_cbrb (CGEN_CPU_DESC, const char **, int, long *); -static const char * parse_rbbc (CGEN_CPU_DESC, const char **, int, long *); -static const char * parse_type (CGEN_CPU_DESC, const char **, int, long *); - /* Range checking for signed numbers. Returns 0 if acceptable and 1 if the value is out of bounds for a signed quantity. */ @@ -114,8 +104,9 @@ static const char * parse_imm16 (CGEN_CPU_DESC cd, const char **strp, int opindex, - long *valuep) + void *arg) { + signed long * valuep = (signed long *) arg; const char *errmsg; enum cgen_parse_operand_result result_type; bfd_reloc_code_real_type code = BFD_RELOC_NONE; @@ -218,9 +209,9 @@ parse_imm16 (CGEN_CPU_DESC cd, else { /* MS1_OPERAND_IMM16Z. Parse as an unsigned integer. */ - errmsg = cgen_parse_unsigned_integer (cd, strp, opindex, valuep); + errmsg = cgen_parse_unsigned_integer (cd, strp, opindex, (unsigned long *) valuep); - if (opindex == (CGEN_OPERAND_TYPE)MS1_OPERAND_IMM16 + if (opindex == (CGEN_OPERAND_TYPE) MS1_OPERAND_IMM16 && *valuep >= 0x8000 && *valuep <= 0xffff) *valuep -= 0x10000; @@ -235,7 +226,7 @@ static const char * parse_dup (CGEN_CPU_DESC cd, const char **strp, int opindex, - long *valuep) + unsigned long *valuep) { const char *errmsg = NULL; @@ -260,7 +251,7 @@ static const char * parse_ball (CGEN_CPU_DESC cd, const char **strp, int opindex, - long *valuep) + unsigned long *valuep) { const char *errmsg = NULL; @@ -284,7 +275,7 @@ static const char * parse_xmode (CGEN_CPU_DESC cd, const char **strp, int opindex, - long *valuep) + unsigned long *valuep) { const char *errmsg = NULL; @@ -308,7 +299,7 @@ static const char * parse_rc (CGEN_CPU_DESC cd, const char **strp, int opindex, - long *valuep) + unsigned long *valuep) { const char *errmsg = NULL; @@ -332,7 +323,7 @@ static const char * parse_cbrb (CGEN_CPU_DESC cd, const char **strp, int opindex, - long *valuep) + unsigned long *valuep) { const char *errmsg = NULL; @@ -356,7 +347,7 @@ static const char * parse_rbbc (CGEN_CPU_DESC cd, const char **strp, int opindex, - long *valuep) + unsigned long *valuep) { const char *errmsg = NULL; @@ -390,7 +381,7 @@ static const char * parse_type (CGEN_CPU_DESC cd, const char **strp, int opindex, - long *valuep) + unsigned long *valuep) { const char *errmsg = NULL; diff --git a/gas/ChangeLog b/gas/ChangeLog index 80a8b7fcf2..c34b4e2d16 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2005-07-05 Nick Clifton + + * config/tc-pdp11.c (md_apply_fix): Cast first argument to + md_chars_to_numbers to an unsigned pointer in order to avoid a + compile time warning. + 2005-07-05 Paul Brook * config/tc-ppc.c (ppc_target_format): Add VxWorks. diff --git a/gas/config/tc-pdp11.c b/gas/config/tc-pdp11.c index a0057f1116..cf103df929 100644 --- a/gas/config/tc-pdp11.c +++ b/gas/config/tc-pdp11.c @@ -243,7 +243,7 @@ md_apply_fix (fixS *fixP, buf = fixP->fx_where + fixP->fx_frag->fr_literal; size = fixP->fx_size; - code = md_chars_to_number (buf, size); + code = md_chars_to_number ((unsigned char *) buf, size); switch (fixP->fx_r_type) { diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index f78ecf20ad..87b3942af9 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2005-07-05 Nick Clifton + + * iq2000-asm.c: Regenerate. + * ms1-asm.c: Regenerate. + 2005-07-05 Jan Beulich * i386-dis.c (SVME_Fixup): New. diff --git a/opcodes/iq2000-asm.c b/opcodes/iq2000-asm.c index 0bbb4aec89..caab54f500 100644 --- a/opcodes/iq2000-asm.c +++ b/opcodes/iq2000-asm.c @@ -255,7 +255,7 @@ static const char * parse_lo16 (CGEN_CPU_DESC cd, const char **strp, int opindex, - long *valuep) + unsigned long *valuep) { if (strncasecmp (*strp, "%lo(", 4) == 0) { @@ -287,7 +287,7 @@ static const char * parse_mlo16 (CGEN_CPU_DESC cd, const char **strp, int opindex, - long *valuep) + unsigned long *valuep) { if (strncasecmp (*strp, "%lo(", 4) == 0) { diff --git a/opcodes/ms1-asm.c b/opcodes/ms1-asm.c index 7647c1b272..528a0d5eeb 100644 --- a/opcodes/ms1-asm.c +++ b/opcodes/ms1-asm.c @@ -49,16 +49,6 @@ static const char * parse_insn_normal /* -- assembler routines inserted here. */ /* -- asm.c */ -static int signed_out_of_bounds (long); -static const char * parse_imm16 (CGEN_CPU_DESC, const char **, int, long *); -static const char * parse_dup (CGEN_CPU_DESC, const char **, int, long *); -static const char * parse_ball (CGEN_CPU_DESC, const char **, int, long *); -static const char * parse_xmode (CGEN_CPU_DESC, const char **, int, long *); -static const char * parse_rc (CGEN_CPU_DESC, const char **, int, long *); -static const char * parse_cbrb (CGEN_CPU_DESC, const char **, int, long *); -static const char * parse_rbbc (CGEN_CPU_DESC, const char **, int, long *); -static const char * parse_type (CGEN_CPU_DESC, const char **, int, long *); - /* Range checking for signed numbers. Returns 0 if acceptable and 1 if the value is out of bounds for a signed quantity. */ @@ -74,8 +64,9 @@ static const char * parse_imm16 (CGEN_CPU_DESC cd, const char **strp, int opindex, - long *valuep) + void *arg) { + signed long * valuep = (signed long *) arg; const char *errmsg; enum cgen_parse_operand_result result_type; bfd_reloc_code_real_type code = BFD_RELOC_NONE; @@ -178,9 +169,9 @@ parse_imm16 (CGEN_CPU_DESC cd, else { /* MS1_OPERAND_IMM16Z. Parse as an unsigned integer. */ - errmsg = cgen_parse_unsigned_integer (cd, strp, opindex, valuep); + errmsg = cgen_parse_unsigned_integer (cd, strp, opindex, (unsigned long *) valuep); - if (opindex == (CGEN_OPERAND_TYPE)MS1_OPERAND_IMM16 + if (opindex == (CGEN_OPERAND_TYPE) MS1_OPERAND_IMM16 && *valuep >= 0x8000 && *valuep <= 0xffff) *valuep -= 0x10000; @@ -195,7 +186,7 @@ static const char * parse_dup (CGEN_CPU_DESC cd, const char **strp, int opindex, - long *valuep) + unsigned long *valuep) { const char *errmsg = NULL; @@ -220,7 +211,7 @@ static const char * parse_ball (CGEN_CPU_DESC cd, const char **strp, int opindex, - long *valuep) + unsigned long *valuep) { const char *errmsg = NULL; @@ -244,7 +235,7 @@ static const char * parse_xmode (CGEN_CPU_DESC cd, const char **strp, int opindex, - long *valuep) + unsigned long *valuep) { const char *errmsg = NULL; @@ -268,7 +259,7 @@ static const char * parse_rc (CGEN_CPU_DESC cd, const char **strp, int opindex, - long *valuep) + unsigned long *valuep) { const char *errmsg = NULL; @@ -292,7 +283,7 @@ static const char * parse_cbrb (CGEN_CPU_DESC cd, const char **strp, int opindex, - long *valuep) + unsigned long *valuep) { const char *errmsg = NULL; @@ -316,7 +307,7 @@ static const char * parse_rbbc (CGEN_CPU_DESC cd, const char **strp, int opindex, - long *valuep) + unsigned long *valuep) { const char *errmsg = NULL; @@ -350,7 +341,7 @@ static const char * parse_type (CGEN_CPU_DESC cd, const char **strp, int opindex, - long *valuep) + unsigned long *valuep) { const char *errmsg = NULL; -- 2.34.1