From b9edc7cc871e08d9d0fb8d69916ddcd4ac62dfcf Mon Sep 17 00:00:00 2001 From: dj Date: Wed, 2 Sep 2009 02:10:35 +0000 Subject: [PATCH] [cgen] * cpu/mep.opc (parse_signed16_range): Mark as potentially unused. (parse_unsigned16_range): Likewise. (mep_cgen_insn_supported_asm): Make BSR12 check dependent on VLIW isa. [opcodes] * mep-asm.c: Regenerate. * mep-desc.c: Regenerate. * mep-opc.c: Regenerate. --- cgen/ChangeLog | 7 +++ cgen/cpu/mep.opc | 6 +- opcodes/ChangeLog | 6 ++ opcodes/mep-asm.c | 4 +- opcodes/mep-desc.c | 166 ++++++++++++++++++++++++++--------------------------- opcodes/mep-opc.c | 2 + 6 files changed, 104 insertions(+), 87 deletions(-) diff --git a/cgen/ChangeLog b/cgen/ChangeLog index 1c2e023c55..2b96e6364f 100644 --- a/cgen/ChangeLog +++ b/cgen/ChangeLog @@ -1,3 +1,10 @@ +2009-09-01 DJ Delorie + + * cpu/mep.opc (parse_signed16_range): Mark as potentially unused. + (parse_unsigned16_range): Likewise. + (mep_cgen_insn_supported_asm): Make BSR12 check dependent on VLIW + isa. + 2009-09-01 Doug Evans Pmacro .equals -> .equal? diff --git a/cgen/cpu/mep.opc b/cgen/cpu/mep.opc index 47e6ff7ba8..f3d1ebcfa8 100644 --- a/cgen/cpu/mep.opc +++ b/cgen/cpu/mep.opc @@ -90,9 +90,9 @@ extern int mep_cgen_insn_supported_asm (CGEN_CPU_DESC, const CGEN_INSN *); const char * parse_mep_align (CGEN_CPU_DESC, const char **, enum cgen_operand_type, long *); const char * parse_mep_alignu (CGEN_CPU_DESC, const char **, enum cgen_operand_type, unsigned long *); static const char * parse_signed16 (CGEN_CPU_DESC, const char **, int, long *); -static const char * parse_signed16_range (CGEN_CPU_DESC, const char **, int, long *); +static const char * parse_signed16_range (CGEN_CPU_DESC, const char **, int, long *) ATTRIBUTE_UNUSED; static const char * parse_unsigned16 (CGEN_CPU_DESC, const char **, int, unsigned long *); -static const char * parse_unsigned16_range (CGEN_CPU_DESC, const char **, int, unsigned long *); +static const char * parse_unsigned16_range (CGEN_CPU_DESC, const char **, int, unsigned long *) ATTRIBUTE_UNUSED; static const char * parse_lo16 (CGEN_CPU_DESC, const char **, int, long *, long); static const char * parse_unsigned7 (CGEN_CPU_DESC, const char **, enum cgen_operand_type, unsigned long *); static const char * parse_zero (CGEN_CPU_DESC, const char **, int, long *); @@ -1647,11 +1647,13 @@ mep_cgen_insn_supported (CGEN_CPU_DESC cd, const CGEN_INSN *insn) int mep_cgen_insn_supported_asm (CGEN_CPU_DESC cd, const CGEN_INSN *insn) { +#ifdef ISA_EXT_COP1_64 /* If we're assembling VLIW packets, ignore the 12-bit BSR as we can't relax that. The 24-bit BSR is matched instead. */ if (insn->base->num == MEP_INSN_BSR12 && cgen_bitset_contains (cd->isas, ISA_EXT_COP1_64)) return 0; +#endif return mep_cgen_insn_supported (cd, insn); } diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 6eb2be4631..975452afc8 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,9 @@ +2009-09-01 DJ Delorie + + * mep-asm.c: Regenerate. + * mep-desc.c: Regenerate. + * mep-opc.c: Regenerate. + 2009-09-01 Tristan Gingold * makefile.vms: Ported to Itanium VMS. Remove useless targets and diff --git a/opcodes/mep-asm.c b/opcodes/mep-asm.c index 6ab21e1cd7..294db360af 100644 --- a/opcodes/mep-asm.c +++ b/opcodes/mep-asm.c @@ -62,9 +62,9 @@ static const char * parse_insn_normal const char * parse_mep_align (CGEN_CPU_DESC, const char **, enum cgen_operand_type, long *); const char * parse_mep_alignu (CGEN_CPU_DESC, const char **, enum cgen_operand_type, unsigned long *); static const char * parse_signed16 (CGEN_CPU_DESC, const char **, int, long *); -static const char * parse_signed16_range (CGEN_CPU_DESC, const char **, int, long *); +static const char * parse_signed16_range (CGEN_CPU_DESC, const char **, int, long *) ATTRIBUTE_UNUSED; static const char * parse_unsigned16 (CGEN_CPU_DESC, const char **, int, unsigned long *); -static const char * parse_unsigned16_range (CGEN_CPU_DESC, const char **, int, unsigned long *); +static const char * parse_unsigned16_range (CGEN_CPU_DESC, const char **, int, unsigned long *) ATTRIBUTE_UNUSED; static const char * parse_lo16 (CGEN_CPU_DESC, const char **, int, long *, long); static const char * parse_unsigned7 (CGEN_CPU_DESC, const char **, enum cgen_operand_type, unsigned long *); static const char * parse_zero (CGEN_CPU_DESC, const char **, int, long *); diff --git a/opcodes/mep-desc.c b/opcodes/mep-desc.c index 7669322393..e56194e726 100644 --- a/opcodes/mep-desc.c +++ b/opcodes/mep-desc.c @@ -595,8 +595,8 @@ const CGEN_HW_ENTRY mep_cgen_hw_table[] = const CGEN_IFLD mep_cgen_ifld_table[] = { - { MEP_F_NIL, "f-nil", 0, 0, 0, 0, { 0, { { { (1<base->num == MEP_INSN_BSR12 && cgen_bitset_contains (cd->isas, ISA_EXT_COP1_64)) return 0; +#endif return mep_cgen_insn_supported (cd, insn); } -- 2.11.0