From ac28a1cbc62585f7fa6d6b74e8fd42f4e0492a79 Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Fri, 27 Aug 2004 09:32:02 +0000 Subject: [PATCH] cpu/ * frv.cpu (cfmovs): Change UNIT attribute to FMALL. opcodes/ * frv-desc.[ch], frv-opc.[ch]: Regenerated. gas/testsuite/ * gas/frv/fr550-pack1.[sd]: New test. * gas/frv/allinsn.exp: Run it. --- cpu/ChangeLog | 4 ++++ cpu/frv.cpu | 2 +- gas/testsuite/ChangeLog | 5 +++++ gas/testsuite/gas/frv/allinsn.exp | 2 ++ gas/testsuite/gas/frv/fr550-pack1.d | 12 ++++++++++++ gas/testsuite/gas/frv/fr550-pack1.s | 4 ++++ opcodes/ChangeLog | 4 ++++ opcodes/frv-desc.c | 4 ++-- opcodes/frv-desc.h | 2 +- opcodes/frv-opc.c | 2 +- opcodes/frv-opc.h | 2 +- 11 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 gas/testsuite/gas/frv/fr550-pack1.d create mode 100644 gas/testsuite/gas/frv/fr550-pack1.s diff --git a/cpu/ChangeLog b/cpu/ChangeLog index 3ef3440fc8..d28bcd57f1 100644 --- a/cpu/ChangeLog +++ b/cpu/ChangeLog @@ -1,3 +1,7 @@ +2004-08-27 Richard Sandiford + + * frv.cpu (cfmovs): Change UNIT attribute to FMALL. + 2004-05-15 Nick Clifton * iq2000.opc (iq2000_cgen_insn_supported): Make 'insn' argument const. diff --git a/cpu/frv.cpu b/cpu/frv.cpu index 75b034c6ed..720322d0df 100644 --- a/cpu/frv.cpu +++ b/cpu/frv.cpu @@ -7122,7 +7122,7 @@ ((fr500 (unit u-fr2fr))) ) -(conditional-register-transfer cfmovs OP_6C OPE4_0 FRj FRk FM01 +(conditional-register-transfer cfmovs OP_6C OPE4_0 FRj FRk FMALL ((FR500-MAJOR F-1) (FR550-MAJOR F-2) (MACH simple,tomcat,fr500,fr550,frv)) ((fr500 (unit u-fr2fr)) (fr550 (unit u-fr2fr))) diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 6c78e36244..6effaab360 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2004-08-27 Richard Sandiford + + * gas/frv/fr550-pack1.[sd]: New test. + * gas/frv/allinsn.exp: Run it. + 2004-08-27 Nick Clifton * gas/i386/i386.exp: Allow pcrel test for COFF targets as well, diff --git a/gas/testsuite/gas/frv/allinsn.exp b/gas/testsuite/gas/frv/allinsn.exp index 8684e4c68f..ed29d20893 100644 --- a/gas/testsuite/gas/frv/allinsn.exp +++ b/gas/testsuite/gas/frv/allinsn.exp @@ -27,4 +27,6 @@ if [istarget frv*-*-*] { run_list_test "fr450-insn" "-mcpu=fr400" run_list_test "fr450-insn" "-mcpu=fr500" run_list_test "fr450-media-issue" "-mcpu=fr450" + + run_dump_test "fr550-pack1" } diff --git a/gas/testsuite/gas/frv/fr550-pack1.d b/gas/testsuite/gas/frv/fr550-pack1.d new file mode 100644 index 0000000000..c577bfcfb5 --- /dev/null +++ b/gas/testsuite/gas/frv/fr550-pack1.d @@ -0,0 +1,12 @@ +#as: -mcpu=fr550 +#objdump: -dr + +.*: file format elf32-frv(|fdpic) + +Disassembly of section \.text: + +00000000 <.*>: +.*: 09 b0 00 00 cfmovs\.p fr0,fr4,cc0,0x0 +.*: 0b b0 00 01 cfmovs\.p fr1,fr5,cc0,0x0 +.*: 0d b0 00 02 cfmovs\.p fr2,fr6,cc0,0x0 +.*: 8f b0 00 03 cfmovs fr3,fr7,cc0,0x0 diff --git a/gas/testsuite/gas/frv/fr550-pack1.s b/gas/testsuite/gas/frv/fr550-pack1.s new file mode 100644 index 0000000000..aa3f36077d --- /dev/null +++ b/gas/testsuite/gas/frv/fr550-pack1.s @@ -0,0 +1,4 @@ + cfmovs.p fr0,fr4,cc0,0 + cfmovs.p fr1,fr5,cc0,0 + cfmovs.p fr2,fr6,cc0,0 + cfmovs fr3,fr7,cc0,0 diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index adf1a09f8c..3531db3f65 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,7 @@ +2004-08-27 Richard Sandiford + + * frv-desc.[ch], frv-opc.[ch]: Regenerated. + 2004-07-30 Michal Ludvig * i386-dis.c (GRPPADLCK): Renamed to GRPPADLCK1 diff --git a/opcodes/frv-desc.c b/opcodes/frv-desc.c index 7e0b3b424a..91f8ccadfe 100644 --- a/opcodes/frv-desc.c +++ b/opcodes/frv-desc.c @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +Copyright 1996-2004 Free Software Foundation, Inc. This file is part of the GNU Binutils and/or GDB, the GNU debugger. @@ -5160,7 +5160,7 @@ static const CGEN_IBASE frv_cgen_insn_table[MAX_INSNS] = /* cfmovs$pack $FRj,$FRk,$CCi,$cond */ { FRV_INSN_CFMOVS, "cfmovs", "cfmovs", 32, - { 0|A(FR_ACCESS)|A(CONDITIONAL), { (1<