From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Sat, 17 Sep 2022 18:23:25 +0000 (+0100)
Subject: add a "SM" column into RM*.csv (and LDSTRM*.csv) identifying if MASK_SRC
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e56281c5ce6df1641bf92b274ea30f10f2a76224;p=openpower-isa.git

add a "SM" column into RM*.csv (and LDSTRM*.csv) identifying if MASK_SRC
is active.  this makes disassembly much easier, no need to check RM type
or count the number of registers
---

diff --git a/openpower/isatables/LDSTRM-2P-1S1D.csv b/openpower/isatables/LDSTRM-2P-1S1D.csv
index e5e12547..19dfb8b1 100644
--- a/openpower/isatables/LDSTRM-2P-1S1D.csv
+++ b/openpower/isatables/LDSTRM-2P-1S1D.csv
@@ -1,9 +1,9 @@
-insn,mode,CONDITIONS,Ptype,Etype,0,1,2,3,in1,in2,in3,out,CR in,CR out,out2
-lwz,LDST_IMM,,2P,EXTRA3,d:RT,s:RA,0,0,RA_OR_ZERO,0,0,RT,0,0,0
-lbz,LDST_IMM,,2P,EXTRA3,d:RT,s:RA,0,0,RA_OR_ZERO,0,0,RT,0,0,0
-lhz,LDST_IMM,,2P,EXTRA3,d:RT,s:RA,0,0,RA_OR_ZERO,0,0,RT,0,0,0
-lha,LDST_IMM,,2P,EXTRA3,d:RT,s:RA,0,0,RA_OR_ZERO,0,0,RT,0,0,0
-lfs,LDST_IMM,,2P,EXTRA3,d:FRT,s:RA,0,0,RA_OR_ZERO,0,0,FRT,0,0,0
-lfd,LDST_IMM,,2P,EXTRA3,d:FRT,s:RA,0,0,RA_OR_ZERO,0,0,FRT,0,0,0
-ld,LDST_IMM,,2P,EXTRA3,d:RT,s:RA,0,0,RA_OR_ZERO,0,0,RT,0,0,0
-lwa,LDST_IMM,,2P,EXTRA3,d:RT,s:RA,0,0,RA_OR_ZERO,0,0,RT,0,0,0
+insn,mode,CONDITIONS,Ptype,Etype,SM,0,1,2,3,in1,in2,in3,out,CR in,CR out,out2
+lwz,LDST_IMM,,2P,EXTRA3,0,d:RT,s:RA,0,0,RA_OR_ZERO,0,0,RT,0,0,0
+lbz,LDST_IMM,,2P,EXTRA3,0,d:RT,s:RA,0,0,RA_OR_ZERO,0,0,RT,0,0,0
+lhz,LDST_IMM,,2P,EXTRA3,0,d:RT,s:RA,0,0,RA_OR_ZERO,0,0,RT,0,0,0
+lha,LDST_IMM,,2P,EXTRA3,0,d:RT,s:RA,0,0,RA_OR_ZERO,0,0,RT,0,0,0
+lfs,LDST_IMM,,2P,EXTRA3,0,d:FRT,s:RA,0,0,RA_OR_ZERO,0,0,FRT,0,0,0
+lfd,LDST_IMM,,2P,EXTRA3,0,d:FRT,s:RA,0,0,RA_OR_ZERO,0,0,FRT,0,0,0
+ld,LDST_IMM,,2P,EXTRA3,0,d:RT,s:RA,0,0,RA_OR_ZERO,0,0,RT,0,0,0
+lwa,LDST_IMM,,2P,EXTRA3,0,d:RT,s:RA,0,0,RA_OR_ZERO,0,0,RT,0,0,0
diff --git a/openpower/isatables/LDSTRM-2P-1S2D.csv b/openpower/isatables/LDSTRM-2P-1S2D.csv
index 173c6b4b..79d580f8 100644
--- a/openpower/isatables/LDSTRM-2P-1S2D.csv
+++ b/openpower/isatables/LDSTRM-2P-1S2D.csv
@@ -1,8 +1,8 @@
-insn,mode,CONDITIONS,Ptype,Etype,0,1,2,3,in1,in2,in3,out,CR in,CR out,out2
-lwzu,LDST_IMM,,2P,EXTRA2,d:RT,d:RA,s:RA,0,RA_OR_ZERO,0,0,RT,0,0,RA
-lbzu,LDST_IMM,,2P,EXTRA2,d:RT,d:RA,s:RA,0,RA_OR_ZERO,0,0,RT,0,0,RA
-lhzu,LDST_IMM,,2P,EXTRA2,d:RT,d:RA,s:RA,0,RA_OR_ZERO,0,0,RT,0,0,RA
-lhau,LDST_IMM,,2P,EXTRA2,d:RT,d:RA,s:RA,0,RA_OR_ZERO,0,0,RT,0,0,RA
-lfsu,LDST_IMM,,2P,EXTRA2,d:FRT,d:RA,s:RA,0,RA,0,0,FRT,0,0,RA
-lfdu,LDST_IMM,,2P,EXTRA2,d:FRT,d:RA,s:RA,0,RA,0,0,FRT,0,0,RA
-ldu,LDST_IMM,,2P,EXTRA2,d:RT,d:RA,s:RA,0,RA_OR_ZERO,0,0,RT,0,0,RA
+insn,mode,CONDITIONS,Ptype,Etype,SM,0,1,2,3,in1,in2,in3,out,CR in,CR out,out2
+lwzu,LDST_IMM,,2P,EXTRA2,0,d:RT,d:RA,s:RA,0,RA_OR_ZERO,0,0,RT,0,0,RA
+lbzu,LDST_IMM,,2P,EXTRA2,0,d:RT,d:RA,s:RA,0,RA_OR_ZERO,0,0,RT,0,0,RA
+lhzu,LDST_IMM,,2P,EXTRA2,0,d:RT,d:RA,s:RA,0,RA_OR_ZERO,0,0,RT,0,0,RA
+lhau,LDST_IMM,,2P,EXTRA2,0,d:RT,d:RA,s:RA,0,RA_OR_ZERO,0,0,RT,0,0,RA
+lfsu,LDST_IMM,,2P,EXTRA2,0,d:FRT,d:RA,s:RA,0,RA,0,0,FRT,0,0,RA
+lfdu,LDST_IMM,,2P,EXTRA2,0,d:FRT,d:RA,s:RA,0,RA,0,0,FRT,0,0,RA
+ldu,LDST_IMM,,2P,EXTRA2,0,d:RT,d:RA,s:RA,0,RA_OR_ZERO,0,0,RT,0,0,RA
diff --git a/openpower/isatables/LDSTRM-2P-2S.csv b/openpower/isatables/LDSTRM-2P-2S.csv
index 1b5cb48b..18971e8e 100644
--- a/openpower/isatables/LDSTRM-2P-2S.csv
+++ b/openpower/isatables/LDSTRM-2P-2S.csv
@@ -1,7 +1,7 @@
-insn,mode,CONDITIONS,Ptype,Etype,0,1,2,3,in1,in2,in3,out,CR in,CR out,out2
-stw,LDST_IMM,,2P,EXTRA3,s:RS,s:RA,0,0,RA_OR_ZERO,0,RS,0,0,0,0
-stb,LDST_IMM,,2P,EXTRA3,s:RS,s:RA,0,0,RA_OR_ZERO,0,RS,0,0,0,0
-sth,LDST_IMM,,2P,EXTRA3,s:RS,s:RA,0,0,RA_OR_ZERO,0,RS,0,0,0,0
-stfs,LDST_IMM,,2P,EXTRA3,s:FRS,s:RA,0,0,RA_OR_ZERO,0,FRS,0,0,0,0
-stfd,LDST_IMM,,2P,EXTRA3,s:FRS,s:RA,0,0,RA_OR_ZERO,0,FRS,0,0,0,0
-std,LDST_IMM,,2P,EXTRA3,s:RS,s:RA,0,0,RA_OR_ZERO,0,RS,0,0,0,0
+insn,mode,CONDITIONS,Ptype,Etype,SM,0,1,2,3,in1,in2,in3,out,CR in,CR out,out2
+stw,LDST_IMM,,2P,EXTRA3,0,s:RS,s:RA,0,0,RA_OR_ZERO,0,RS,0,0,0,0
+stb,LDST_IMM,,2P,EXTRA3,0,s:RS,s:RA,0,0,RA_OR_ZERO,0,RS,0,0,0,0
+sth,LDST_IMM,,2P,EXTRA3,0,s:RS,s:RA,0,0,RA_OR_ZERO,0,RS,0,0,0,0
+stfs,LDST_IMM,,2P,EXTRA3,0,s:FRS,s:RA,0,0,RA_OR_ZERO,0,FRS,0,0,0,0
+stfd,LDST_IMM,,2P,EXTRA3,0,s:FRS,s:RA,0,0,RA_OR_ZERO,0,FRS,0,0,0,0
+std,LDST_IMM,,2P,EXTRA3,0,s:RS,s:RA,0,0,RA_OR_ZERO,0,RS,0,0,0,0
diff --git a/openpower/isatables/LDSTRM-2P-2S1D.csv b/openpower/isatables/LDSTRM-2P-2S1D.csv
index 94353718..a525d22a 100644
--- a/openpower/isatables/LDSTRM-2P-2S1D.csv
+++ b/openpower/isatables/LDSTRM-2P-2S1D.csv
@@ -1,42 +1,42 @@
-insn,mode,CONDITIONS,Ptype,Etype,0,1,2,3,in1,in2,in3,out,CR in,CR out,out2
-lwarx,LDST_IDX,,2P,EXTRA2,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
-ldx,LDST_IDX,,2P,EXTRA2,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
-lwzx,LDST_IDX,,2P,EXTRA2,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
-lbarx,LDST_IDX,,2P,EXTRA2,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
-ldarx,LDST_IDX,,2P,EXTRA2,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
-lbzx,LDST_IDX,,2P,EXTRA2,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
-lharx,LDST_IDX,,2P,EXTRA2,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
-lhzx,LDST_IDX,,2P,EXTRA2,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
-lwax,LDST_IDX,,2P,EXTRA2,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
-lhax,LDST_IDX,,2P,EXTRA2,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
-ldbrx,LDST_IDX,,2P,EXTRA2,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
-lwbrx,LDST_IDX,,2P,EXTRA2,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
-lfsx,LDST_IDX,,2P,EXTRA2,d:FRT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,FRT,0,0,0
-lfdx,LDST_IDX,,2P,EXTRA2,d:FRT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,FRT,0,0,0
-lwzcix,LDST_IDX,,2P,EXTRA2,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
-lhbrx,LDST_IDX,,2P,EXTRA2,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
-lhzcix,LDST_IDX,,2P,EXTRA2,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
-lbzcix,LDST_IDX,,2P,EXTRA2,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
-lfiwax,LDST_IDX,,2P,EXTRA2,d:FRT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,FRT,0,0,0
-ldcix,LDST_IDX,,2P,EXTRA2,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
-lfiwzx,LDST_IDX,,2P,EXTRA2,d:FRT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,FRT,0,0,0
-stwu,LDST_IMM,,2P,EXTRA2,d:RA,s:RS,s:RA,0,RA_OR_ZERO,0,RS,0,0,0,RA
-stbu,LDST_IMM,,2P,EXTRA2,d:RA,s:RS,s:RA,0,RA_OR_ZERO,0,RS,0,0,0,RA
-sthu,LDST_IMM,,2P,EXTRA2,d:RA,s:RS,s:RA,0,RA_OR_ZERO,0,RS,0,0,0,RA
-stfsu,LDST_IMM,,2P,EXTRA2,d:RA,s:FRS,s:RA,0,RA,0,FRS,0,0,0,RA
-stfdu,LDST_IMM,,2P,EXTRA2,d:RA,s:FRS,s:RA,0,RA,0,FRS,0,0,0,RA
-stdu,LDST_IMM,,2P,EXTRA2,d:RA,s:RS,s:RA,0,RA_OR_ZERO,0,RS,0,0,0,RA
-ldux,LDST_IDX,,2P,EXTRA2,d:RT,d:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,RA
-lwzux,LDST_IDX,,2P,EXTRA2,d:RT,d:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,RA
-lbzux,LDST_IDX,,2P,EXTRA2,d:RT,d:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,RA
-lhzux,LDST_IDX,,2P,EXTRA2,d:RT,d:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,RA
-lwaux,LDST_IDX,,2P,EXTRA2,d:RT,d:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,RA
-lhaux,LDST_IDX,,2P,EXTRA2,d:RT,d:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,RA
-lfsux,LDST_IDX,,2P,EXTRA2,d:FRT,d:RA,s:RB,0,RA,RB,0,FRT,0,0,RA
-lfdux,LDST_IDX,,2P,EXTRA2,d:FRT,d:RA,s:RB,0,RA,RB,0,FRT,0,0,RA
-stdux,LDST_IDX,,2P,EXTRA2,d:RA,s:RS;s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,0,RA
-stwux,LDST_IDX,,2P,EXTRA2,d:RA,s:RS;s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,0,RA
-stbux,LDST_IDX,,2P,EXTRA2,d:RA,s:RS;s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,0,RA
-sthux,LDST_IDX,,2P,EXTRA2,d:RA,s:RS;s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,0,RA
-stfsux,LDST_IDX,,2P,EXTRA2,d:RA,s:FRS;s:RA,s:RB,0,RA,RB,FRS,0,0,0,RA
-stfdux,LDST_IDX,,2P,EXTRA2,d:RA,s:FRS;s:RA,s:RB,0,RA,RB,FRS,0,0,0,RA
+insn,mode,CONDITIONS,Ptype,Etype,SM,0,1,2,3,in1,in2,in3,out,CR in,CR out,out2
+lwarx,LDST_IDX,,2P,EXTRA2,0,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
+ldx,LDST_IDX,,2P,EXTRA2,0,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
+lwzx,LDST_IDX,,2P,EXTRA2,0,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
+lbarx,LDST_IDX,,2P,EXTRA2,0,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
+ldarx,LDST_IDX,,2P,EXTRA2,0,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
+lbzx,LDST_IDX,,2P,EXTRA2,0,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
+lharx,LDST_IDX,,2P,EXTRA2,0,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
+lhzx,LDST_IDX,,2P,EXTRA2,0,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
+lwax,LDST_IDX,,2P,EXTRA2,0,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
+lhax,LDST_IDX,,2P,EXTRA2,0,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
+ldbrx,LDST_IDX,,2P,EXTRA2,0,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
+lwbrx,LDST_IDX,,2P,EXTRA2,0,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
+lfsx,LDST_IDX,,2P,EXTRA2,0,d:FRT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,FRT,0,0,0
+lfdx,LDST_IDX,,2P,EXTRA2,0,d:FRT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,FRT,0,0,0
+lwzcix,LDST_IDX,,2P,EXTRA2,0,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
+lhbrx,LDST_IDX,,2P,EXTRA2,0,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
+lhzcix,LDST_IDX,,2P,EXTRA2,0,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
+lbzcix,LDST_IDX,,2P,EXTRA2,0,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
+lfiwax,LDST_IDX,,2P,EXTRA2,0,d:FRT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,FRT,0,0,0
+ldcix,LDST_IDX,,2P,EXTRA2,0,d:RT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,0
+lfiwzx,LDST_IDX,,2P,EXTRA2,0,d:FRT,s:RA,s:RB,0,RA_OR_ZERO,RB,0,FRT,0,0,0
+stwu,LDST_IMM,,2P,EXTRA2,0,d:RA,s:RS,s:RA,0,RA_OR_ZERO,0,RS,0,0,0,RA
+stbu,LDST_IMM,,2P,EXTRA2,0,d:RA,s:RS,s:RA,0,RA_OR_ZERO,0,RS,0,0,0,RA
+sthu,LDST_IMM,,2P,EXTRA2,0,d:RA,s:RS,s:RA,0,RA_OR_ZERO,0,RS,0,0,0,RA
+stfsu,LDST_IMM,,2P,EXTRA2,0,d:RA,s:FRS,s:RA,0,RA,0,FRS,0,0,0,RA
+stfdu,LDST_IMM,,2P,EXTRA2,0,d:RA,s:FRS,s:RA,0,RA,0,FRS,0,0,0,RA
+stdu,LDST_IMM,,2P,EXTRA2,0,d:RA,s:RS,s:RA,0,RA_OR_ZERO,0,RS,0,0,0,RA
+ldux,LDST_IDX,,2P,EXTRA2,0,d:RT,d:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,RA
+lwzux,LDST_IDX,,2P,EXTRA2,0,d:RT,d:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,RA
+lbzux,LDST_IDX,,2P,EXTRA2,0,d:RT,d:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,RA
+lhzux,LDST_IDX,,2P,EXTRA2,0,d:RT,d:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,RA
+lwaux,LDST_IDX,,2P,EXTRA2,0,d:RT,d:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,RA
+lhaux,LDST_IDX,,2P,EXTRA2,0,d:RT,d:RA,s:RB,0,RA_OR_ZERO,RB,0,RT,0,0,RA
+lfsux,LDST_IDX,,2P,EXTRA2,0,d:FRT,d:RA,s:RB,0,RA,RB,0,FRT,0,0,RA
+lfdux,LDST_IDX,,2P,EXTRA2,0,d:FRT,d:RA,s:RB,0,RA,RB,0,FRT,0,0,RA
+stdux,LDST_IDX,,2P,EXTRA2,0,d:RA,s:RS;s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,0,RA
+stwux,LDST_IDX,,2P,EXTRA2,0,d:RA,s:RS;s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,0,RA
+stbux,LDST_IDX,,2P,EXTRA2,0,d:RA,s:RS;s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,0,RA
+sthux,LDST_IDX,,2P,EXTRA2,0,d:RA,s:RS;s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,0,RA
+stfsux,LDST_IDX,,2P,EXTRA2,0,d:RA,s:FRS;s:RA,s:RB,0,RA,RB,FRS,0,0,0,RA
+stfdux,LDST_IDX,,2P,EXTRA2,0,d:RA,s:FRS;s:RA,s:RB,0,RA,RB,FRS,0,0,0,RA
diff --git a/openpower/isatables/LDSTRM-2P-3S.csv b/openpower/isatables/LDSTRM-2P-3S.csv
index 2f41c37b..789b0e76 100644
--- a/openpower/isatables/LDSTRM-2P-3S.csv
+++ b/openpower/isatables/LDSTRM-2P-3S.csv
@@ -1,19 +1,19 @@
-insn,mode,CONDITIONS,Ptype,Etype,0,1,2,3,in1,in2,in3,out,CR in,CR out,out2
-stdx,LDST_IDX,,2P,EXTRA2,s:RS,s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,0,0
-stwx,LDST_IDX,,2P,EXTRA2,s:RS,s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,0,0
-stbx,LDST_IDX,,2P,EXTRA2,s:RS,s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,0,0
-sthx,LDST_IDX,,2P,EXTRA2,s:RS,s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,0,0
-stdbrx,LDST_IDX,,2P,EXTRA2,s:RS,s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,0,0
-stwbrx,LDST_IDX,,2P,EXTRA2,s:RS,s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,0,0
-stfsx,LDST_IDX,,2P,EXTRA2,s:FRS,s:RA,s:RB,0,RA,RB,FRS,0,0,0,0
-stfdx,LDST_IDX,,2P,EXTRA2,s:FRS,s:RA,s:RB,0,RA_OR_ZERO,RB,FRS,0,0,0,0
-stwcix,LDST_IDX,,2P,EXTRA2,s:RS,s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,0,0
-sthbrx,LDST_IDX,,2P,EXTRA2,s:RS,s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,0,0
-sthcix,LDST_IDX,,2P,EXTRA2,s:RS,s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,0,0
-stbcix,LDST_IDX,,2P,EXTRA2,s:RS,s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,0,0
-stfiwx,LDST_IDX,,2P,EXTRA2,s:FRS,s:RA,s:RB,0,RA_OR_ZERO,RB,FRS,0,0,0,0
-stdcix,LDST_IDX,,2P,EXTRA2,s:RS,s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,0,0
-stwcx,LDST_IDX,,2P,EXTRA2,s:RS;d:CR0,s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,CR0,0
-stdcx,LDST_IDX,,2P,EXTRA2,s:RS;d:CR0,s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,CR0,0
-stbcx,LDST_IDX,,2P,EXTRA2,s:RS;d:CR0,s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,CR0,0
-sthcx,LDST_IDX,,2P,EXTRA2,s:RS;d:CR0,s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,CR0,0
+insn,mode,CONDITIONS,Ptype,Etype,SM,0,1,2,3,in1,in2,in3,out,CR in,CR out,out2
+stdx,LDST_IDX,,2P,EXTRA2,0,s:RS,s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,0,0
+stwx,LDST_IDX,,2P,EXTRA2,0,s:RS,s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,0,0
+stbx,LDST_IDX,,2P,EXTRA2,0,s:RS,s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,0,0
+sthx,LDST_IDX,,2P,EXTRA2,0,s:RS,s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,0,0
+stdbrx,LDST_IDX,,2P,EXTRA2,0,s:RS,s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,0,0
+stwbrx,LDST_IDX,,2P,EXTRA2,0,s:RS,s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,0,0
+stfsx,LDST_IDX,,2P,EXTRA2,0,s:FRS,s:RA,s:RB,0,RA,RB,FRS,0,0,0,0
+stfdx,LDST_IDX,,2P,EXTRA2,0,s:FRS,s:RA,s:RB,0,RA_OR_ZERO,RB,FRS,0,0,0,0
+stwcix,LDST_IDX,,2P,EXTRA2,0,s:RS,s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,0,0
+sthbrx,LDST_IDX,,2P,EXTRA2,0,s:RS,s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,0,0
+sthcix,LDST_IDX,,2P,EXTRA2,0,s:RS,s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,0,0
+stbcix,LDST_IDX,,2P,EXTRA2,0,s:RS,s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,0,0
+stfiwx,LDST_IDX,,2P,EXTRA2,0,s:FRS,s:RA,s:RB,0,RA_OR_ZERO,RB,FRS,0,0,0,0
+stdcix,LDST_IDX,,2P,EXTRA2,0,s:RS,s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,0,0
+stwcx,LDST_IDX,,2P,EXTRA2,0,s:RS;d:CR0,s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,CR0,0
+stdcx,LDST_IDX,,2P,EXTRA2,0,s:RS;d:CR0,s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,CR0,0
+stbcx,LDST_IDX,,2P,EXTRA2,0,s:RS;d:CR0,s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,CR0,0
+sthcx,LDST_IDX,,2P,EXTRA2,0,s:RS;d:CR0,s:RA,s:RB,0,RA_OR_ZERO,RB,RS,0,0,CR0,0
diff --git a/openpower/isatables/RM-1P-1D.csv b/openpower/isatables/RM-1P-1D.csv
index 844f5274..46407f9b 100644
--- a/openpower/isatables/RM-1P-1D.csv
+++ b/openpower/isatables/RM-1P-1D.csv
@@ -1,3 +1,3 @@
-insn,mode,CONDITIONS,Ptype,Etype,0,1,2,3,in1,in2,in3,out,CR in,CR out,out2
-fmvis,NORMAL,,1P,EXTRA3,d:FRS,0,0,0,0,0,0,FRS,0,0,0
-svstep,NORMAL,,1P,EXTRA3,d:RT;d:CR0,0,0,0,0,0,0,RT,0,CR0,0
+insn,mode,CONDITIONS,Ptype,Etype,SM,0,1,2,3,in1,in2,in3,out,CR in,CR out,out2
+fmvis,NORMAL,,1P,EXTRA3,0,d:FRS,0,0,0,0,0,0,FRS,0,0,0
+svstep,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,0,0,0,0,0,0,RT,0,CR0,0
diff --git a/openpower/isatables/RM-1P-1S.csv b/openpower/isatables/RM-1P-1S.csv
index ce7e9f7c..b9ab2856 100644
--- a/openpower/isatables/RM-1P-1S.csv
+++ b/openpower/isatables/RM-1P-1S.csv
@@ -1,3 +1,3 @@
-insn,mode,CONDITIONS,Ptype,Etype,0,1,2,3,in1,in2,in3,out,CR in,CR out,out2
-tdi,NORMAL,,1P,EXTRA2,0,0,0,0,RA,0,0,0,0,0,0
-twi,NORMAL,,1P,EXTRA2,0,0,0,0,RA,0,0,0,0,0,0
+insn,mode,CONDITIONS,Ptype,Etype,SM,0,1,2,3,in1,in2,in3,out,CR in,CR out,out2
+tdi,NORMAL,,1P,EXTRA2,0,0,0,0,0,RA,0,0,0,0,0,0
+twi,NORMAL,,1P,EXTRA2,0,0,0,0,0,RA,0,0,0,0,0,0
diff --git a/openpower/isatables/RM-1P-2S1D.csv b/openpower/isatables/RM-1P-2S1D.csv
index bf67e49f..975de79e 100644
--- a/openpower/isatables/RM-1P-2S1D.csv
+++ b/openpower/isatables/RM-1P-2S1D.csv
@@ -1,155 +1,155 @@
-insn,mode,CONDITIONS,Ptype,Etype,0,1,2,3,in1,in2,in3,out,CR in,CR out,out2
-crnor,CROP,,1P,EXTRA3,d:BT,s:BA,s:BB,0,0,0,0,0,BA_BB,BT,0
-crandc,CROP,,1P,EXTRA3,d:BT,s:BA,s:BB,0,0,0,0,0,BA_BB,BT,0
-crxor,CROP,,1P,EXTRA3,d:BT,s:BA,s:BB,0,0,0,0,0,BA_BB,BT,0
-crnand,CROP,,1P,EXTRA3,d:BT,s:BA,s:BB,0,0,0,0,0,BA_BB,BT,0
-crand,CROP,,1P,EXTRA3,d:BT,s:BA,s:BB,0,0,0,0,0,BA_BB,BT,0
-creqv,CROP,,1P,EXTRA3,d:BT,s:BA,s:BB,0,0,0,0,0,BA_BB,BT,0
-crorc,CROP,,1P,EXTRA3,d:BT,s:BA,s:BB,0,0,0,0,0,BA_BB,BT,0
-cror,CROP,,1P,EXTRA3,d:BT,s:BA,s:BB,0,0,0,0,0,BA_BB,BT,0
-cmp,NORMAL,,1P,EXTRA3,d:BF,s:RA,s:RB,0,RA,RB,0,0,0,BF,0
-cmpl,NORMAL,,1P,EXTRA3,d:BF,s:RA,s:RB,0,RA,RB,0,0,0,BF,0
-cmprb,NORMAL,,1P,EXTRA3,d:BF,s:RA,s:RB,0,RA,RB,0,0,0,BF,0
-cmpeqb,NORMAL,,1P,EXTRA3,d:BF,s:RA,s:RB,0,RA,RB,0,0,0,BF,0
-0/0=fcmpu,NORMAL,,1P,EXTRA3,d:BF,s:FRA,s:FRB,0,FRA,FRB,0,0,0,BF,0
-1/0=fcmpo,NORMAL,,1P,EXTRA3,d:BF,s:FRA,s:FRB,0,FRA,FRB,0,0,0,BF,0
-4/0=ftdiv,NORMAL,,1P,EXTRA3,d:BF,s:FRA,s:FRB,0,FRA,FRB,0,0,0,BF,0
-bmask,NORMAL,,1P,EXTRA3,d:RT,s:RA,s:RB,0,RA,RB,0,RT,0,0,0
-bpermd,NORMAL,,1P,EXTRA3,d:RA,s:RS,s:RB,0,RS,RB,0,RA,0,0,0
-modud,NORMAL,,1P,EXTRA3,d:RT,s:RA,s:RB,0,RA,RB,0,RT,0,0,0
-moduw,NORMAL,,1P,EXTRA3,d:RT,s:RA,s:RB,0,RA,RB,0,RT,0,0,0
-cmpb,NORMAL,,1P,EXTRA3,d:RA,s:RS,s:RB,0,RS,RB,0,RA,0,0,0
-modsd,NORMAL,,1P,EXTRA3,d:RT,s:RA,s:RB,0,RA,RB,0,RT,0,0,0
-modsw,NORMAL,,1P,EXTRA3,d:RT,s:RA,s:RB,0,RA,RB,0,RT,0,0,0
-26/6=fmrgow,NORMAL,,1P,EXTRA3,d:FRT,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,0,0
-30/6=fmrgew,NORMAL,,1P,EXTRA3,d:FRT,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,0,0
-rlwnm,NORMAL,,1P,EXTRA3,d:RA;d:CR0,s:RB,s:RS,0,0,RB,RS,RA,0,CR0,0
-minu,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-maxu,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-mins,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-cprop,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-maxs,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-absds,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-absdu,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-avgadd,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-rldcl,NORMAL,,1P,EXTRA3,d:RA;d:CR0,s:RB,s:RS,0,0,RB,RS,RA,0,CR0,0
-rldcr,NORMAL,,1P,EXTRA3,d:RA;d:CR0,s:RB,s:RS,0,0,RB,RS,RA,0,CR0,0
-subfc,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-mulhdu,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-addc,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-mulhwu,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-slw,NORMAL,,1P,EXTRA3,d:RA;d:CR0,s:RB,s:RS,0,0,RB,RS,RA,0,CR0,0
-sld,NORMAL,,1P,EXTRA3,d:RA;d:CR0,s:RB,s:RS,0,0,RB,RS,RA,0,CR0,0
-and,NORMAL,,1P,EXTRA3,d:RA;d:CR0,s:RB,s:RS,0,RS,RB,0,RA,0,CR0,0
-subf,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-andc,NORMAL,,1P,EXTRA3,d:RA;d:CR0,s:RB,s:RS,0,RS,RB,0,RA,0,CR0,0
-mulhd,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-addg6s,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-mulhw,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-nor,NORMAL,,1P,EXTRA3,d:RA;d:CR0,s:RB,s:RS,0,RS,RB,0,RA,0,CR0,0
-subfe,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-adde,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-mulld,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-mullw,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-add,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-eqv,NORMAL,,1P,EXTRA3,d:RA;d:CR0,s:RB,s:RS,0,RS,RB,0,RA,0,CR0,0
-xor,NORMAL,,1P,EXTRA3,d:RA;d:CR0,s:RB,s:RS,0,RS,RB,0,RA,0,CR0,0
-divdeu,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-divweu,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-orc,NORMAL,,1P,EXTRA3,d:RA;d:CR0,s:RB,s:RS,0,RS,RB,0,RA,0,CR0,0
-divde,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-divwe,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-or,NORMAL,,1P,EXTRA3,d:RA;d:CR0,s:RB,s:RS,0,RS,RB,0,RA,0,CR0,0
-divdu,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-divwu,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-nand,NORMAL,,1P,EXTRA3,d:RA;d:CR0,s:RB,s:RS,0,RS,RB,0,RA,0,CR0,0
-divd,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-divw,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-subfco,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-mulhdu,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-addco,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-mulhwu,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-srw,NORMAL,,1P,EXTRA3,d:RA;d:CR0,s:RB,s:RS,0,0,RB,RS,RA,0,CR0,0
-srd,NORMAL,,1P,EXTRA3,d:RA;d:CR0,s:RB,s:RS,0,0,RB,RS,RA,0,CR0,0
-subfo,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-mulhd,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-mulhw,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-subfeo,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-addeo,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-mulldo,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-mullwo,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-addo,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-sraw,NORMAL,,1P,EXTRA3,d:RA;d:CR0,s:RB,s:RS,0,0,RB,RS,RA,0,CR0,0
-srad,NORMAL,,1P,EXTRA3,d:RA;d:CR0,s:RB,s:RS,0,0,RB,RS,RA,0,CR0,0
-divdeuo,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-divweuo,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-divdeo,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-divweo,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-divduo,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-divwuo,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-divdo,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-divwo,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-grev,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-grevw,NORMAL,,1P,EXTRA3,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
-fdivs,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fsubs,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fadds,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fmuls,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRC,0,FRA,0,FRC,FRT,0,CR1,0
-fatan2pis,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fatan2s,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fhypots,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fminnum08s,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fmin19s,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fminnum19s,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fmincs,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fmaxnum08s,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fmax19s,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fmaxnum19s,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fmaxcs,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fminmagnum08s,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fmaxmagnum08s,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fmods,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fpowns,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:RB,0,FRA,RB,0,FRT,0,CR1,0
-frootns,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:RB,0,FRA,RB,0,FRT,0,CR1,0
-fminmag19s,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fmaxmag19s,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fminmagnum19s,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fmaxmagnum19s,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fremainders,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-ffadds,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fpowrs,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fpows,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fminmagcs,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fmaxmagcs,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fdiv,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fsub,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fadd,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fmul,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRC,0,FRA,0,FRC,FRT,0,CR1,0
-0/8=fcpsgn,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fatan2pi,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fatan2,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fhypot,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fminnum08,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fmin19,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fminnum19,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fminc,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fmaxnum08,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fmax19,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fmaxnum19,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fmaxc,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fminmagnum08,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fmaxmagnum08,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fmod,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fpown,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:RB,0,FRA,RB,0,FRT,0,CR1,0
-frootn,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:RB,0,FRA,RB,0,FRT,0,CR1,0
-fminmag19,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fmaxmag19,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fminmagnum19,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fmaxmagnum19,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fremainder,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fpowr,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fpow,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fminmagc,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-fmaxmagc,NORMAL,,1P,EXTRA3,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
-rlwimi,NORMAL,,1P,EXTRA3,d:RA;d:CR0,s:RA,s:RS,0,RA,0,RS,RA,0,CR0,0
-rldimi,NORMAL,,1P,EXTRA3,d:RA;d:CR0,s:RA,s:RS,0,RA,0,RS,RA,0,CR0,0
+insn,mode,CONDITIONS,Ptype,Etype,SM,0,1,2,3,in1,in2,in3,out,CR in,CR out,out2
+crnor,CROP,,1P,EXTRA3,0,d:BT,s:BA,s:BB,0,0,0,0,0,BA_BB,BT,0
+crandc,CROP,,1P,EXTRA3,0,d:BT,s:BA,s:BB,0,0,0,0,0,BA_BB,BT,0
+crxor,CROP,,1P,EXTRA3,0,d:BT,s:BA,s:BB,0,0,0,0,0,BA_BB,BT,0
+crnand,CROP,,1P,EXTRA3,0,d:BT,s:BA,s:BB,0,0,0,0,0,BA_BB,BT,0
+crand,CROP,,1P,EXTRA3,0,d:BT,s:BA,s:BB,0,0,0,0,0,BA_BB,BT,0
+creqv,CROP,,1P,EXTRA3,0,d:BT,s:BA,s:BB,0,0,0,0,0,BA_BB,BT,0
+crorc,CROP,,1P,EXTRA3,0,d:BT,s:BA,s:BB,0,0,0,0,0,BA_BB,BT,0
+cror,CROP,,1P,EXTRA3,0,d:BT,s:BA,s:BB,0,0,0,0,0,BA_BB,BT,0
+cmp,NORMAL,,1P,EXTRA3,0,d:BF,s:RA,s:RB,0,RA,RB,0,0,0,BF,0
+cmpl,NORMAL,,1P,EXTRA3,0,d:BF,s:RA,s:RB,0,RA,RB,0,0,0,BF,0
+cmprb,NORMAL,,1P,EXTRA3,0,d:BF,s:RA,s:RB,0,RA,RB,0,0,0,BF,0
+cmpeqb,NORMAL,,1P,EXTRA3,0,d:BF,s:RA,s:RB,0,RA,RB,0,0,0,BF,0
+0/0=fcmpu,NORMAL,,1P,EXTRA3,0,d:BF,s:FRA,s:FRB,0,FRA,FRB,0,0,0,BF,0
+1/0=fcmpo,NORMAL,,1P,EXTRA3,0,d:BF,s:FRA,s:FRB,0,FRA,FRB,0,0,0,BF,0
+4/0=ftdiv,NORMAL,,1P,EXTRA3,0,d:BF,s:FRA,s:FRB,0,FRA,FRB,0,0,0,BF,0
+bmask,NORMAL,,1P,EXTRA3,0,d:RT,s:RA,s:RB,0,RA,RB,0,RT,0,0,0
+bpermd,NORMAL,,1P,EXTRA3,0,d:RA,s:RS,s:RB,0,RS,RB,0,RA,0,0,0
+modud,NORMAL,,1P,EXTRA3,0,d:RT,s:RA,s:RB,0,RA,RB,0,RT,0,0,0
+moduw,NORMAL,,1P,EXTRA3,0,d:RT,s:RA,s:RB,0,RA,RB,0,RT,0,0,0
+cmpb,NORMAL,,1P,EXTRA3,0,d:RA,s:RS,s:RB,0,RS,RB,0,RA,0,0,0
+modsd,NORMAL,,1P,EXTRA3,0,d:RT,s:RA,s:RB,0,RA,RB,0,RT,0,0,0
+modsw,NORMAL,,1P,EXTRA3,0,d:RT,s:RA,s:RB,0,RA,RB,0,RT,0,0,0
+26/6=fmrgow,NORMAL,,1P,EXTRA3,0,d:FRT,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,0,0
+30/6=fmrgew,NORMAL,,1P,EXTRA3,0,d:FRT,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,0,0
+rlwnm,NORMAL,,1P,EXTRA3,0,d:RA;d:CR0,s:RB,s:RS,0,0,RB,RS,RA,0,CR0,0
+minu,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+maxu,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+mins,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+cprop,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+maxs,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+absds,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+absdu,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+avgadd,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+rldcl,NORMAL,,1P,EXTRA3,0,d:RA;d:CR0,s:RB,s:RS,0,0,RB,RS,RA,0,CR0,0
+rldcr,NORMAL,,1P,EXTRA3,0,d:RA;d:CR0,s:RB,s:RS,0,0,RB,RS,RA,0,CR0,0
+subfc,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+mulhdu,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+addc,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+mulhwu,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+slw,NORMAL,,1P,EXTRA3,0,d:RA;d:CR0,s:RB,s:RS,0,0,RB,RS,RA,0,CR0,0
+sld,NORMAL,,1P,EXTRA3,0,d:RA;d:CR0,s:RB,s:RS,0,0,RB,RS,RA,0,CR0,0
+and,NORMAL,,1P,EXTRA3,0,d:RA;d:CR0,s:RB,s:RS,0,RS,RB,0,RA,0,CR0,0
+subf,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+andc,NORMAL,,1P,EXTRA3,0,d:RA;d:CR0,s:RB,s:RS,0,RS,RB,0,RA,0,CR0,0
+mulhd,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+addg6s,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+mulhw,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+nor,NORMAL,,1P,EXTRA3,0,d:RA;d:CR0,s:RB,s:RS,0,RS,RB,0,RA,0,CR0,0
+subfe,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+adde,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+mulld,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+mullw,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+add,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+eqv,NORMAL,,1P,EXTRA3,0,d:RA;d:CR0,s:RB,s:RS,0,RS,RB,0,RA,0,CR0,0
+xor,NORMAL,,1P,EXTRA3,0,d:RA;d:CR0,s:RB,s:RS,0,RS,RB,0,RA,0,CR0,0
+divdeu,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+divweu,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+orc,NORMAL,,1P,EXTRA3,0,d:RA;d:CR0,s:RB,s:RS,0,RS,RB,0,RA,0,CR0,0
+divde,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+divwe,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+or,NORMAL,,1P,EXTRA3,0,d:RA;d:CR0,s:RB,s:RS,0,RS,RB,0,RA,0,CR0,0
+divdu,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+divwu,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+nand,NORMAL,,1P,EXTRA3,0,d:RA;d:CR0,s:RB,s:RS,0,RS,RB,0,RA,0,CR0,0
+divd,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+divw,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+subfco,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+mulhdu,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+addco,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+mulhwu,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+srw,NORMAL,,1P,EXTRA3,0,d:RA;d:CR0,s:RB,s:RS,0,0,RB,RS,RA,0,CR0,0
+srd,NORMAL,,1P,EXTRA3,0,d:RA;d:CR0,s:RB,s:RS,0,0,RB,RS,RA,0,CR0,0
+subfo,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+mulhd,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+mulhw,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+subfeo,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+addeo,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+mulldo,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+mullwo,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+addo,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+sraw,NORMAL,,1P,EXTRA3,0,d:RA;d:CR0,s:RB,s:RS,0,0,RB,RS,RA,0,CR0,0
+srad,NORMAL,,1P,EXTRA3,0,d:RA;d:CR0,s:RB,s:RS,0,0,RB,RS,RA,0,CR0,0
+divdeuo,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+divweuo,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+divdeo,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+divweo,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+divduo,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+divwuo,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+divdo,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+divwo,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+grev,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+grevw,NORMAL,,1P,EXTRA3,0,d:RT;d:CR0,s:RA,s:RB,0,RA,RB,0,RT,0,CR0,0
+fdivs,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fsubs,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fadds,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fmuls,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRC,0,FRA,0,FRC,FRT,0,CR1,0
+fatan2pis,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fatan2s,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fhypots,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fminnum08s,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fmin19s,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fminnum19s,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fmincs,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fmaxnum08s,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fmax19s,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fmaxnum19s,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fmaxcs,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fminmagnum08s,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fmaxmagnum08s,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fmods,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fpowns,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:RB,0,FRA,RB,0,FRT,0,CR1,0
+frootns,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:RB,0,FRA,RB,0,FRT,0,CR1,0
+fminmag19s,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fmaxmag19s,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fminmagnum19s,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fmaxmagnum19s,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fremainders,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+ffadds,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fpowrs,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fpows,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fminmagcs,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fmaxmagcs,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fdiv,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fsub,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fadd,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fmul,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRC,0,FRA,0,FRC,FRT,0,CR1,0
+0/8=fcpsgn,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fatan2pi,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fatan2,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fhypot,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fminnum08,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fmin19,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fminnum19,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fminc,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fmaxnum08,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fmax19,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fmaxnum19,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fmaxc,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fminmagnum08,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fmaxmagnum08,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fmod,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fpown,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:RB,0,FRA,RB,0,FRT,0,CR1,0
+frootn,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:RB,0,FRA,RB,0,FRT,0,CR1,0
+fminmag19,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fmaxmag19,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fminmagnum19,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fmaxmagnum19,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fremainder,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fpowr,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fpow,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fminmagc,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+fmaxmagc,NORMAL,,1P,EXTRA3,0,d:FRT;d:CR1,s:FRA,s:FRB,0,FRA,FRB,0,FRT,0,CR1,0
+rlwimi,NORMAL,,1P,EXTRA3,0,d:RA;d:CR0,s:RA,s:RS,0,RA,0,RS,RA,0,CR0,0
+rldimi,NORMAL,,1P,EXTRA3,0,d:RA;d:CR0,s:RA,s:RS,0,RA,0,RS,RA,0,CR0,0
diff --git a/openpower/isatables/RM-1P-3S1D.csv b/openpower/isatables/RM-1P-3S1D.csv
index 0142a171..dec45221 100644
--- a/openpower/isatables/RM-1P-3S1D.csv
+++ b/openpower/isatables/RM-1P-3S1D.csv
@@ -1,50 +1,50 @@
-insn,mode,CONDITIONS,Ptype,Etype,0,1,2,3,in1,in2,in3,out,CR in,CR out,out2
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-isel,NORMAL,,1P,EXTRA2,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
-absdacs,NORMAL,,1P,EXTRA2,d:RT;d:CR0,s:RA,s:RB,s:RT,RA,RB,RT,RT,0,CR0,0
-absdacu,NORMAL,,1P,EXTRA2,d:RT;d:CR0,s:RA,s:RB,s:RT,RA,RB,RT,RT,0,CR0,0
-ternlogi,NORMAL,,1P,EXTRA2,d:RT;d:CR0,s:RA,s:RB,s:RT,RA,RB,RT,RT,0,CR0,0
-ffmsubs,NORMAL,,1P,EXTRA2,d:FRT;d:CR1,s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,CR1,0
-ffmadds,NORMAL,,1P,EXTRA2,d:FRT;d:CR1,s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,CR1,0
-ffnmsubs,NORMAL,,1P,EXTRA2,d:FRT;d:CR1,s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,CR1,0
-ffnmadds,NORMAL,,1P,EXTRA2,d:FRT;d:CR1,s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,CR1,0
-fdmadds,NORMAL,,1P,EXTRA2,d:FRT;d:CR1,s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,CR1,0
-fmsubs,NORMAL,,1P,EXTRA2,d:FRT;d:CR1,s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,CR1,0
-fmadds,NORMAL,,1P,EXTRA2,d:FRT;d:CR1,s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,CR1,0
-fnmsubs,NORMAL,,1P,EXTRA2,d:FRT;d:CR1,s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,CR1,0
-fnmadds,NORMAL,,1P,EXTRA2,d:FRT;d:CR1,s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,CR1,0
-fsel,NORMAL,,1P,EXTRA2,d:FRT;d:CR1,s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,CR1,0
-fmsub,NORMAL,,1P,EXTRA2,d:FRT;d:CR1,s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,CR1,0
-fmadd,NORMAL,,1P,EXTRA2,d:FRT;d:CR1,s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,CR1,0
-fnmsub,NORMAL,,1P,EXTRA2,d:FRT;d:CR1,s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,CR1,0
-fnmadd,NORMAL,,1P,EXTRA2,d:FRT;d:CR1,s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,CR1,0
+insn,mode,CONDITIONS,Ptype,Etype,SM,0,1,2,3,in1,in2,in3,out,CR in,CR out,out2
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+isel,NORMAL,,1P,EXTRA2,0,d:RT,s:RA,s:RB,s:BC,RA_OR_ZERO,RB,0,RT,BC,0,0
+absdacs,NORMAL,,1P,EXTRA2,0,d:RT;d:CR0,s:RA,s:RB,s:RT,RA,RB,RT,RT,0,CR0,0
+absdacu,NORMAL,,1P,EXTRA2,0,d:RT;d:CR0,s:RA,s:RB,s:RT,RA,RB,RT,RT,0,CR0,0
+ternlogi,NORMAL,,1P,EXTRA2,0,d:RT;d:CR0,s:RA,s:RB,s:RT,RA,RB,RT,RT,0,CR0,0
+ffmsubs,NORMAL,,1P,EXTRA2,0,d:FRT;d:CR1,s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,CR1,0
+ffmadds,NORMAL,,1P,EXTRA2,0,d:FRT;d:CR1,s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,CR1,0
+ffnmsubs,NORMAL,,1P,EXTRA2,0,d:FRT;d:CR1,s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,CR1,0
+ffnmadds,NORMAL,,1P,EXTRA2,0,d:FRT;d:CR1,s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,CR1,0
+fdmadds,NORMAL,,1P,EXTRA2,0,d:FRT;d:CR1,s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,CR1,0
+fmsubs,NORMAL,,1P,EXTRA2,0,d:FRT;d:CR1,s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,CR1,0
+fmadds,NORMAL,,1P,EXTRA2,0,d:FRT;d:CR1,s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,CR1,0
+fnmsubs,NORMAL,,1P,EXTRA2,0,d:FRT;d:CR1,s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,CR1,0
+fnmadds,NORMAL,,1P,EXTRA2,0,d:FRT;d:CR1,s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,CR1,0
+fsel,NORMAL,,1P,EXTRA2,0,d:FRT;d:CR1,s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,CR1,0
+fmsub,NORMAL,,1P,EXTRA2,0,d:FRT;d:CR1,s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,CR1,0
+fmadd,NORMAL,,1P,EXTRA2,0,d:FRT;d:CR1,s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,CR1,0
+fnmsub,NORMAL,,1P,EXTRA2,0,d:FRT;d:CR1,s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,CR1,0
+fnmadd,NORMAL,,1P,EXTRA2,0,d:FRT;d:CR1,s:FRA,s:FRB,s:FRC,FRA,FRB,FRC,FRT,0,CR1,0
diff --git a/openpower/isatables/RM-2P-1S1D.csv b/openpower/isatables/RM-2P-1S1D.csv
index 086a1e49..097c4445 100644
--- a/openpower/isatables/RM-2P-1S1D.csv
+++ b/openpower/isatables/RM-2P-1S1D.csv
@@ -1,155 +1,155 @@
-insn,mode,CONDITIONS,Ptype,Etype,0,1,2,3,in1,in2,in3,out,CR in,CR out,out2
-mcrf,NORMAL,,2P,EXTRA3,d:BF,s:BFA,0,0,0,0,0,0,BFA,BF,0
-bclr,BRANCH,,2P,EXTRA3,d:BI,s:BI,0,0,SPR,SPR,0,SPR,BI,0,0
-mfcr/mfocrf,NORMAL,,2P,EXTRA3,d:RT,s:CR,0,0,0,0,0,RT,WHOLE_REG,0,0
-setb,NORMAL,,2P,EXTRA3,d:RT,s:BFA,0,0,0,0,0,RT,BFA,0,0
-bc,BRANCH,,2P,EXTRA3,d:BI,s:BI,0,0,SPR,0,0,SPR,BI,0,0
-5/0=ftsqrt,NORMAL,,2P,EXTRA3,d:BF,s:FRB,0,0,0,FRB,0,0,0,BF,0
-22/7=mtfsf,NORMAL,,2P,EXTRA3,d:CR1,s:FRB,0,0,0,FRB,0,0,0,CR1,0
-cmpli,NORMAL,,2P,EXTRA3,d:BF,s:RA,0,0,RA,0,0,0,0,BF,0
-cmpi,NORMAL,,2P,EXTRA3,d:BF,s:RA,0,0,RA,0,0,0,0,BF,0
-neg,NORMAL,,2P,EXTRA3,d:RT,s:RA,0,0,RA,0,0,RT,0,0,0
-popcntb,NORMAL,,2P,EXTRA3,d:RA,s:RS,0,0,RS,0,0,RA,0,0,0
-prtyw,NORMAL,,2P,EXTRA3,d:RA,s:RS,0,0,RS,0,0,RA,0,0,0
-prtyd,NORMAL,,2P,EXTRA3,d:RA,s:RS,0,0,RS,0,0,RA,0,0,0
-cdtbcd,NORMAL,,2P,EXTRA3,d:RA,s:RS,0,0,RS,0,0,RA,0,0,0
-cbcdtd,NORMAL,,2P,EXTRA3,d:RA,s:RS,0,0,RS,0,0,RA,0,0,0
-mfspr,NORMAL,,2P,EXTRA3,d:RS,s:SPR,0,0,SPR,0,0,RT,0,0,0
-popcntw,NORMAL,,2P,EXTRA3,d:RA,s:RS,0,0,RS,0,0,RA,0,0,0
-mtspr,NORMAL,,2P,EXTRA3,d:SPR,s:RS,0,0,RS,0,0,SPR,0,0,0
-popcntd,NORMAL,,2P,EXTRA3,d:RA,s:RS,0,0,RS,0,0,RA,0,0,0
-nego,NORMAL,,2P,EXTRA3,d:RT,s:RA,0,0,RA,0,0,RT,0,0,0
-addic,NORMAL,,2P,EXTRA3,d:RT,s:RA,0,0,RA,0,0,RT,0,0,0
-addi,NORMAL,,2P,EXTRA3,d:RT,s:RA,0,0,RA_OR_ZERO,0,0,RT,0,0,0
-addis,NORMAL,,2P,EXTRA3,d:RT,s:RA,0,0,RA_OR_ZERO,0,0,RT,0,0,0
-ori,NORMAL,,2P,EXTRA3,d:RA,s:RS,0,0,RS,0,0,RA,0,0,0
-oris,NORMAL,,2P,EXTRA3,d:RA,s:RS,0,0,RS,0,0,RA,0,0,0
-xori,NORMAL,,2P,EXTRA3,d:RA,s:RS,0,0,RS,0,0,RA,0,0,0
-xoris,NORMAL,,2P,EXTRA3,d:RA,s:RS,0,0,RS,0,0,RA,0,0,0
-subfic,NORMAL,,2P,EXTRA3,d:RT,s:RA,0,0,RA,0,0,RT,0,0,0
-fishmv,NORMAL,,2P,EXTRA3,d:FRS,s:FRS,0,0,FRS,0,0,FRS,0,0,0
-setvl,NORMAL,,2P,EXTRA3,d:RT,s:RA,0,0,RA_OR_ZERO,0,0,RT_OR_ZERO,0,CR0,0
-cntlzw,NORMAL,,2P,EXTRA3,d:RA;d:CR0,s:RS,0,0,RS,0,0,RA,0,CR0,0
-cntlzd,NORMAL,,2P,EXTRA3,d:RA;d:CR0,s:RS,0,0,RS,0,0,RA,0,CR0,0
-subfze,NORMAL,,2P,EXTRA3,d:RT;d:CR0,s:RA,0,0,RA,0,0,RT,0,CR0,0
-addze,NORMAL,,2P,EXTRA3,d:RT;d:CR0,s:RA,0,0,RA,0,0,RT,0,CR0,0
-cnttzw,NORMAL,,2P,EXTRA3,d:RA;d:CR0,s:RS,0,0,RS,0,0,RA,0,CR0,0
-cnttzd,NORMAL,,2P,EXTRA3,d:RA;d:CR0,s:RS,0,0,RS,0,0,RA,0,CR0,0
-subfzeo,NORMAL,,2P,EXTRA3,d:RT;d:CR0,s:RA,0,0,RA,0,0,RT,0,CR0,0
-addzeo,NORMAL,,2P,EXTRA3,d:RT;d:CR0,s:RA,0,0,RA,0,0,RT,0,CR0,0
-extsh,NORMAL,,2P,EXTRA3,d:RA;d:CR0,s:RS,0,0,RS,0,0,RA,0,CR0,0
-extsb,NORMAL,,2P,EXTRA3,d:RA;d:CR0,s:RS,0,0,RS,0,0,RA,0,CR0,0
-extsw,NORMAL,,2P,EXTRA3,d:RA;d:CR0,s:RS,0,0,RS,0,0,RA,0,CR0,0
-fsqrts,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fres,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-frsqrtes,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fcbrts,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fsinpis,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fasinpis,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fcospis,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-ftanpis,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-facospis,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fatanpis,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-frsqrts,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fsins,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fasins,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fcoss,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-ftans,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-facoss,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fatans,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-frecips,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fsinhs,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fasinhs,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fcoshs,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-ftanhs,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-facoshs,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fatanhs,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fexp2m1s,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-flog2p1s,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fexpm1s,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-flogp1s,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fexp10m1s,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-flog10p1s,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fcfids,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fexp2s,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-flog2s,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fexps,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-flogs,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fexp10s,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-flog10s,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fcfidus,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fsqrt,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fre,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-frsqrte,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-0/12=frsp,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-0/14=fctiw,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-0/15=fctiwz,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-1/8=fneg,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-2/8=fmr,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-4/8=fnabs,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-4/14=fctiwu,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-4/15=fctiwuz,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-8/8=fabs,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-12/8=frin,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-13/8=friz,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-14/8=frip,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-15/8=frim,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fcbrt,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fsinpi,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fasinpi,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fcospi,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-ftanpi,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-facospi,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fatanpi,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-18/7=mffs,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-frsqrt,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fsin,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fasin,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fcos,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-ftan,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-facos,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fatan,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-frecip,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fsinh,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fasinh,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fcosh,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-ftanh,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-facosh,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fatanh,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fexp2m1,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-flog2p1,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fexpm1,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-flogp1,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-25/14=fctid,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-25/15=fctidz,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fexp10m1,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-flog10p1,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-26/14=fcfid,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fexp2,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-flog2,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fexp,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-flog,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-29/14=fctidu,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-29/15=fctiduz,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-fexp10,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-flog10,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-30/14=fcfidu,NORMAL,,2P,EXTRA3,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
-addic.,NORMAL,,2P,EXTRA3,d:RT;d:CR0,s:RA,0,0,RA,0,0,RT,0,CR0,0
-rlwinm,NORMAL,,2P,EXTRA3,d:RA;d:CR0,s:RS,0,0,0,0,RS,RA,0,CR0,0
-andi.,NORMAL,,2P,EXTRA3,d:RA;d:CR0,s:RS,0,0,RS,0,0,RA,0,CR0,0
-andis.,NORMAL,,2P,EXTRA3,d:RA;d:CR0,s:RS,0,0,RS,0,0,RA,0,CR0,0
-mulli,NORMAL,,2P,EXTRA3,d:RT;d:CR0,s:RA,0,0,RA,0,0,RT,0,CR0,0
-rldicl,NORMAL,,2P,EXTRA3,d:RA;d:CR0,s:RS,0,0,0,0,RS,RA,0,CR0,0
-rldicr,NORMAL,,2P,EXTRA3,d:RA;d:CR0,s:RS,0,0,0,0,RS,RA,0,CR0,0
-rldic,NORMAL,,2P,EXTRA3,d:RA;d:CR0,s:RS,0,0,0,0,RS,RA,0,CR0,0
-subfme,NORMAL,,2P,EXTRA3,d:RT;d:CR0,s:RA,0,0,RA,0,0,RT,0,CR0,0
-addme,NORMAL,,2P,EXTRA3,d:RT;d:CR0,s:RA,0,0,RA,0,0,RT,0,CR0,0
-subfmeo,NORMAL,,2P,EXTRA3,d:RT;d:CR0,s:RA,0,0,RA,0,0,RT,0,CR0,0
-addmeo,NORMAL,,2P,EXTRA3,d:RT;d:CR0,s:RA,0,0,RA,0,0,RT,0,CR0,0
-srawi,NORMAL,,2P,EXTRA3,d:RA;d:CR0,s:RS,0,0,0,0,RS,RA,0,CR0,0
-sradi,NORMAL,,2P,EXTRA3,d:RA;d:CR0,s:RS,0,0,0,0,RS,RA,0,CR0,0
-sradi,NORMAL,,2P,EXTRA3,d:RA;d:CR0,s:RS,0,0,0,0,RS,RA,0,CR0,0
-extswsli,NORMAL,,2P,EXTRA3,d:RA;d:CR0,s:RS,0,0,0,0,RS,RA,0,CR0,0
-extswsli,NORMAL,,2P,EXTRA3,d:RA;d:CR0,s:RS,0,0,0,0,RS,RA,0,CR0,0
-grevi,NORMAL,,2P,EXTRA3,d:RT;d:CR0,s:RA,0,0,RA,0,0,RT,0,CR0,0
-grevwi,NORMAL,,2P,EXTRA3,d:RT;d:CR0,s:RA,0,0,RA,0,0,RT,0,CR0,0
+insn,mode,CONDITIONS,Ptype,Etype,SM,0,1,2,3,in1,in2,in3,out,CR in,CR out,out2
+mcrf,NORMAL,,2P,EXTRA3,0,d:BF,s:BFA,0,0,0,0,0,0,BFA,BF,0
+bclr,BRANCH,,2P,EXTRA3,0,d:BI,s:BI,0,0,SPR,SPR,0,SPR,BI,0,0
+mfcr/mfocrf,NORMAL,,2P,EXTRA3,0,d:RT,s:CR,0,0,0,0,0,RT,WHOLE_REG,0,0
+setb,NORMAL,,2P,EXTRA3,0,d:RT,s:BFA,0,0,0,0,0,RT,BFA,0,0
+bc,BRANCH,,2P,EXTRA3,0,d:BI,s:BI,0,0,SPR,0,0,SPR,BI,0,0
+5/0=ftsqrt,NORMAL,,2P,EXTRA3,0,d:BF,s:FRB,0,0,0,FRB,0,0,0,BF,0
+22/7=mtfsf,NORMAL,,2P,EXTRA3,0,d:CR1,s:FRB,0,0,0,FRB,0,0,0,CR1,0
+cmpli,NORMAL,,2P,EXTRA3,0,d:BF,s:RA,0,0,RA,0,0,0,0,BF,0
+cmpi,NORMAL,,2P,EXTRA3,0,d:BF,s:RA,0,0,RA,0,0,0,0,BF,0
+neg,NORMAL,,2P,EXTRA3,0,d:RT,s:RA,0,0,RA,0,0,RT,0,0,0
+popcntb,NORMAL,,2P,EXTRA3,0,d:RA,s:RS,0,0,RS,0,0,RA,0,0,0
+prtyw,NORMAL,,2P,EXTRA3,0,d:RA,s:RS,0,0,RS,0,0,RA,0,0,0
+prtyd,NORMAL,,2P,EXTRA3,0,d:RA,s:RS,0,0,RS,0,0,RA,0,0,0
+cdtbcd,NORMAL,,2P,EXTRA3,0,d:RA,s:RS,0,0,RS,0,0,RA,0,0,0
+cbcdtd,NORMAL,,2P,EXTRA3,0,d:RA,s:RS,0,0,RS,0,0,RA,0,0,0
+mfspr,NORMAL,,2P,EXTRA3,0,d:RS,s:SPR,0,0,SPR,0,0,RT,0,0,0
+popcntw,NORMAL,,2P,EXTRA3,0,d:RA,s:RS,0,0,RS,0,0,RA,0,0,0
+mtspr,NORMAL,,2P,EXTRA3,0,d:SPR,s:RS,0,0,RS,0,0,SPR,0,0,0
+popcntd,NORMAL,,2P,EXTRA3,0,d:RA,s:RS,0,0,RS,0,0,RA,0,0,0
+nego,NORMAL,,2P,EXTRA3,0,d:RT,s:RA,0,0,RA,0,0,RT,0,0,0
+addic,NORMAL,,2P,EXTRA3,0,d:RT,s:RA,0,0,RA,0,0,RT,0,0,0
+addi,NORMAL,,2P,EXTRA3,0,d:RT,s:RA,0,0,RA_OR_ZERO,0,0,RT,0,0,0
+addis,NORMAL,,2P,EXTRA3,0,d:RT,s:RA,0,0,RA_OR_ZERO,0,0,RT,0,0,0
+ori,NORMAL,,2P,EXTRA3,0,d:RA,s:RS,0,0,RS,0,0,RA,0,0,0
+oris,NORMAL,,2P,EXTRA3,0,d:RA,s:RS,0,0,RS,0,0,RA,0,0,0
+xori,NORMAL,,2P,EXTRA3,0,d:RA,s:RS,0,0,RS,0,0,RA,0,0,0
+xoris,NORMAL,,2P,EXTRA3,0,d:RA,s:RS,0,0,RS,0,0,RA,0,0,0
+subfic,NORMAL,,2P,EXTRA3,0,d:RT,s:RA,0,0,RA,0,0,RT,0,0,0
+fishmv,NORMAL,,2P,EXTRA3,0,d:FRS,s:FRS,0,0,FRS,0,0,FRS,0,0,0
+setvl,NORMAL,,2P,EXTRA3,0,d:RT,s:RA,0,0,RA_OR_ZERO,0,0,RT_OR_ZERO,0,CR0,0
+cntlzw,NORMAL,,2P,EXTRA3,0,d:RA;d:CR0,s:RS,0,0,RS,0,0,RA,0,CR0,0
+cntlzd,NORMAL,,2P,EXTRA3,0,d:RA;d:CR0,s:RS,0,0,RS,0,0,RA,0,CR0,0
+subfze,NORMAL,,2P,EXTRA3,0,d:RT;d:CR0,s:RA,0,0,RA,0,0,RT,0,CR0,0
+addze,NORMAL,,2P,EXTRA3,0,d:RT;d:CR0,s:RA,0,0,RA,0,0,RT,0,CR0,0
+cnttzw,NORMAL,,2P,EXTRA3,0,d:RA;d:CR0,s:RS,0,0,RS,0,0,RA,0,CR0,0
+cnttzd,NORMAL,,2P,EXTRA3,0,d:RA;d:CR0,s:RS,0,0,RS,0,0,RA,0,CR0,0
+subfzeo,NORMAL,,2P,EXTRA3,0,d:RT;d:CR0,s:RA,0,0,RA,0,0,RT,0,CR0,0
+addzeo,NORMAL,,2P,EXTRA3,0,d:RT;d:CR0,s:RA,0,0,RA,0,0,RT,0,CR0,0
+extsh,NORMAL,,2P,EXTRA3,0,d:RA;d:CR0,s:RS,0,0,RS,0,0,RA,0,CR0,0
+extsb,NORMAL,,2P,EXTRA3,0,d:RA;d:CR0,s:RS,0,0,RS,0,0,RA,0,CR0,0
+extsw,NORMAL,,2P,EXTRA3,0,d:RA;d:CR0,s:RS,0,0,RS,0,0,RA,0,CR0,0
+fsqrts,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fres,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+frsqrtes,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fcbrts,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fsinpis,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fasinpis,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fcospis,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+ftanpis,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+facospis,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fatanpis,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+frsqrts,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fsins,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fasins,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fcoss,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+ftans,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+facoss,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fatans,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+frecips,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fsinhs,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fasinhs,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fcoshs,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+ftanhs,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+facoshs,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fatanhs,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fexp2m1s,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+flog2p1s,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fexpm1s,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+flogp1s,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fexp10m1s,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+flog10p1s,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fcfids,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fexp2s,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+flog2s,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fexps,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+flogs,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fexp10s,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+flog10s,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fcfidus,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fsqrt,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fre,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+frsqrte,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+0/12=frsp,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+0/14=fctiw,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+0/15=fctiwz,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+1/8=fneg,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+2/8=fmr,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+4/8=fnabs,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+4/14=fctiwu,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+4/15=fctiwuz,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+8/8=fabs,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+12/8=frin,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+13/8=friz,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+14/8=frip,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+15/8=frim,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fcbrt,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fsinpi,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fasinpi,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fcospi,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+ftanpi,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+facospi,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fatanpi,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+18/7=mffs,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+frsqrt,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fsin,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fasin,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fcos,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+ftan,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+facos,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fatan,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+frecip,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fsinh,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fasinh,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fcosh,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+ftanh,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+facosh,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fatanh,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fexp2m1,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+flog2p1,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fexpm1,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+flogp1,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+25/14=fctid,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+25/15=fctidz,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fexp10m1,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+flog10p1,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+26/14=fcfid,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fexp2,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+flog2,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fexp,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+flog,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+29/14=fctidu,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+29/15=fctiduz,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+fexp10,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+flog10,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+30/14=fcfidu,NORMAL,,2P,EXTRA3,0,d:FRT;d:CR1,s:FRB,0,0,0,FRB,0,FRT,0,CR1,0
+addic.,NORMAL,,2P,EXTRA3,0,d:RT;d:CR0,s:RA,0,0,RA,0,0,RT,0,CR0,0
+rlwinm,NORMAL,,2P,EXTRA3,0,d:RA;d:CR0,s:RS,0,0,0,0,RS,RA,0,CR0,0
+andi.,NORMAL,,2P,EXTRA3,0,d:RA;d:CR0,s:RS,0,0,RS,0,0,RA,0,CR0,0
+andis.,NORMAL,,2P,EXTRA3,0,d:RA;d:CR0,s:RS,0,0,RS,0,0,RA,0,CR0,0
+mulli,NORMAL,,2P,EXTRA3,0,d:RT;d:CR0,s:RA,0,0,RA,0,0,RT,0,CR0,0
+rldicl,NORMAL,,2P,EXTRA3,0,d:RA;d:CR0,s:RS,0,0,0,0,RS,RA,0,CR0,0
+rldicr,NORMAL,,2P,EXTRA3,0,d:RA;d:CR0,s:RS,0,0,0,0,RS,RA,0,CR0,0
+rldic,NORMAL,,2P,EXTRA3,0,d:RA;d:CR0,s:RS,0,0,0,0,RS,RA,0,CR0,0
+subfme,NORMAL,,2P,EXTRA3,0,d:RT;d:CR0,s:RA,0,0,RA,0,0,RT,0,CR0,0
+addme,NORMAL,,2P,EXTRA3,0,d:RT;d:CR0,s:RA,0,0,RA,0,0,RT,0,CR0,0
+subfmeo,NORMAL,,2P,EXTRA3,0,d:RT;d:CR0,s:RA,0,0,RA,0,0,RT,0,CR0,0
+addmeo,NORMAL,,2P,EXTRA3,0,d:RT;d:CR0,s:RA,0,0,RA,0,0,RT,0,CR0,0
+srawi,NORMAL,,2P,EXTRA3,0,d:RA;d:CR0,s:RS,0,0,0,0,RS,RA,0,CR0,0
+sradi,NORMAL,,2P,EXTRA3,0,d:RA;d:CR0,s:RS,0,0,0,0,RS,RA,0,CR0,0
+sradi,NORMAL,,2P,EXTRA3,0,d:RA;d:CR0,s:RS,0,0,0,0,RS,RA,0,CR0,0
+extswsli,NORMAL,,2P,EXTRA3,0,d:RA;d:CR0,s:RS,0,0,0,0,RS,RA,0,CR0,0
+extswsli,NORMAL,,2P,EXTRA3,0,d:RA;d:CR0,s:RS,0,0,0,0,RS,RA,0,CR0,0
+grevi,NORMAL,,2P,EXTRA3,0,d:RT;d:CR0,s:RA,0,0,RA,0,0,RT,0,CR0,0
+grevwi,NORMAL,,2P,EXTRA3,0,d:RT;d:CR0,s:RA,0,0,RA,0,0,RT,0,CR0,0
diff --git a/openpower/isatables/RM-2P-2S1D.csv b/openpower/isatables/RM-2P-2S1D.csv
index 777a34e5..c2e95edf 100644
--- a/openpower/isatables/RM-2P-2S1D.csv
+++ b/openpower/isatables/RM-2P-2S1D.csv
@@ -1,2 +1,2 @@
-insn,mode,CONDITIONS,Ptype,Etype,0,1,2,3,in1,in2,in3,out,CR in,CR out,out2
-mtcrf/mtocrf,NORMAL,,2P,EXTRA2,d:CR,s:RS,s:CR,0,RS,0,0,0,WHOLE_REG,WHOLE_REG,0
+insn,mode,CONDITIONS,Ptype,Etype,SM,0,1,2,3,in1,in2,in3,out,CR in,CR out,out2
+mtcrf/mtocrf,NORMAL,,2P,EXTRA2,0,d:CR,s:RS,s:CR,0,RS,0,0,0,WHOLE_REG,WHOLE_REG,0
diff --git a/src/openpower/sv/sv_analysis.py b/src/openpower/sv/sv_analysis.py
index 135ce865..b0b9612f 100644
--- a/src/openpower/sv/sv_analysis.py
+++ b/src/openpower/sv/sv_analysis.py
@@ -717,7 +717,7 @@ def process_csvs(format):
     # create a CSV file, per category, with SV "augmentation" info
     # XXX note: 'out2' not added here, needs to be added to CSV files
     # KEEP TRACK OF THESE https://bugs.libre-soc.org/show_bug.cgi?id=619
-    csvcols = ['insn', 'mode', 'CONDITIONS', 'Ptype', 'Etype',]
+    csvcols = ['insn', 'mode', 'CONDITIONS', 'Ptype', 'Etype', 'SM']
     csvcols += ['0', '1', '2', '3']
     csvcols += ['in1', 'in2', 'in3', 'out', 'CR in', 'CR out']  # temporary
     for key in primarykeys:
@@ -785,6 +785,17 @@ def process_csvs(format):
             #print("regs", insn_name, regs)
             extra_classifier(insn_name, value, name, res, regs)
 
+            # source-mask is hard to detect, it's part of RM-nn-nn.
+            # to make disassembler easier, create a yes/no decision here
+            # see https://libre-soc.org/openpower/sv/svp64/#extra_remap
+            # MASK_SRC
+            vstripped = value.replace("LDST", "")
+            if vstripped in ['RM-2P-1S1D', 'RM-2P-2S',
+                         'RM-2P-2S1D', 'RM-2P-1S2D', 'RM-2P-3S',
+                        ]:
+                res['SM'] = '0'
+            else:
+                res['SM'] = '0'
             # add to svp64 csvs
             # for k in ['in1', 'in2', 'in3', 'out', 'CR in', 'CR out']:
             #    del res[k]
@@ -836,7 +847,7 @@ def process_csvs(format):
     for fname in glob_valid_csvs(pth):
         svp64_csv = svt.get_svp64_csv(fname)
 
-    csvcols = ['insn', 'mode', 'Ptype', 'Etype']
+    csvcols = ['insn', 'mode', 'Ptype', 'Etype', 'SM']
     csvcols += ['in1', 'in2', 'in3', 'out', 'out2', 'CR in', 'CR out']
 
     if format is Format.VHDL: