remove NONE, make tables shorter

diff --git a/openpower/isatables/LDSTRM-2P-1S1D.csv b/openpower/isatables/LDSTRM-2P-1S1D.csv
index 02e15dc0c6a4519e503cceb4a570ce273fabfe2a..a296194146a924c2a99a9623ef328ed47fda9059 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,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
+lwz,2P,EXTRA3,d:RT,s:RA,,,RA_OR_ZERO,,,RT,,
+lbz,2P,EXTRA3,d:RT,s:RA,,,RA_OR_ZERO,,,RT,,
+lhz,2P,EXTRA3,d:RT,s:RA,,,RA_OR_ZERO,,,RT,,
+lha,2P,EXTRA3,d:RT,s:RA,,,RA_OR_ZERO,,,RT,,
+ld,2P,EXTRA3,d:RT,s:RA,,,RA_OR_ZERO,,,RT,,
+lwa,2P,EXTRA3,d:RT,s:RA,,,RA_OR_ZERO,,,RT,,

diff --git a/openpower/isatables/LDSTRM-2P-1S2D.csv b/openpower/isatables/LDSTRM-2P-1S2D.csv
index 823b06907a0422a02a22a08c587afae89f26dc73..335113752b9b55e3459d47f700352dba3639f121 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,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
+lwzu,2P,EXTRA2,d:RT,d:RA,s:RA,,RA_OR_ZERO,,,RT,,
+lbzu,2P,EXTRA2,d:RT,d:RA,s:RA,,RA_OR_ZERO,,,RT,,
+lhzu,2P,EXTRA2,d:RT,d:RA,s:RA,,RA_OR_ZERO,,,RT,,
+lhau,2P,EXTRA2,d:RT,d:RA,s:RA,,RA_OR_ZERO,,,RT,,
+ldu,2P,EXTRA2,d:RT,d:RA,s:RA,,RA_OR_ZERO,,,RT,,

diff --git a/openpower/isatables/LDSTRM-2P-2S.csv b/openpower/isatables/LDSTRM-2P-2S.csv
index 6724a13fc75ec5e9dee5c9be3c4517801ddb6814..d04ca5881233949f24c115b51c093693d46bb75e 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,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
+stw,2P,EXTRA3,d:RS,s:RA,,,RA_OR_ZERO,,RS,,,
+stb,2P,EXTRA3,d:RS,s:RA,,,RA_OR_ZERO,,RS,,,
+sth,2P,EXTRA3,d:RS,s:RA,,,RA_OR_ZERO,,RS,,,
+std,2P,EXTRA3,d:RS,s:RA,,,RA_OR_ZERO,,RS,,,

diff --git a/openpower/isatables/LDSTRM-2P-2S1D.csv b/openpower/isatables/LDSTRM-2P-2S1D.csv
index 191f066eb03c5110a53da56e781fe786dda5ce40..59b64a11c01cf6b2c8fd0e6cb987927a8981089e 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,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
+lwarx,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,,RT,,
+ldx,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,,RT,,
+lwzx,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,,RT,,
+lbarx,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,,RT,,
+ldarx,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,,RT,,
+lbzx,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,,RT,,
+lharx,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,,RT,,
+lhzx,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,,RT,,
+lwax,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,,RT,,
+lhax,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,,RT,,
+ldbrx,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,,RT,,
+lwbrx,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,,RT,,
+lwzcix,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,,RT,,
+lhbrx,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,,RT,,
+lhzcix,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,,RT,,
+lbzcix,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,,RT,,
+ldcix,2P,EXTRA2,d:RT,s:RA,s:RB,,RA_OR_ZERO,RB,,RT,,
+stwu,2P,EXTRA2,d:RA,s:RS,s:RA,,RA_OR_ZERO,,RS,,,
+stbu,2P,EXTRA2,d:RA,s:RS,s:RA,,RA_OR_ZERO,,RS,,,
+sthu,2P,EXTRA2,d:RA,s:RS,s:RA,,RA_OR_ZERO,,RS,,,
+stdu,2P,EXTRA2,d:RA,s:RS,s:RA,,RA_OR_ZERO,,RS,,,
+ldux,2P,EXTRA2,d:RT,d:RA,s:RB,,RA_OR_ZERO,RB,,RT,,
+lwzux,2P,EXTRA2,d:RT,d:RA,s:RB,,RA_OR_ZERO,RB,,RT,,
+lbzux,2P,EXTRA2,d:RT,d:RA,s:RB,,RA_OR_ZERO,RB,,RT,,
+lhzux,2P,EXTRA2,d:RT,d:RA,s:RB,,RA_OR_ZERO,RB,,RT,,
+lwaux,2P,EXTRA2,d:RT,d:RA,s:RB,,RA_OR_ZERO,RB,,RT,,
+lhaux,2P,EXTRA2,d:RT,d:RA,s:RB,,RA_OR_ZERO,RB,,RT,,
+stdux,2P,EXTRA2,d:RA,"s:RS,s:RA",s:RB,,RA_OR_ZERO,RB,RS,,,
+stwux,2P,EXTRA2,d:RA,"s:RS,s:RA",s:RB,,RA_OR_ZERO,RB,RS,,,
+stbux,2P,EXTRA2,d:RA,"s:RS,s:RA",s:RB,,RA_OR_ZERO,RB,RS,,,
+sthux,2P,EXTRA2,d:RA,"s:RS,s:RA",s:RB,,RA_OR_ZERO,RB,RS,,,

diff --git a/openpower/isatables/LDSTRM-2P-3S.csv b/openpower/isatables/LDSTRM-2P-3S.csv
index a319ebab7514f5324abdc5455a1434392bcc4b13..fe5c67cc620382a308150707c563b04e9eb6de5b 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,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
+stdx,2P,EXTRA2,s:RS,s:RA,s:RB,,RA_OR_ZERO,RB,RS,,,
+stwx,2P,EXTRA2,s:RS,s:RA,s:RB,,RA_OR_ZERO,RB,RS,,,
+stbx,2P,EXTRA2,s:RS,s:RA,s:RB,,RA_OR_ZERO,RB,RS,,,
+sthx,2P,EXTRA2,s:RS,s:RA,s:RB,,RA_OR_ZERO,RB,RS,,,
+stdbrx,2P,EXTRA2,s:RS,s:RA,s:RB,,RA_OR_ZERO,RB,RS,,,
+stwbrx,2P,EXTRA2,s:RS,s:RA,s:RB,,RA_OR_ZERO,RB,RS,,,
+stwcix,2P,EXTRA2,s:RS,s:RA,s:RB,,RA_OR_ZERO,RB,RS,,,
+sthbrx,2P,EXTRA2,s:RS,s:RA,s:RB,,RA_OR_ZERO,RB,RS,,,
+sthcix,2P,EXTRA2,s:RS,s:RA,s:RB,,RA_OR_ZERO,RB,RS,,,
+stbcix,2P,EXTRA2,s:RS,s:RA,s:RB,,RA_OR_ZERO,RB,RS,,,
+stdcix,2P,EXTRA2,s:RS,s:RA,s:RB,,RA_OR_ZERO,RB,RS,,,
+stwcx,2P,EXTRA2,"s:RS,d:CR0",s:RA,s:RB,,RA_OR_ZERO,RB,RS,,,CR0
+stdcx,2P,EXTRA2,"s:RS,d:CR0",s:RA,s:RB,,RA_OR_ZERO,RB,RS,,,CR0
+stbcx,2P,EXTRA2,"s:RS,d:CR0",s:RA,s:RB,,RA_OR_ZERO,RB,RS,,,CR0
+sthcx,2P,EXTRA2,"s:RS,d:CR0",s:RA,s:RB,,RA_OR_ZERO,RB,RS,,,CR0

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

diff --git a/openpower/isatables/RM-1P-3S1D.csv b/openpower/isatables/RM-1P-3S1D.csv
index d2a2f9233319ff3eff3008f0fa2c07111ee163ea..f055b8e1c33500b8e6ea28ed1144a52c8adcfec0 100644 (file)
--- a/openpower/isatables/RM-1P-3S1D.csv
+++ b/openpower/isatables/RM-1P-3S1D.csv
@@ -1,36 +1,36 @@
 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
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
+isel,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,,RT,BC,
 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

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

diff --git a/openpower/isatables/RM-2P-2S1D.csv b/openpower/isatables/RM-2P-2S1D.csv
index cc3fb996f801714f0cf87c306d7397f5847bd849..fd664e20d531c7e868b46cf17fbc93202e47b508 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,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
+mtcrf/mtocrf,2P,EXTRA2,d:CR,s:RS,s:CR,,RS,,,,WHOLE_REG,WHOLE_REG
+5/0=ftsqrt,2P,EXTRA2,TODO,,,,,FRB,,,0,1
+22/7=mtfsf,2P,EXTRA2,TODO,,,,,FRB,,,0,0

diff --git a/openpower/sv_analysis.py b/openpower/sv_analysis.py
index 95593856426fc58b4d2d396abef061b6519bc48f..21d5f0702e0db93d4f6264119dce6bb3ce78c3ac 100644 (file)
--- a/openpower/sv_analysis.py
+++ b/openpower/sv_analysis.py
@@ -510,6 +510,9 @@ def process_csvs():
             #for k in ['in1', 'in2', 'in3', 'out', 'CR in', 'CR out']:
             #    del res[k]
             #if res['0'] != 'TODO':
+            for k in res:
+                if res[k] == 'NONE':
+                    res[k] = ''
             svp64[value].append(res)
 
     print ('')