2011-10-21 Jan Glauber <jang@linux.vnet.ibm.com>

	* s390-opc.txt: Add CPUMF instructions.

2011-10-21  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>

	* gas/s390/zarch-z10.d: Add CPUMF instructions.
	* gas/s390/zarch-z10.s: Likewise.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 5de442f..605dd33 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-21  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+       * gas/s390/zarch-z10.d: Add CPUMF instructions.
+       * gas/s390/zarch-z10.s: Likewise.
+
 2011-10-18  Jie Zhang  <jie@codesourcery.com>
            Julian Brown  <julian@codesourcery.com>
 

diff --git a/gas/testsuite/gas/s390/zarch-z10.d b/gas/testsuite/gas/s390/zarch-z10.d
index 2ea258d..d9807ed 100644 (file)
--- a/gas/testsuite/gas/s390/zarch-z10.d
+++ b/gas/testsuite/gas/s390/zarch-z10.d
@@ -374,4 +374,15 @@ Disassembly of section .text:
 .*:    b9 bf 00 67 [   ]*trte  %r6,%r7,0
 .*:    b9 bd a0 67 [   ]*trtre %r6,%r7,10
 .*:    b9 bd 00 67 [   ]*trtre %r6,%r7,0
-.*:    07 07 [         ]*nopr  %r7
\ No newline at end of file
+.*:    b2 ed 00 67 [   ]*ecpga %r6,%r7
+.*:    b2 e4 00 67 [   ]*ecctr %r6,%r7
+.*:    b2 e5 00 67 [   ]*epctr %r6,%r7
+.*:    b2 84 6d 05 [   ]*lcctl 3333\(%r6\)
+.*:    b2 85 6d 05 [   ]*lpctl 3333\(%r6\)
+.*:    b2 87 6d 05 [   ]*lsctl 3333\(%r6\)
+.*:    b2 8e 6d 05 [   ]*qctri 3333\(%r6\)
+.*:    b2 86 6d 05 [   ]*qsi   3333\(%r6\)
+.*:    b2 e0 00 67 [   ]*scctr %r6,%r7
+.*:    b2 e1 00 67 [   ]*spctr %r6,%r7
+.*:    b2 80 6d 05 [   ]*lpp   3333\(%r6\)
+.*:    07 07 [         ]*nopr  %r7

diff --git a/gas/testsuite/gas/s390/zarch-z10.s b/gas/testsuite/gas/s390/zarch-z10.s
index 3bf3990..bd292e9 100644 (file)
--- a/gas/testsuite/gas/s390/zarch-z10.s
+++ b/gas/testsuite/gas/s390/zarch-z10.s
@@ -368,3 +368,14 @@ foo:
        trte    %r6,%r7
        trtre   %r6,%r7,10
        trtre   %r6,%r7
+       ecpga   %r6,%r7
+       ecctr   %r6,%r7
+       epctr   %r6,%r7
+       lcctl   3333(%r6)
+       lpctl   3333(%r6)
+       lsctl   3333(%r6)
+       qctri   3333(%r6)
+       qsi     3333(%r6)
+       scctr   %r6,%r7
+       spctr   %r6,%r7
+       lpp     3333(%r6)

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index e14b99f..2d4989c 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-21  Jan Glauber  <jang@linux.vnet.ibm.com>
+
+       * s390-opc.txt: Add CPUMF instructions.
+
 2011-10-18  Jie Zhang  <jie@codesourcery.com>
            Julian Brown  <julian@codesourcery.com>
 

diff --git a/opcodes/s390-opc.txt b/opcodes/s390-opc.txt
index be44e90..1943fd6 100644 (file)
--- a/opcodes/s390-opc.txt
+++ b/opcodes/s390-opc.txt
@@ -960,6 +960,17 @@ b9a2 ptf RRE_R0 "perform topology function" z10 zarch
 b9af pfmf RRE_RR "perform frame management function" z10 zarch
 b9bf trte RRF_M0RER "translate and test extended" z10 zarch
 b9bd trtre RRF_M0RER "translate and test reverse extended" z10 zarch
+b2ed ecpga RRE_RR "extract coprocessor-group address" z10 zarch
+b2e4 ecctr RRE_RR "extract cpu counter" z10 zarch
+b2e5 epctr RRE_RR "extract peripheral counter" z10 zarch
+b284 lcctl S_RD "load cpu-counter-set controls" z10 zarch
+b285 lpctl S_RD "load peripheral-counter-set controls" z10 zarch
+b287 lsctl S_RD "load sampling controls" z10 zarch
+b28e qctri S_RD "query counter information" z10 zarch
+b286 qsi S_RD "query sampling information" z10 zarch
+b2e0 scctr RRE_RR "set cpu counter" z10 zarch
+b2e1 spctr RRE_RR "set peripheral counter" z10 zarch
+b280 lpp S_RD "load program parameter" z10 zarch
 b9c8 ahhhr RRF_R0RR2 "add high high" z196 zarch
 b9d8 ahhlr RRF_R0RR2 "add high low" z196 zarch
 cc08 aih RIL_RI "add immediate high" z196 zarch