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

---
 openpower/isatables/RM-2P-1S1D.csv | 52 +++++++++++++++---------------
 openpower/sv_analysis.py           |  2 +-
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/openpower/isatables/RM-2P-1S1D.csv b/openpower/isatables/RM-2P-1S1D.csv
index 7ea4fe37b..69818ea33 100644
--- a/openpower/isatables/RM-2P-1S1D.csv
+++ b/openpower/isatables/RM-2P-1S1D.csv
@@ -34,29 +34,29 @@ 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
-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
+fsqrt,2P,EXTRA3,TODO,0,0,0,0,FRB,0,FRT,0,CR1
+fre,2P,EXTRA3,TODO,0,0,0,0,FRB,0,FRT,0,CR1
+frsqrte,2P,EXTRA3,TODO,0,0,0,0,FRB,0,FRT,0,CR1
+18/7=mffsfamily,2P,EXTRA3,TODO,0,0,0,0,FRB,0,FRT,0,CR1
+1/8=fneg,2P,EXTRA3,TODO,0,0,0,0,FRB,0,FRT,0,CR1
+2/8=fmr,2P,EXTRA3,TODO,0,0,0,0,FRB,0,FRT,0,CR1
+4/8=fnabs,2P,EXTRA3,TODO,0,0,0,0,FRB,0,FRT,0,CR1
+8/8=fabs,2P,EXTRA3,TODO,0,0,0,0,FRB,0,FRT,0,CR1
+12/8=frin,2P,EXTRA3,TODO,0,0,0,0,FRB,0,FRT,0,CR1
+13/8=friz,2P,EXTRA3,TODO,0,0,0,0,FRB,0,FRT,0,CR1
+14/8=frip,2P,EXTRA3,TODO,0,0,0,0,FRB,0,FRT,0,CR1
+15/8=frim,2P,EXTRA3,TODO,0,0,0,0,FRB,0,FRT,0,CR1
+0/12=frsp,2P,EXTRA3,TODO,0,0,0,0,FRB,0,FRT,0,CR1
+0/14=fctiw,2P,EXTRA3,TODO,0,0,0,0,FRB,0,FRT,0,CR1
+4/14=fctiwu,2P,EXTRA3,TODO,0,0,0,0,FRB,0,FRT,0,CR1
+25/14=fctid,2P,EXTRA3,TODO,0,0,0,0,FRB,0,FRT,0,CR1
+26/14=fcfid,2P,EXTRA3,TODO,0,0,0,0,FRB,0,FRT,0,CR1
+29/14=fctidu,2P,EXTRA3,TODO,0,0,0,0,FRB,0,FRT,0,CR1
+30/14=fcfidu,2P,EXTRA3,TODO,0,0,0,0,FRB,0,FRT,0,CR1
+0/15=fctiwz,2P,EXTRA3,TODO,0,0,0,0,FRB,0,FRT,0,CR1
+4/15=fctiwuz,2P,EXTRA3,TODO,0,0,0,0,FRB,0,FRT,0,CR1
+25/15=fctidz,2P,EXTRA3,TODO,0,0,0,0,FRB,0,FRT,0,CR1
+29/15=fctiduz,2P,EXTRA3,TODO,0,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
@@ -78,6 +78,6 @@ sradi,2P,EXTRA3,"d:RA,d:CR0",s:RS,0,0,0,0,RS,RA,0,CR0
 extswsli,2P,EXTRA3,"d:RA,d:CR0",s:RS,0,0,0,0,RS,RA,0,CR0
 extswsli,2P,EXTRA3,"d:RA,d:CR0",s:RS,0,0,0,0,RS,RA,0,CR0
 fcfid[u]s,2P,EXTRA3,TODO,0,0,0,0,FRB,0,FRT,0,0
-fsqrts,2P,EXTRA3,TODO,0,0,0,0,FRB,0,FRT,0,CR1
-fres,2P,EXTRA3,TODO,0,0,0,0,FRB,0,FRT,0,CR1
-frsqrtes,2P,EXTRA3,TODO,0,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
diff --git a/openpower/sv_analysis.py b/openpower/sv_analysis.py
index 381ec7f4d..6e59d9b17 100644
--- a/openpower/sv_analysis.py
+++ b/openpower/sv_analysis.py
@@ -449,7 +449,7 @@ def process_csvs():
                 elif regs == ['RS','','','RA','','']:
                     res['0'] = 'd:RA' # RA: Rdest1_EXTRA3
                     res['1'] = 's:RS' # RS: Rsrc1_EXTRA3
-                elif regs == ['','FRB','','FRT','','CR1']:
+                elif regs == ['','FRB','','FRT','0','CR1']:
                     res['0'] = 'd:FRT,d:CR1' # FRT,CR1: Rdest1_EXTRA3
                     res['1'] = 's:FRA' # FRA: Rsrc1_EXTRA3
                 else:
-- 
2.30.2