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.

11 files changed, 37 insertions, 6 deletions

diff --git a/cpu/ChangeLog b/cpu/ChangeLog
index 3ef3440..d28bcd5 100644
--- a/cpu/ChangeLog
+++ b/cpu/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-27  Richard Sandiford  <rsandifo@redhat.com>
+
+	* frv.cpu (cfmovs): Change UNIT attribute to FMALL.
+
 2004-05-15  Nick Clifton  <nickc@redhat.com>
 
 	* iq2000.opc (iq2000_cgen_insn_supported): Make 'insn' argument const.
diff --git a/cpu/frv.cpu b/cpu/frv.cpu
index 75b034c..720322d 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 6c78e36..6effaab 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-27  Richard Sandiford  <rsandifo@redhat.com>
+
+	* gas/frv/fr550-pack1.[sd]: New test.
+	* gas/frv/allinsn.exp: Run it.
+
 2004-08-27  Nick Clifton  <nickc@redhat.com>
 
 	* 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 8684e4c..ed29d20 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 0000000..c577bfc
--- /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 0000000..aa3f360
--- /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 adf1a09..3531db3 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-27  Richard Sandiford  <rsandifo@redhat.com>
+
+	* frv-desc.[ch], frv-opc.[ch]: Regenerated.
+
 2004-07-30  Michal Ludvig  <mludvig@suse.cz>
 
 	* i386-dis.c (GRPPADLCK): Renamed to GRPPADLCK1
diff --git a/opcodes/frv-desc.c b/opcodes/frv-desc.c
index 7e0b3b4..91f8cca 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<<MACH_SIMPLE)|(1<<MACH_TOMCAT)|(1<<MACH_FR500)|(1<<MACH_FR550)|(1<<MACH_FRV), UNIT_FM01, FR400_MAJOR_NONE, FR450_MAJOR_NONE, FR500_MAJOR_F_1, FR550_MAJOR_F_2 } }
+    { 0|A(FR_ACCESS)|A(CONDITIONAL), { (1<<MACH_SIMPLE)|(1<<MACH_TOMCAT)|(1<<MACH_FR500)|(1<<MACH_FR550)|(1<<MACH_FRV), UNIT_FMALL, FR400_MAJOR_NONE, FR450_MAJOR_NONE, FR500_MAJOR_F_1, FR550_MAJOR_F_2 } }
   },
 /* fnegs$pack $FRj,$FRk */
   {
diff --git a/opcodes/frv-desc.h b/opcodes/frv-desc.h
index 5a11f8d..4e9b446 100644
--- a/opcodes/frv-desc.h
+++ b/opcodes/frv-desc.h
@@ -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.
 
diff --git a/opcodes/frv-opc.c b/opcodes/frv-opc.c
index 2e307e0..f220799 100644
--- a/opcodes/frv-opc.c
+++ b/opcodes/frv-opc.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.
 
diff --git a/opcodes/frv-opc.h b/opcodes/frv-opc.h
index dd343de..c0a52dc 100644
--- a/opcodes/frv-opc.h
+++ b/opcodes/frv-opc.h
@@ -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.