add extra cols for now

diff --git a/openpower/isatables/LDSTRM-2P-1S1D.csv b/openpower/isatables/LDSTRM-2P-1S1D.csv
index bca130079199ad2d826bcc00fc9540bf9674acee..02e15dc0c6a4519e503cceb4a570ce273fabfe2a 100644 (file)
--- a/openpower/isatables/LDSTRM-2P-1S1D.csv
+++ b/openpower/isatables/LDSTRM-2P-1S1D.csv
@@ -1,7 +1,7 @@
-insn,Ptype,Etype,0,1,2,3
-lwz,2P,EXTRA3,d:RT,s:RA,,
-lbz,2P,EXTRA3,d:RT,s:RA,,
-lhz,2P,EXTRA3,d:RT,s:RA,,
-lha,2P,EXTRA3,d:RT,s:RA,,
-ld,2P,EXTRA3,d:RT,s:RA,,
-lwa,2P,EXTRA3,d:RT,s:RA,,
+insn,Ptype,Etype,0,1,2,3,in1,in2,in3,out,CR in,CR out
+lwz,2P,EXTRA3,d:RT,s:RA,,,RA_OR_ZERO,,NONE,RT,NONE,NONE
+lbz,2P,EXTRA3,d:RT,s:RA,,,RA_OR_ZERO,,NONE,RT,NONE,NONE
+lhz,2P,EXTRA3,d:RT,s:RA,,,RA_OR_ZERO,,NONE,RT,NONE,NONE
+lha,2P,EXTRA3,d:RT,s:RA,,,RA_OR_ZERO,,NONE,RT,NONE,NONE
+ld,2P,EXTRA3,d:RT,s:RA,,,RA_OR_ZERO,,NONE,RT,NONE,NONE
+lwa,2P,EXTRA3,d:RT,s:RA,,,RA_OR_ZERO,,NONE,RT,NONE,NONE

diff --git a/openpower/isatables/LDSTRM-2P-1S2D.csv b/openpower/isatables/LDSTRM-2P-1S2D.csv
index 1e74b54bba6be4f3a60c52cfbfc620d3041c4340..823b06907a0422a02a22a08c587afae89f26dc73 100644 (file)
--- a/openpower/isatables/LDSTRM-2P-1S2D.csv
+++ b/openpower/isatables/LDSTRM-2P-1S2D.csv
@@ -1,6 +1,6 @@
-insn,Ptype,Etype,0,1,2,3
-lwzu,2P,EXTRA2,d:RT,d:RA,s:RA,
-lbzu,2P,EXTRA2,d:RT,d:RA,s:RA,
-lhzu,2P,EXTRA2,d:RT,d:RA,s:RA,
-lhau,2P,EXTRA2,d:RT,d:RA,s:RA,
-ldu,2P,EXTRA2,d:RT,d:RA,s:RA,
+insn,Ptype,Etype,0,1,2,3,in1,in2,in3,out,CR in,CR out
+lwzu,2P,EXTRA2,d:RT,d:RA,s:RA,,RA_OR_ZERO,,NONE,RT,NONE,NONE
+lbzu,2P,EXTRA2,d:RT,d:RA,s:RA,,RA_OR_ZERO,,NONE,RT,NONE,NONE
+lhzu,2P,EXTRA2,d:RT,d:RA,s:RA,,RA_OR_ZERO,,NONE,RT,NONE,NONE
+lhau,2P,EXTRA2,d:RT,d:RA,s:RA,,RA_OR_ZERO,,NONE,RT,NONE,NONE
+ldu,2P,EXTRA2,d:RT,d:RA,s:RA,,RA_OR_ZERO,,NONE,RT,NONE,NONE

diff --git a/openpower/isatables/LDSTRM-2P-2S.csv b/openpower/isatables/LDSTRM-2P-2S.csv
index 1b100c28bb0d3b8979cfab16850fa52e3c4810a6..6724a13fc75ec5e9dee5c9be3c4517801ddb6814 100644 (file)
--- a/openpower/isatables/LDSTRM-2P-2S.csv
+++ b/openpower/isatables/LDSTRM-2P-2S.csv
@@ -1,5 +1,5 @@
-insn,Ptype,Etype,0,1,2,3
-stw,2P,EXTRA3,d:RS,s:RA,,
-stb,2P,EXTRA3,d:RS,s:RA,,
-sth,2P,EXTRA3,d:RS,s:RA,,
-std,2P,EXTRA3,d:RS,s:RA,,
+insn,Ptype,Etype,0,1,2,3,in1,in2,in3,out,CR in,CR out
+stw,2P,EXTRA3,d:RS,s:RA,,,RA_OR_ZERO,,RS,NONE,NONE,NONE
+stb,2P,EXTRA3,d:RS,s:RA,,,RA_OR_ZERO,,RS,NONE,NONE,NONE
+sth,2P,EXTRA3,d:RS,s:RA,,,RA_OR_ZERO,,RS,NONE,NONE,NONE
+std,2P,EXTRA3,d:RS,s:RA,,,RA_OR_ZERO,,RS,NONE,NONE,NONE

diff --git a/openpower/isatables/LDSTRM-2P-2S1D.csv b/openpower/isatables/LDSTRM-2P-2S1D.csv
index 28414b6e0fd272637df6d425b02990859597fcbd..191f066eb03c5110a53da56e781fe786dda5ce40 100644 (file)
--- a/openpower/isatables/LDSTRM-2P-2S1D.csv
+++ b/openpower/isatables/LDSTRM-2P-2S1D.csv
@@ -1,32 +1,32 @@
-insn,Ptype,Etype,0,1,2,3
-lwarx,2P,EXTRA2,d:RT,s:RA,s:RB,
-ldx,2P,EXTRA2,d:RT,s:RA,s:RB,
-lwzx,2P,EXTRA2,d:RT,s:RA,s:RB,
-lbarx,2P,EXTRA2,d:RT,s:RA,s:RB,
-ldarx,2P,EXTRA2,d:RT,s:RA,s:RB,
-lbzx,2P,EXTRA2,d:RT,s:RA,s:RB,
-lharx,2P,EXTRA2,d:RT,s:RA,s:RB,
-lhzx,2P,EXTRA2,d:RT,s:RA,s:RB,
-lwax,2P,EXTRA2,d:RT,s:RA,s:RB,
-lhax,2P,EXTRA2,d:RT,s:RA,s:RB,
-ldbrx,2P,EXTRA2,d:RT,s:RA,s:RB,
-lwbrx,2P,EXTRA2,d:RT,s:RA,s:RB,
-lwzcix,2P,EXTRA2,d:RT,s:RA,s:RB,
-lhbrx,2P,EXTRA2,d:RT,s:RA,s:RB,
-lhzcix,2P,EXTRA2,d:RT,s:RA,s:RB,
-lbzcix,2P,EXTRA2,d:RT,s:RA,s:RB,
-ldcix,2P,EXTRA2,d:RT,s:RA,s:RB,
-stwu,2P,EXTRA2,d:RA,s:RS,s:RA,
-stbu,2P,EXTRA2,d:RA,s:RS,s:RA,
-sthu,2P,EXTRA2,d:RA,s:RS,s:RA,
-stdu,2P,EXTRA2,d:RA,s:RS,s:RA,
-ldux,2P,EXTRA2,d:RT,d:RA,s:RB,
-lwzux,2P,EXTRA2,d:RT,d:RA,s:RB,
-lbzux,2P,EXTRA2,d:RT,d:RA,s:RB,
-lhzux,2P,EXTRA2,d:RT,d:RA,s:RB,
-lwaux,2P,EXTRA2,d:RT,d:RA,s:RB,
-lhaux,2P,EXTRA2,d:RT,d:RA,s:RB,
-stdux,2P,EXTRA2,d:RA,"s:RS,s:RA",s:RB,
-stwux,2P,EXTRA2,d:RA,"s:RS,s:RA",s:RB,
-stbux,2P,EXTRA2,d:RA,"s:RS,s:RA",s:RB,
-sthux,2P,EXTRA2,d:RA,"s:RS,s:RA",s:RB,
+insn,Ptype,Etype,0,1,2,3,in1,in2,in3,out,CR in,CR out
+lwarx,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,NONE,RT,NONE,NONE
+ldx,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,NONE,RT,NONE,NONE
+lwzx,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,NONE,RT,NONE,NONE
+lbarx,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,NONE,RT,NONE,NONE
+ldarx,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,NONE,RT,NONE,NONE
+lbzx,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,NONE,RT,NONE,NONE
+lharx,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,NONE,RT,NONE,NONE
+lhzx,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,NONE,RT,NONE,NONE
+lwax,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,NONE,RT,NONE,NONE
+lhax,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,NONE,RT,NONE,NONE
+ldbrx,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,NONE,RT,NONE,NONE
+lwbrx,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,NONE,RT,NONE,NONE
+lwzcix,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,NONE,RT,NONE,NONE
+lhbrx,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,NONE,RT,NONE,NONE
+lhzcix,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,NONE,RT,NONE,NONE
+lbzcix,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,NONE,RT,NONE,NONE
+ldcix,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,NONE,RT,NONE,NONE
+stwu,2P,EXTRA2,d:RA,s:RS,s:RA,,RA_OR_ZERO,,RS,NONE,NONE,NONE
+stbu,2P,EXTRA2,d:RA,s:RS,s:RA,,RA_OR_ZERO,,RS,NONE,NONE,NONE
+sthu,2P,EXTRA2,d:RA,s:RS,s:RA,,RA_OR_ZERO,,RS,NONE,NONE,NONE
+stdu,2P,EXTRA2,d:RA,s:RS,s:RA,,RA_OR_ZERO,,RS,NONE,NONE,NONE
+ldux,2P,EXTRA2,d:RT,d:RA,s:RB,,RA_OR_ZERO,RB,NONE,RT,NONE,NONE
+lwzux,2P,EXTRA2,d:RT,d:RA,s:RB,,RA_OR_ZERO,RB,NONE,RT,NONE,NONE
+lbzux,2P,EXTRA2,d:RT,d:RA,s:RB,,RA_OR_ZERO,RB,NONE,RT,NONE,NONE
+lhzux,2P,EXTRA2,d:RT,d:RA,s:RB,,RA_OR_ZERO,RB,NONE,RT,NONE,NONE
+lwaux,2P,EXTRA2,d:RT,d:RA,s:RB,,RA_OR_ZERO,RB,NONE,RT,NONE,NONE
+lhaux,2P,EXTRA2,d:RT,d:RA,s:RB,,RA_OR_ZERO,RB,NONE,RT,NONE,NONE
+stdux,2P,EXTRA2,d:RA,"s:RS,s:RA",s:RB,,RA_OR_ZERO,RB,RS,NONE,NONE,NONE
+stwux,2P,EXTRA2,d:RA,"s:RS,s:RA",s:RB,,RA_OR_ZERO,RB,RS,NONE,NONE,NONE
+stbux,2P,EXTRA2,d:RA,"s:RS,s:RA",s:RB,,RA_OR_ZERO,RB,RS,NONE,NONE,NONE
+sthux,2P,EXTRA2,d:RA,"s:RS,s:RA",s:RB,,RA_OR_ZERO,RB,RS,NONE,NONE,NONE

diff --git a/openpower/isatables/LDSTRM-2P-3S.csv b/openpower/isatables/LDSTRM-2P-3S.csv
index d76805fed7f6d1c36bb8979a0f6343b2bf1eb4a1..a319ebab7514f5324abdc5455a1434392bcc4b13 100644 (file)
--- a/openpower/isatables/LDSTRM-2P-3S.csv
+++ b/openpower/isatables/LDSTRM-2P-3S.csv
@@ -1,16 +1,16 @@
-insn,Ptype,Etype,0,1,2,3
-stdx,2P,EXTRA2,s:RS,s:RA,s:RB,
-stwx,2P,EXTRA2,s:RS,s:RA,s:RB,
-stbx,2P,EXTRA2,s:RS,s:RA,s:RB,
-sthx,2P,EXTRA2,s:RS,s:RA,s:RB,
-stdbrx,2P,EXTRA2,s:RS,s:RA,s:RB,
-stwbrx,2P,EXTRA2,s:RS,s:RA,s:RB,
-stwcix,2P,EXTRA2,s:RS,s:RA,s:RB,
-sthbrx,2P,EXTRA2,s:RS,s:RA,s:RB,
-sthcix,2P,EXTRA2,s:RS,s:RA,s:RB,
-stbcix,2P,EXTRA2,s:RS,s:RA,s:RB,
-stdcix,2P,EXTRA2,s:RS,s:RA,s:RB,
-stwcx,2P,EXTRA2,"s:RS,d:CR0",s:RA,s:RB,
-stdcx,2P,EXTRA2,"s:RS,d:CR0",s:RA,s:RB,
-stbcx,2P,EXTRA2,"s:RS,d:CR0",s:RA,s:RB,
-sthcx,2P,EXTRA2,"s:RS,d:CR0",s:RA,s:RB,
+insn,Ptype,Etype,0,1,2,3,in1,in2,in3,out,CR in,CR out
+stdx,2P,EXTRA2,s:RS,s:RA,s:RB,,RA_OR_ZERO,RB,RS,NONE,NONE,NONE
+stwx,2P,EXTRA2,s:RS,s:RA,s:RB,,RA_OR_ZERO,RB,RS,NONE,NONE,NONE
+stbx,2P,EXTRA2,s:RS,s:RA,s:RB,,RA_OR_ZERO,RB,RS,NONE,NONE,NONE
+sthx,2P,EXTRA2,s:RS,s:RA,s:RB,,RA_OR_ZERO,RB,RS,NONE,NONE,NONE
+stdbrx,2P,EXTRA2,s:RS,s:RA,s:RB,,RA_OR_ZERO,RB,RS,NONE,NONE,NONE
+stwbrx,2P,EXTRA2,s:RS,s:RA,s:RB,,RA_OR_ZERO,RB,RS,NONE,NONE,NONE
+stwcix,2P,EXTRA2,s:RS,s:RA,s:RB,,RA_OR_ZERO,RB,RS,NONE,NONE,NONE
+sthbrx,2P,EXTRA2,s:RS,s:RA,s:RB,,RA_OR_ZERO,RB,RS,NONE,NONE,NONE
+sthcix,2P,EXTRA2,s:RS,s:RA,s:RB,,RA_OR_ZERO,RB,RS,NONE,NONE,NONE
+stbcix,2P,EXTRA2,s:RS,s:RA,s:RB,,RA_OR_ZERO,RB,RS,NONE,NONE,NONE
+stdcix,2P,EXTRA2,s:RS,s:RA,s:RB,,RA_OR_ZERO,RB,RS,NONE,NONE,NONE
+stwcx,2P,EXTRA2,"s:RS,d:CR0",s:RA,s:RB,,RA_OR_ZERO,RB,RS,NONE,NONE,CR0
+stdcx,2P,EXTRA2,"s:RS,d:CR0",s:RA,s:RB,,RA_OR_ZERO,RB,RS,NONE,NONE,CR0
+stbcx,2P,EXTRA2,"s:RS,d:CR0",s:RA,s:RB,,RA_OR_ZERO,RB,RS,NONE,NONE,CR0
+sthcx,2P,EXTRA2,"s:RS,d:CR0",s:RA,s:RB,,RA_OR_ZERO,RB,RS,NONE,NONE,CR0

diff --git a/openpower/isatables/RM-1P-2S1D.csv b/openpower/isatables/RM-1P-2S1D.csv
index 02d7c246d9c817b28a3d28d7f33428a35455c267..52cca4844747853b9c7677860fdb64cbd54e427b 100644 (file)
--- a/openpower/isatables/RM-1P-2S1D.csv
+++ b/openpower/isatables/RM-1P-2S1D.csv
@@ -1,93 +1,93 @@
-insn,Ptype,Etype,0,1,2,3
-crnor,1P,EXTRA3,d:BT,s:BA,s:BB,
-crandc,1P,EXTRA3,d:BT,s:BA,s:BB,
-crxor,1P,EXTRA3,d:BT,s:BA,s:BB,
-crnand,1P,EXTRA3,d:BT,s:BA,s:BB,
-crand,1P,EXTRA3,d:BT,s:BA,s:BB,
-creqv,1P,EXTRA3,d:BT,s:BA,s:BB,
-crorc,1P,EXTRA3,d:BT,s:BA,s:BB,
-cror,1P,EXTRA3,d:BT,s:BA,s:BB,
-cmp,1P,EXTRA3,d:BF,s:RA,s:RB,
-cmpl,1P,EXTRA3,d:BF,s:RA,s:RB,
-cmprb,1P,EXTRA3,d:BF,s:RA,s:RB,
-cmpeqb,1P,EXTRA3,d:BF,s:RA,s:RB,
-0/0=fcmpu,1P,EXTRA3,TODO,,,
-1/0=fcmpo,1P,EXTRA3,TODO,,,
-4/0=ftdiv,1P,EXTRA3,TODO,,,
-bpermd,1P,EXTRA3,d:RA,s:RS,s:RB,
-modud,1P,EXTRA3,d:RT,s:RA,s:RB,
-moduw,1P,EXTRA3,d:RT,s:RA,s:RB,
-cmpb,1P,EXTRA3,d:RA,s:RS,s:RB,
-modsd,1P,EXTRA3,d:RT,s:RA,s:RB,
-modsw,1P,EXTRA3,d:RT,s:RA,s:RB,
-rlwnm,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,
-rldcl,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,
-rldcr,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,
-subfc,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-mulhdu,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-addc,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-mulhwu,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-slw,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,
-sld,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,
-and,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,
-subf,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-andc,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,
-mulhd,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-mulhw,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-nor,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,
-subfe,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-adde,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-mulld,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-mullw,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-add,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-eqv,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,
-xor,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,
-divdeu,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-divweu,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-orc,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,
-divde,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-divwe,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-or,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,
-divdu,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-divwu,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-nand,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,
-divd,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-divw,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-subfco,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-mulhdu,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-addco,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-mulhwu,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-srw,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,
-srd,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,
-subfo,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-mulhd,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-mulhw,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-subfeo,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-addeo,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-mulldo,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-mullwo,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-addo,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-sraw,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,
-srad,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,
-divdeuo,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-divweuo,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-divdeo,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-divweo,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-divduo,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-divwuo,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-divdo,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-divwo,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,
-rlwimi,1P,EXTRA3,"d:RA,d:CR0",s:RA,s:RS,
-rldimi,1P,EXTRA3,"d:RA,d:CR0",s:RA,s:RS,
-rldimi,1P,EXTRA3,"d:RA,d:CR0",s:RA,s:RS,
-fdivs,1P,EXTRA3,TODO,,,
-fsubs,1P,EXTRA3,TODO,,,
-fadds,1P,EXTRA3,TODO,,,
-fmuls,1P,EXTRA3,TODO,,,
-fdiv,1P,EXTRA3,TODO,,,
-fsub,1P,EXTRA3,TODO,,,
-fadd,1P,EXTRA3,TODO,,,
-fmul,1P,EXTRA3,TODO,,,
-26/6=fmrgow,1P,EXTRA3,TODO,,,
-30/6=fmrgew,1P,EXTRA3,TODO,,,
-0/8=fcpsgn,1P,EXTRA3,TODO,,,
+insn,Ptype,Etype,0,1,2,3,in1,in2,in3,out,CR in,CR out
+crnor,1P,EXTRA3,d:BT,s:BA,s:BB,,NONE,NONE,NONE,NONE,BA_BB,BT
+crandc,1P,EXTRA3,d:BT,s:BA,s:BB,,NONE,NONE,NONE,NONE,BA_BB,BT
+crxor,1P,EXTRA3,d:BT,s:BA,s:BB,,NONE,NONE,NONE,NONE,BA_BB,BT
+crnand,1P,EXTRA3,d:BT,s:BA,s:BB,,NONE,NONE,NONE,NONE,BA_BB,BT
+crand,1P,EXTRA3,d:BT,s:BA,s:BB,,NONE,NONE,NONE,NONE,BA_BB,BT
+creqv,1P,EXTRA3,d:BT,s:BA,s:BB,,NONE,NONE,NONE,NONE,BA_BB,BT
+crorc,1P,EXTRA3,d:BT,s:BA,s:BB,,NONE,NONE,NONE,NONE,BA_BB,BT
+cror,1P,EXTRA3,d:BT,s:BA,s:BB,,NONE,NONE,NONE,NONE,BA_BB,BT
+cmp,1P,EXTRA3,d:BF,s:RA,s:RB,,RA,RB,NONE,NONE,NONE,BF
+cmpl,1P,EXTRA3,d:BF,s:RA,s:RB,,RA,RB,NONE,NONE,NONE,BF
+cmprb,1P,EXTRA3,d:BF,s:RA,s:RB,,RA,RB,NONE,NONE,NONE,BF
+cmpeqb,1P,EXTRA3,d:BF,s:RA,s:RB,,RA,RB,NONE,NONE,NONE,BF
+0/0=fcmpu,1P,EXTRA3,TODO,,,,FRA,FRB,NONE,NONE,0,1
+1/0=fcmpo,1P,EXTRA3,TODO,,,,FRA,FRB,NONE,NONE,0,1
+4/0=ftdiv,1P,EXTRA3,TODO,,,,FRA,FRB,NONE,NONE,0,1
+bpermd,1P,EXTRA3,d:RA,s:RS,s:RB,,RS,RB,NONE,RA,NONE,NONE
+modud,1P,EXTRA3,d:RT,s:RA,s:RB,,RA,RB,NONE,RT,NONE,NONE
+moduw,1P,EXTRA3,d:RT,s:RA,s:RB,,RA,RB,NONE,RT,NONE,NONE
+cmpb,1P,EXTRA3,d:RA,s:RS,s:RB,,RS,RB,NONE,RA,NONE,NONE
+modsd,1P,EXTRA3,d:RT,s:RA,s:RB,,RA,RB,NONE,RT,NONE,NONE
+modsw,1P,EXTRA3,d:RT,s:RA,s:RB,,RA,RB,NONE,RT,NONE,NONE
+rlwnm,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,,NONE,RB,RS,RA,NONE,CR0
+rldcl,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,,NONE,RB,RS,RA,NONE,CR0
+rldcr,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,,NONE,RB,RS,RA,NONE,CR0
+subfc,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+mulhdu,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+addc,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+mulhwu,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+slw,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,,NONE,RB,RS,RA,NONE,CR0
+sld,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,,NONE,RB,RS,RA,NONE,CR0
+and,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,,RS,RB,NONE,RA,NONE,CR0
+subf,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+andc,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,,RS,RB,NONE,RA,NONE,CR0
+mulhd,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+mulhw,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+nor,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,,RS,RB,NONE,RA,NONE,CR0
+subfe,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+adde,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+mulld,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+mullw,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+add,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+eqv,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,,RS,RB,NONE,RA,NONE,CR0
+xor,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,,RS,RB,NONE,RA,NONE,CR0
+divdeu,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+divweu,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+orc,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,,RS,RB,NONE,RA,NONE,CR0
+divde,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+divwe,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+or,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,,RS,RB,NONE,RA,NONE,CR0
+divdu,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+divwu,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+nand,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,,RS,RB,NONE,RA,NONE,CR0
+divd,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+divw,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+subfco,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+mulhdu,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+addco,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+mulhwu,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+srw,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,,NONE,RB,RS,RA,NONE,CR0
+srd,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,,NONE,RB,RS,RA,NONE,CR0
+subfo,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+mulhd,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+mulhw,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+subfeo,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+addeo,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+mulldo,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+mullwo,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+addo,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+sraw,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,,NONE,RB,RS,RA,NONE,CR0
+srad,1P,EXTRA3,"d:RA,d:CR0",s:RB,s:RS,,NONE,RB,RS,RA,NONE,CR0
+divdeuo,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+divweuo,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+divdeo,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+divweo,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+divduo,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+divwuo,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+divdo,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+divwo,1P,EXTRA3,"d:RT,d:CR0",s:RA,s:RB,,RA,RB,NONE,RT,NONE,CR0
+rlwimi,1P,EXTRA3,"d:RA,d:CR0",s:RA,s:RS,,RA,,RS,RA,NONE,CR0
+rldimi,1P,EXTRA3,"d:RA,d:CR0",s:RA,s:RS,,RA,,RS,RA,NONE,CR0
+rldimi,1P,EXTRA3,"d:RA,d:CR0",s:RA,s:RS,,RA,,RS,RA,NONE,CR0
+fdivs,1P,EXTRA3,TODO,,,,FRA,FRB,NONE,FRT,0,0
+fsubs,1P,EXTRA3,TODO,,,,FRA,FRB,NONE,FRT,0,0
+fadds,1P,EXTRA3,TODO,,,,FRA,FRB,NONE,FRT,0,0
+fmuls,1P,EXTRA3,TODO,,,,FRA,NONE,FRC,FRT,0,0
+fdiv,1P,EXTRA3,TODO,,,,FRA,FRB,NONE,FRT,0,0
+fsub,1P,EXTRA3,TODO,,,,FRA,FRB,NONE,FRT,0,0
+fadd,1P,EXTRA3,TODO,,,,FRA,FRB,NONE,FRT,0,0
+fmul,1P,EXTRA3,TODO,,,,FRA,NONE,FRC,FRT,0,0
+26/6=fmrgow,1P,EXTRA3,TODO,,,,FRA,FRB,NONE,FRT,0,0
+30/6=fmrgew,1P,EXTRA3,TODO,,,,FRA,FRB,NONE,FRT,0,0
+0/8=fcpsgn,1P,EXTRA3,TODO,,,,FRA,FRB,NONE,FRT,0,0

diff --git a/openpower/isatables/RM-1P-3S1D.csv b/openpower/isatables/RM-1P-3S1D.csv
index fe09c9e9a93c697d749c5c98975312b4c092cf66..d2a2f9233319ff3eff3008f0fa2c07111ee163ea 100644 (file)
--- a/openpower/isatables/RM-1P-3S1D.csv
+++ b/openpower/isatables/RM-1P-3S1D.csv
@@ -1,42 +1,42 @@
-insn,Ptype,Etype,0,1,2,3
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC
-fmsubs,1P,EXTRA2,"d:FRT,d:CR1",s:FRA,s:FRB,s:FRC
-fmadds,1P,EXTRA2,"d:FRT,d:CR1",s:FRA,s:FRB,s:FRC
-fnmsubs,1P,EXTRA2,"d:FRT,d:CR1",s:FRA,s:FRB,s:FRC
-fnmadds,1P,EXTRA2,"d:FRT,d:CR1",s:FRA,s:FRB,s:FRC
-fsel,1P,EXTRA2,"d:FRT,d:CR1",s:FRA,s:FRB,s:FRC
-fmsub,1P,EXTRA2,"d:FRT,d:CR1",s:FRA,s:FRB,s:FRC
-fmadd,1P,EXTRA2,"d:FRT,d:CR1",s:FRA,s:FRB,s:FRC
-fnmsub,1P,EXTRA2,"d:FRT,d:CR1",s:FRA,s:FRB,s:FRC
-fnmadd,1P,EXTRA2,"d:FRT,d:CR1",s:FRA,s:FRB,s:FRC
+insn,Ptype,Etype,0,1,2,3,in1,in2,in3,out,CR in,CR out
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,NONE,RT,BC,NONE
+fmsubs,1P,EXTRA2,"d:FRT,d:CR1",s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,0
+fmadds,1P,EXTRA2,"d:FRT,d:CR1",s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,0
+fnmsubs,1P,EXTRA2,"d:FRT,d:CR1",s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,0
+fnmadds,1P,EXTRA2,"d:FRT,d:CR1",s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,0
+fsel,1P,EXTRA2,"d:FRT,d:CR1",s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,0
+fmsub,1P,EXTRA2,"d:FRT,d:CR1",s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,0
+fmadd,1P,EXTRA2,"d:FRT,d:CR1",s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,0
+fnmsub,1P,EXTRA2,"d:FRT,d:CR1",s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,0
+fnmadd,1P,EXTRA2,"d:FRT,d:CR1",s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,0

diff --git a/openpower/isatables/RM-2P-1S1D.csv b/openpower/isatables/RM-2P-1S1D.csv
index 5dc965bddc5a424f737217f0b3182869b65a0024..69faa74451df4c1c0a7d944d548799ea20d66e1a 100644 (file)
--- a/openpower/isatables/RM-2P-1S1D.csv
+++ b/openpower/isatables/RM-2P-1S1D.csv
@@ -1,83 +1,83 @@
-insn,Ptype,Etype,0,1,2,3
-mcrf,2P,EXTRA3,d:BF,s:BFA,,
-2/0=mcrfs,2P,EXTRA3,TODO,,,
-1/6=mtfsb1,2P,EXTRA3,TODO,,,
-2/6=mtfsb0,2P,EXTRA3,TODO,,,
-4/6=mtfsfi,2P,EXTRA3,TODO,,,
-mfcr/mfocrf,2P,EXTRA3,d:RT,s:CR,,
-setb,2P,EXTRA3,d:RT,s:BFA,,
-cmpli,2P,EXTRA3,d:BF,s:RA,,
-cmpi,2P,EXTRA3,d:BF,s:RA,,
-neg,2P,EXTRA3,d:RT,s:RA,,
-popcntb,2P,EXTRA3,d:RA,s:RS,,
-prtyw,2P,EXTRA3,d:RA,s:RS,,
-prtyd,2P,EXTRA3,d:RA,s:RS,,
-popcntw,2P,EXTRA3,d:RA,s:RS,,
-popcntd,2P,EXTRA3,d:RA,s:RS,,
-nego,2P,EXTRA3,d:RT,s:RA,,
-addic,2P,EXTRA3,d:RT,s:RA,,
-addi,2P,EXTRA3,d:RT,s:RA,,
-addis,2P,EXTRA3,d:RT,s:RA,,
-ori,2P,EXTRA3,d:RA,s:RS,,
-oris,2P,EXTRA3,d:RA,s:RS,,
-xori,2P,EXTRA3,d:RA,s:RS,,
-xoris,2P,EXTRA3,d:RA,s:RS,,
-subfic,2P,EXTRA3,d:RT,s:RA,,
-cntlzw,2P,EXTRA3,"d:RA,d:CR0",s:RS,,
-cntlzd,2P,EXTRA3,"d:RA,d:CR0",s:RS,,
-subfze,2P,EXTRA3,"d:RT,d:CR0",s:RA,,
-addze,2P,EXTRA3,"d:RT,d:CR0",s:RA,,
-cnttzw,2P,EXTRA3,"d:RA,d:CR0",s:RS,,
-cnttzd,2P,EXTRA3,"d:RA,d:CR0",s:RS,,
-subfzeo,2P,EXTRA3,"d:RT,d:CR0",s:RA,,
-addzeo,2P,EXTRA3,"d:RT,d:CR0",s:RA,,
-extsh,2P,EXTRA3,"d:RA,d:CR0",s:RS,,
-extsb,2P,EXTRA3,"d:RA,d:CR0",s:RS,,
-extsw,2P,EXTRA3,"d:RA,d:CR0",s:RS,,
-addic.,2P,EXTRA3,"d:RT,d:CR0",s:RA,,
-rlwinm,2P,EXTRA3,"d:RA,d:CR0",s:RS,,
-andi.,2P,EXTRA3,"d:RA,d:CR0",s:RS,,
-andis.,2P,EXTRA3,"d:RA,d:CR0",s:RS,,
-mulli,2P,EXTRA3,"d:RT,d:CR0",s:RA,,
-rldicl,2P,EXTRA3,"d:RA,d:CR0",s:RS,,
-rldicl,2P,EXTRA3,"d:RA,d:CR0",s:RS,,
-rldicr,2P,EXTRA3,"d:RA,d:CR0",s:RS,,
-rldicr,2P,EXTRA3,"d:RA,d:CR0",s:RS,,
-rldic,2P,EXTRA3,"d:RA,d:CR0",s:RS,,
-rldic,2P,EXTRA3,"d:RA,d:CR0",s:RS,,
-subfme,2P,EXTRA3,"d:RT,d:CR0",s:RA,,
-addme,2P,EXTRA3,"d:RT,d:CR0",s:RA,,
-subfmeo,2P,EXTRA3,"d:RT,d:CR0",s:RA,,
-addmeo,2P,EXTRA3,"d:RT,d:CR0",s:RA,,
-srawi,2P,EXTRA3,"d:RA,d:CR0",s:RS,,
-sradi,2P,EXTRA3,"d:RA,d:CR0",s:RS,,
-sradi,2P,EXTRA3,"d:RA,d:CR0",s:RS,,
-extswsli,2P,EXTRA3,"d:RA,d:CR0",s:RS,,
-extswsli,2P,EXTRA3,"d:RA,d:CR0",s:RS,,
-fcfid[u]s,2P,EXTRA3,TODO,,,
-fsqrts,2P,EXTRA3,TODO,,,
-fres,2P,EXTRA3,TODO,,,
-frsqrtes,2P,EXTRA3,TODO,,,
-fsqrt,2P,EXTRA3,TODO,,,
-fre,2P,EXTRA3,TODO,,,
-frsqrte,2P,EXTRA3,TODO,,,
-18/7=mffsfamily,2P,EXTRA3,TODO,,,
-1/8=fneg,2P,EXTRA3,TODO,,,
-2/8=fmr,2P,EXTRA3,TODO,,,
-4/8=fnabs,2P,EXTRA3,TODO,,,
-8/8=fabs,2P,EXTRA3,TODO,,,
-12/8=frin,2P,EXTRA3,TODO,,,
-13/8=friz,2P,EXTRA3,TODO,,,
-14/8=frip,2P,EXTRA3,TODO,,,
-15/8=frim,2P,EXTRA3,TODO,,,
-0/12=frsp,2P,EXTRA3,TODO,,,
-0/14=fctiw,2P,EXTRA3,TODO,,,
-4/14=fctiwu,2P,EXTRA3,TODO,,,
-25/14=fctid,2P,EXTRA3,TODO,,,
-26/14=fcfid,2P,EXTRA3,TODO,,,
-29/14=fctidu,2P,EXTRA3,TODO,,,
-30/14=fcfidu,2P,EXTRA3,TODO,,,
-0/15=fctiwz,2P,EXTRA3,TODO,,,
-4/15=fctiwuz,2P,EXTRA3,TODO,,,
-25/15=fctidz,2P,EXTRA3,TODO,,,
-29/15=fctiduz,2P,EXTRA3,TODO,,,
+insn,Ptype,Etype,0,1,2,3,in1,in2,in3,out,CR in,CR out
+mcrf,2P,EXTRA3,d:BF,s:BFA,,,NONE,NONE,NONE,NONE,BFA,BF
+2/0=mcrfs,2P,EXTRA3,TODO,,,,NONE,NONE,NONE,NONE,0,1
+1/6=mtfsb1,2P,EXTRA3,TODO,,,,NONE,NONE,NONE,NONE,0,0
+2/6=mtfsb0,2P,EXTRA3,TODO,,,,NONE,NONE,NONE,NONE,0,0
+4/6=mtfsfi,2P,EXTRA3,TODO,,,,NONE,NONE,NONE,NONE,0,0
+mfcr/mfocrf,2P,EXTRA3,d:RT,s:CR,,,NONE,NONE,NONE,RT,WHOLE_REG,NONE
+setb,2P,EXTRA3,d:RT,s:BFA,,,NONE,NONE,NONE,RT,BFA,NONE
+cmpli,2P,EXTRA3,d:BF,s:RA,,,RA,,NONE,NONE,NONE,BF
+cmpi,2P,EXTRA3,d:BF,s:RA,,,RA,,NONE,NONE,NONE,BF
+neg,2P,EXTRA3,d:RT,s:RA,,,RA,NONE,NONE,RT,NONE,NONE
+popcntb,2P,EXTRA3,d:RA,s:RS,,,RS,NONE,NONE,RA,NONE,NONE
+prtyw,2P,EXTRA3,d:RA,s:RS,,,RS,NONE,NONE,RA,NONE,NONE
+prtyd,2P,EXTRA3,d:RA,s:RS,,,RS,NONE,NONE,RA,NONE,NONE
+popcntw,2P,EXTRA3,d:RA,s:RS,,,RS,NONE,NONE,RA,NONE,NONE
+popcntd,2P,EXTRA3,d:RA,s:RS,,,RS,NONE,NONE,RA,NONE,NONE
+nego,2P,EXTRA3,d:RT,s:RA,,,RA,NONE,NONE,RT,NONE,NONE
+addic,2P,EXTRA3,d:RT,s:RA,,,RA,,NONE,RT,NONE,NONE
+addi,2P,EXTRA3,d:RT,s:RA,,,RA_OR_ZERO,,NONE,RT,NONE,NONE
+addis,2P,EXTRA3,d:RT,s:RA,,,RA_OR_ZERO,,NONE,RT,NONE,NONE
+ori,2P,EXTRA3,d:RA,s:RS,,,RS,,NONE,RA,NONE,NONE
+oris,2P,EXTRA3,d:RA,s:RS,,,RS,,NONE,RA,NONE,NONE
+xori,2P,EXTRA3,d:RA,s:RS,,,RS,,NONE,RA,NONE,NONE
+xoris,2P,EXTRA3,d:RA,s:RS,,,RS,,NONE,RA,NONE,NONE
+subfic,2P,EXTRA3,d:RT,s:RA,,,RA,,NONE,RT,NONE,NONE
+cntlzw,2P,EXTRA3,"d:RA,d:CR0",s:RS,,,RS,NONE,NONE,RA,NONE,CR0
+cntlzd,2P,EXTRA3,"d:RA,d:CR0",s:RS,,,RS,NONE,NONE,RA,NONE,CR0
+subfze,2P,EXTRA3,"d:RT,d:CR0",s:RA,,,RA,NONE,NONE,RT,NONE,CR0
+addze,2P,EXTRA3,"d:RT,d:CR0",s:RA,,,RA,NONE,NONE,RT,NONE,CR0
+cnttzw,2P,EXTRA3,"d:RA,d:CR0",s:RS,,,RS,NONE,NONE,RA,NONE,CR0
+cnttzd,2P,EXTRA3,"d:RA,d:CR0",s:RS,,,RS,NONE,NONE,RA,NONE,CR0
+subfzeo,2P,EXTRA3,"d:RT,d:CR0",s:RA,,,RA,NONE,NONE,RT,NONE,CR0
+addzeo,2P,EXTRA3,"d:RT,d:CR0",s:RA,,,RA,NONE,NONE,RT,NONE,CR0
+extsh,2P,EXTRA3,"d:RA,d:CR0",s:RS,,,RS,NONE,NONE,RA,NONE,CR0
+extsb,2P,EXTRA3,"d:RA,d:CR0",s:RS,,,RS,NONE,NONE,RA,NONE,CR0
+extsw,2P,EXTRA3,"d:RA,d:CR0",s:RS,,,RS,NONE,NONE,RA,NONE,CR0
+addic.,2P,EXTRA3,"d:RT,d:CR0",s:RA,,,RA,,NONE,RT,NONE,CR0
+rlwinm,2P,EXTRA3,"d:RA,d:CR0",s:RS,,,NONE,,RS,RA,NONE,CR0
+andi.,2P,EXTRA3,"d:RA,d:CR0",s:RS,,,RS,,NONE,RA,NONE,CR0
+andis.,2P,EXTRA3,"d:RA,d:CR0",s:RS,,,RS,,NONE,RA,NONE,CR0
+mulli,2P,EXTRA3,"d:RT,d:CR0",s:RA,,,RA,,NONE,RT,NONE,CR0
+rldicl,2P,EXTRA3,"d:RA,d:CR0",s:RS,,,NONE,,RS,RA,NONE,CR0
+rldicl,2P,EXTRA3,"d:RA,d:CR0",s:RS,,,NONE,,RS,RA,NONE,CR0
+rldicr,2P,EXTRA3,"d:RA,d:CR0",s:RS,,,NONE,,RS,RA,NONE,CR0
+rldicr,2P,EXTRA3,"d:RA,d:CR0",s:RS,,,NONE,,RS,RA,NONE,CR0
+rldic,2P,EXTRA3,"d:RA,d:CR0",s:RS,,,NONE,,RS,RA,NONE,CR0
+rldic,2P,EXTRA3,"d:RA,d:CR0",s:RS,,,NONE,,RS,RA,NONE,CR0
+subfme,2P,EXTRA3,"d:RT,d:CR0",s:RA,,,RA,,NONE,RT,NONE,CR0
+addme,2P,EXTRA3,"d:RT,d:CR0",s:RA,,,RA,,NONE,RT,NONE,CR0
+subfmeo,2P,EXTRA3,"d:RT,d:CR0",s:RA,,,RA,,NONE,RT,NONE,CR0
+addmeo,2P,EXTRA3,"d:RT,d:CR0",s:RA,,,RA,,NONE,RT,NONE,CR0
+srawi,2P,EXTRA3,"d:RA,d:CR0",s:RS,,,NONE,,RS,RA,NONE,CR0
+sradi,2P,EXTRA3,"d:RA,d:CR0",s:RS,,,NONE,,RS,RA,NONE,CR0
+sradi,2P,EXTRA3,"d:RA,d:CR0",s:RS,,,NONE,,RS,RA,NONE,CR0
+extswsli,2P,EXTRA3,"d:RA,d:CR0",s:RS,,,NONE,,RS,RA,NONE,CR0
+extswsli,2P,EXTRA3,"d:RA,d:CR0",s:RS,,,NONE,,RS,RA,NONE,CR0
+fcfid[u]s,2P,EXTRA3,TODO,,,,NONE,FRB,NONE,FRT,0,0
+fsqrts,2P,EXTRA3,TODO,,,,NONE,FRB,NONE,FRT,0,0
+fres,2P,EXTRA3,TODO,,,,NONE,FRB,NONE,FRT,0,0
+frsqrtes,2P,EXTRA3,TODO,,,,NONE,FRB,NONE,FRT,0,0
+fsqrt,2P,EXTRA3,TODO,,,,NONE,FRB,NONE,FRT,0,0
+fre,2P,EXTRA3,TODO,,,,NONE,FRB,NONE,FRT,0,0
+frsqrte,2P,EXTRA3,TODO,,,,NONE,FRB,NONE,FRT,0,0
+18/7=mffsfamily,2P,EXTRA3,TODO,,,,NONE,FRB,NONE,FRT,0,0
+1/8=fneg,2P,EXTRA3,TODO,,,,NONE,FRB,NONE,FRT,0,0
+2/8=fmr,2P,EXTRA3,TODO,,,,NONE,FRB,NONE,FRT,0,0
+4/8=fnabs,2P,EXTRA3,TODO,,,,NONE,FRB,NONE,FRT,0,0
+8/8=fabs,2P,EXTRA3,TODO,,,,NONE,FRB,NONE,FRT,0,0
+12/8=frin,2P,EXTRA3,TODO,,,,NONE,FRB,NONE,FRT,0,0
+13/8=friz,2P,EXTRA3,TODO,,,,NONE,FRB,NONE,FRT,0,0
+14/8=frip,2P,EXTRA3,TODO,,,,NONE,FRB,NONE,FRT,0,0
+15/8=frim,2P,EXTRA3,TODO,,,,NONE,FRB,NONE,FRT,0,0
+0/12=frsp,2P,EXTRA3,TODO,,,,NONE,FRB,NONE,FRT,0,0
+0/14=fctiw,2P,EXTRA3,TODO,,,,NONE,FRB,NONE,FRT,0,0
+4/14=fctiwu,2P,EXTRA3,TODO,,,,NONE,FRB,NONE,FRT,0,0
+25/14=fctid,2P,EXTRA3,TODO,,,,NONE,FRB,NONE,FRT,0,0
+26/14=fcfid,2P,EXTRA3,TODO,,,,NONE,FRB,NONE,FRT,0,0
+29/14=fctidu,2P,EXTRA3,TODO,,,,NONE,FRB,NONE,FRT,0,0
+30/14=fcfidu,2P,EXTRA3,TODO,,,,NONE,FRB,NONE,FRT,0,0
+0/15=fctiwz,2P,EXTRA3,TODO,,,,NONE,FRB,NONE,FRT,0,0
+4/15=fctiwuz,2P,EXTRA3,TODO,,,,NONE,FRB,NONE,FRT,0,0
+25/15=fctidz,2P,EXTRA3,TODO,,,,NONE,FRB,NONE,FRT,0,0
+29/15=fctiduz,2P,EXTRA3,TODO,,,,NONE,FRB,NONE,FRT,0,0

diff --git a/openpower/isatables/RM-2P-2S1D.csv b/openpower/isatables/RM-2P-2S1D.csv
index 7b16d379f0dc83371c1149f9cf056fc6c88ebb7e..cc3fb996f801714f0cf87c306d7397f5847bd849 100644 (file)
--- a/openpower/isatables/RM-2P-2S1D.csv
+++ b/openpower/isatables/RM-2P-2S1D.csv
@@ -1,4 +1,4 @@
-insn,Ptype,Etype,0,1,2,3
-mtcrf/mtocrf,2P,EXTRA2,d:CR,s:RS,s:CR,
-5/0=ftsqrt,2P,EXTRA2,TODO,,,
-22/7=mtfsf,2P,EXTRA2,TODO,,,
+insn,Ptype,Etype,0,1,2,3,in1,in2,in3,out,CR in,CR out
+mtcrf/mtocrf,2P,EXTRA2,d:CR,s:RS,s:CR,,RS,NONE,NONE,NONE,WHOLE_REG,WHOLE_REG
+5/0=ftsqrt,2P,EXTRA2,TODO,,,,NONE,FRB,NONE,NONE,0,1
+22/7=mtfsf,2P,EXTRA2,TODO,,,,NONE,FRB,NONE,NONE,0,0

diff --git a/openpower/sv_analysis.py b/openpower/sv_analysis.py
index 7230b055ac50cb6d34ca840e066458d03f04c409..5c1b646c4edd3b1543de8d2f4867e3b924163547 100644 (file)
--- a/openpower/sv_analysis.py
+++ b/openpower/sv_analysis.py
@@ -500,14 +500,14 @@ def process_csvs():
                     res['3'] = 's:FRC' # FRC: Rsrc3_EXTRA2
 
             # add to svp64 csvs
-            for k in ['in1', 'in2', 'in3', 'out', 'CR in', 'CR out']:
-                del res[k]
+            #for k in ['in1', 'in2', 'in3', 'out', 'CR in', 'CR out']:
+            #    del res[k]
             #if res['0'] != 'TODO':
             svp64[value].append(res)
 
     # now write out the csv files
     for value, csv in svp64.items():
-        csvcols = ['insn', 'Ptype', 'Etype', '0', '1', '2', '3']
+        #csvcols = ['insn', 'Ptype', 'Etype', '0', '1', '2', '3']
         write_csv("%s.csv" % value, csv, csvcols)
 
 if __name__ == '__main__':