opcodes/

	* s390-opc.txt (flogr): Require a register pair destination.

gas/testsuite/
	* gas/s390/zarch-z9-109-err.s, gas/s390/zarch-z9-109-err.l: New test.
	* gas/s390/s390.exp: Run it.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index faa07c1..f71d45c 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-24  Richard Sandiford  <rsandifo@linux.vnet.ibm.com>
+
+       * gas/s390/zarch-z9-109-err.s, gas/s390/zarch-z9-109-err.l: New test.
+       * gas/s390/s390.exp: Run it.
+
 2013-05-23  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
 
        * gas/s390/zarch-zEC12.d: Adjust length operands for cdzt, cxzt,

diff --git a/gas/testsuite/gas/s390/s390.exp b/gas/testsuite/gas/s390/s390.exp
index 5f02afe..8dee249 100644 (file)
--- a/gas/testsuite/gas/s390/s390.exp
+++ b/gas/testsuite/gas/s390/s390.exp
@@ -22,6 +22,7 @@ if [expr [istarget "s390-*-*"] ||  [istarget "s390x-*-*"]]  then {
     run_dump_test "zarch-z900" "{as -m64}"
     run_dump_test "zarch-z990" "{as -m64} {as -march=z990}"
     run_dump_test "zarch-z9-109" "{as -m64} {as -march=z9-109}"
+    run_list_test "zarch-z9-109-err" "-march=z9-109"
     run_dump_test "zarch-z9-ec" "{as -m64} {as -march=z9-ec}"
     run_dump_test "zarch-z10" "{as -m64} {as -march=z10}"
     run_dump_test "zarch-z196" "{as -m64} {as -march=z196}"

diff --git a/gas/testsuite/gas/s390/zarch-z9-109-err.l b/gas/testsuite/gas/s390/zarch-z9-109-err.l
new file mode 100644 (file)
index 0000000..1b06f93
--- /dev/null
+++ b/gas/testsuite/gas/s390/zarch-z9-109-err.l
@@ -0,0 +1,2 @@
+.*: Assembler messages:
+.*:3: Fatal error: odd numbered general purpose register specified as register pair

diff --git a/gas/testsuite/gas/s390/zarch-z9-109-err.s b/gas/testsuite/gas/s390/zarch-z9-109-err.s
new file mode 100644 (file)
index 0000000..6a94cb0
--- /dev/null
+++ b/gas/testsuite/gas/s390/zarch-z9-109-err.s
@@ -0,0 +1,3 @@
+.text
+foo:
+       flogr   %r7,%r8

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index eb16b0a..570ebb9 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-24  Richard Sandiford  <rsandifo@linux.vnet.ibm.com>
+
+       * s390-opc.txt (flogr): Require a register pair destination.
+
 2013-05-23  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
 
        * s390-opc.c: Fix length operand in RSL_LRDFU and RSL_LRDFEU

diff --git a/opcodes/s390-opc.txt b/opcodes/s390-opc.txt
index 60757c8..65068de 100644 (file)
--- a/opcodes/s390-opc.txt
+++ b/opcodes/s390-opc.txt
@@ -736,7 +736,7 @@ c007 xilf RIL_RU "exclusive or immediate low" z9-109 zarch
 c008 iihf RIL_RU "insert immediate high" z9-109 zarch
 c009 iilf RIL_RU "insert immediate low" z9-109 zarch
 # z9-109 misc instruction
-b983 flogr RRE_RR "find leftmost one" z9-109 zarch
+b983 flogr RRE_RER "find leftmost one" z9-109 zarch
 e30000000012 lt RXY_RRRD "load and test 32" z9-109 zarch
 e30000000002 ltg RXY_RRRD "load and test 64" z9-109 zarch
 b926 lbr RRE_RR "load byte 32" z9-109 zarch