From 147aa1fe6bc113edafcc434ffdfc2dff485499b7 Mon Sep 17 00:00:00 2001
From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Tue, 29 Dec 2020 14:16:23 +0000
Subject: [PATCH] update sv_analysis

---
 openpower/isatables/RM-2P-1S1D.csv | 56 +++++++++++++++---------------
 openpower/sv_analysis.py           |  5 ++-
 2 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/openpower/isatables/RM-2P-1S1D.csv b/openpower/isatables/RM-2P-1S1D.csv
index faef81959..478a62cfc 100644
--- a/openpower/isatables/RM-2P-1S1D.csv
+++ b/openpower/isatables/RM-2P-1S1D.csv
@@ -3,7 +3,7 @@ mcrf,2P,EXTRA3,d:BF,s:BFA,0,0,0,0,0,0,BFA,BF
 mfcr/mfocrf,2P,EXTRA3,d:RT,s:CR,0,0,0,0,0,RT,WHOLE_REG,0
 setb,2P,EXTRA3,d:RT,s:BFA,0,0,0,0,0,RT,BFA,0
 5/0=ftsqrt,2P,EXTRA3,TODO,0,0,0,0,FRB,0,0,0,BF
-22/7=mtfsf,2P,EXTRA3,TODO,0,0,0,0,FRB,0,0,0,CR1
+22/7=mtfsf,2P,EXTRA3,d:BF,s:FRB,0,0,0,FRB,0,0,0,CR1
 cmpli,2P,EXTRA3,d:BF,s:RA,0,0,RA,0,0,0,0,BF
 cmpi,2P,EXTRA3,d:BF,s:RA,0,0,RA,0,0,0,0,BF
 neg,2P,EXTRA3,d:RT,s:RA,0,0,RA,0,0,RT,0,0
@@ -34,33 +34,33 @@ addzeo,2P,EXTRA3,"d:RT,d:CR0",s:RA,0,0,RA,0,0,RT,0,CR0
 extsh,2P,EXTRA3,"d:RA,d:CR0",s:RS,0,0,RS,0,0,RA,0,CR0
 extsb,2P,EXTRA3,"d:RA,d:CR0",s:RS,0,0,RS,0,0,RA,0,CR0
 extsw,2P,EXTRA3,"d:RA,d:CR0",s:RS,0,0,RS,0,0,RA,0,CR0
-fcfid[u]s,2P,EXTRA3,"d:FRT,d:CR1",s:FRA,0,0,0,FRB,0,FRT,0,CR1
-fsqrts,2P,EXTRA3,"d:FRT,d:CR1",s:FRA,0,0,0,FRB,0,FRT,0,CR1
-fres,2P,EXTRA3,"d:FRT,d:CR1",s:FRA,0,0,0,FRB,0,FRT,0,CR1
-frsqrtes,2P,EXTRA3,"d:FRT,d:CR1",s:FRA,0,0,0,FRB,0,FRT,0,CR1
-fsqrt,2P,EXTRA3,"d:FRT,d:CR1",s:FRA,0,0,0,FRB,0,FRT,0,CR1
-fre,2P,EXTRA3,"d:FRT,d:CR1",s:FRA,0,0,0,FRB,0,FRT,0,CR1
-frsqrte,2P,EXTRA3,"d:FRT,d:CR1",s:FRA,0,0,0,FRB,0,FRT,0,CR1
-18/7=mffsfamily,2P,EXTRA3,"d:FRT,d:CR1",s:FRA,0,0,0,FRB,0,FRT,0,CR1
-1/8=fneg,2P,EXTRA3,"d:FRT,d:CR1",s:FRA,0,0,0,FRB,0,FRT,0,CR1
-2/8=fmr,2P,EXTRA3,"d:FRT,d:CR1",s:FRA,0,0,0,FRB,0,FRT,0,CR1
-4/8=fnabs,2P,EXTRA3,"d:FRT,d:CR1",s:FRA,0,0,0,FRB,0,FRT,0,CR1
-8/8=fabs,2P,EXTRA3,"d:FRT,d:CR1",s:FRA,0,0,0,FRB,0,FRT,0,CR1
-12/8=frin,2P,EXTRA3,"d:FRT,d:CR1",s:FRA,0,0,0,FRB,0,FRT,0,CR1
-13/8=friz,2P,EXTRA3,"d:FRT,d:CR1",s:FRA,0,0,0,FRB,0,FRT,0,CR1
-14/8=frip,2P,EXTRA3,"d:FRT,d:CR1",s:FRA,0,0,0,FRB,0,FRT,0,CR1
-15/8=frim,2P,EXTRA3,"d:FRT,d:CR1",s:FRA,0,0,0,FRB,0,FRT,0,CR1
-0/12=frsp,2P,EXTRA3,"d:FRT,d:CR1",s:FRA,0,0,0,FRB,0,FRT,0,CR1
-0/14=fctiw,2P,EXTRA3,"d:FRT,d:CR1",s:FRA,0,0,0,FRB,0,FRT,0,CR1
-4/14=fctiwu,2P,EXTRA3,"d:FRT,d:CR1",s:FRA,0,0,0,FRB,0,FRT,0,CR1
-25/14=fctid,2P,EXTRA3,"d:FRT,d:CR1",s:FRA,0,0,0,FRB,0,FRT,0,CR1
-26/14=fcfid,2P,EXTRA3,"d:FRT,d:CR1",s:FRA,0,0,0,FRB,0,FRT,0,CR1
-29/14=fctidu,2P,EXTRA3,"d:FRT,d:CR1",s:FRA,0,0,0,FRB,0,FRT,0,CR1
-30/14=fcfidu,2P,EXTRA3,"d:FRT,d:CR1",s:FRA,0,0,0,FRB,0,FRT,0,CR1
-0/15=fctiwz,2P,EXTRA3,"d:FRT,d:CR1",s:FRA,0,0,0,FRB,0,FRT,0,CR1
-4/15=fctiwuz,2P,EXTRA3,"d:FRT,d:CR1",s:FRA,0,0,0,FRB,0,FRT,0,CR1
-25/15=fctidz,2P,EXTRA3,"d:FRT,d:CR1",s:FRA,0,0,0,FRB,0,FRT,0,CR1
-29/15=fctiduz,2P,EXTRA3,"d:FRT,d:CR1",s:FRA,0,0,0,FRB,0,FRT,0,CR1
+fcfid[u]s,2P,EXTRA3,"d:FRT,d:CR1",s:FRB,0,0,0,FRB,0,FRT,0,CR1
+fsqrts,2P,EXTRA3,"d:FRT,d:CR1",s:FRB,0,0,0,FRB,0,FRT,0,CR1
+fres,2P,EXTRA3,"d:FRT,d:CR1",s:FRB,0,0,0,FRB,0,FRT,0,CR1
+frsqrtes,2P,EXTRA3,"d:FRT,d:CR1",s:FRB,0,0,0,FRB,0,FRT,0,CR1
+fsqrt,2P,EXTRA3,"d:FRT,d:CR1",s:FRB,0,0,0,FRB,0,FRT,0,CR1
+fre,2P,EXTRA3,"d:FRT,d:CR1",s:FRB,0,0,0,FRB,0,FRT,0,CR1
+frsqrte,2P,EXTRA3,"d:FRT,d:CR1",s:FRB,0,0,0,FRB,0,FRT,0,CR1
+18/7=mffsfamily,2P,EXTRA3,"d:FRT,d:CR1",s:FRB,0,0,0,FRB,0,FRT,0,CR1
+1/8=fneg,2P,EXTRA3,"d:FRT,d:CR1",s:FRB,0,0,0,FRB,0,FRT,0,CR1
+2/8=fmr,2P,EXTRA3,"d:FRT,d:CR1",s:FRB,0,0,0,FRB,0,FRT,0,CR1
+4/8=fnabs,2P,EXTRA3,"d:FRT,d:CR1",s:FRB,0,0,0,FRB,0,FRT,0,CR1
+8/8=fabs,2P,EXTRA3,"d:FRT,d:CR1",s:FRB,0,0,0,FRB,0,FRT,0,CR1
+12/8=frin,2P,EXTRA3,"d:FRT,d:CR1",s:FRB,0,0,0,FRB,0,FRT,0,CR1
+13/8=friz,2P,EXTRA3,"d:FRT,d:CR1",s:FRB,0,0,0,FRB,0,FRT,0,CR1
+14/8=frip,2P,EXTRA3,"d:FRT,d:CR1",s:FRB,0,0,0,FRB,0,FRT,0,CR1
+15/8=frim,2P,EXTRA3,"d:FRT,d:CR1",s:FRB,0,0,0,FRB,0,FRT,0,CR1
+0/12=frsp,2P,EXTRA3,"d:FRT,d:CR1",s:FRB,0,0,0,FRB,0,FRT,0,CR1
+0/14=fctiw,2P,EXTRA3,"d:FRT,d:CR1",s:FRB,0,0,0,FRB,0,FRT,0,CR1
+4/14=fctiwu,2P,EXTRA3,"d:FRT,d:CR1",s:FRB,0,0,0,FRB,0,FRT,0,CR1
+25/14=fctid,2P,EXTRA3,"d:FRT,d:CR1",s:FRB,0,0,0,FRB,0,FRT,0,CR1
+26/14=fcfid,2P,EXTRA3,"d:FRT,d:CR1",s:FRB,0,0,0,FRB,0,FRT,0,CR1
+29/14=fctidu,2P,EXTRA3,"d:FRT,d:CR1",s:FRB,0,0,0,FRB,0,FRT,0,CR1
+30/14=fcfidu,2P,EXTRA3,"d:FRT,d:CR1",s:FRB,0,0,0,FRB,0,FRT,0,CR1
+0/15=fctiwz,2P,EXTRA3,"d:FRT,d:CR1",s:FRB,0,0,0,FRB,0,FRT,0,CR1
+4/15=fctiwuz,2P,EXTRA3,"d:FRT,d:CR1",s:FRB,0,0,0,FRB,0,FRT,0,CR1
+25/15=fctidz,2P,EXTRA3,"d:FRT,d:CR1",s:FRB,0,0,0,FRB,0,FRT,0,CR1
+29/15=fctiduz,2P,EXTRA3,"d:FRT,d:CR1",s:FRB,0,0,0,FRB,0,FRT,0,CR1
 addic.,2P,EXTRA3,"d:RT,d:CR0",s:RA,0,0,RA,0,0,RT,0,CR0
 rlwinm,2P,EXTRA3,"d:RA,d:CR0",s:RS,0,0,0,0,RS,RA,0,CR0
 andi.,2P,EXTRA3,"d:RA,d:CR0",s:RS,0,0,RS,0,0,RA,0,CR0
diff --git a/openpower/sv_analysis.py b/openpower/sv_analysis.py
index 27e44e5df..0d9c44458 100644
--- a/openpower/sv_analysis.py
+++ b/openpower/sv_analysis.py
@@ -452,9 +452,12 @@ def process_csvs():
                 elif regs == ['','FRB','','FRT','0','CR1']:
                     res['0'] = 'd:FRT,d:CR1' # FRT,CR1: Rdest1_EXTRA3
                     res['1'] = 's:FRA' # FRA: Rsrc1_EXTRA3
+                elif regs == ['','FRB','','','','CR1']:
+                    res['0'] = 'd:BF' # BF: Rdest1_EXTRA3
+                    res['1'] = 's:FRB' # FRA: Rsrc1_EXTRA3
                 elif regs == ['','FRB','','FRT','','CR1']:
                     res['0'] = 'd:FRT,d:CR1' # FRT,CR1: Rdest1_EXTRA3
-                    res['1'] = 's:FRA' # FRA: Rsrc1_EXTRA3
+                    res['1'] = 's:FRB' # FRB: Rsrc1_EXTRA3
                 else:
                     res['0'] = 'TODO'
 
-- 
2.30.2