From 4f2ccff44c270893f145d7107568710a1902c3b7 Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Mon, 28 Dec 2020 20:11:12 +0000 Subject: [PATCH] add mfspr and mtspr to sv_analysis.py --- openpower/isatables/RM-2P-1S1D.csv | 4 ++-- openpower/sv_analysis.py | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/openpower/isatables/RM-2P-1S1D.csv b/openpower/isatables/RM-2P-1S1D.csv index 49bcb6d38..393bc2482 100644 --- a/openpower/isatables/RM-2P-1S1D.csv +++ b/openpower/isatables/RM-2P-1S1D.csv @@ -12,9 +12,9 @@ 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,TODO,,,,SPR,NONE,NONE,RT,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,TODO,,,,RS,NONE,NONE,SPR,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 diff --git a/openpower/sv_analysis.py b/openpower/sv_analysis.py index 9698bc457..955938564 100644 --- a/openpower/sv_analysis.py +++ b/openpower/sv_analysis.py @@ -416,7 +416,13 @@ def process_csvs(): elif value == 'RM-2P-1S1D': res['Etype'] = 'EXTRA3' # RM EXTRA3 type - if name == 'CRio' and insn_name == 'mcrf': + if insn_name == 'mtspr': + res['0'] = 'd:SPR' # SPR: Rdest1_EXTRA3 + res['1'] = 's:RS' # RS: Rsrc1_EXTRA3 + elif insn_name == 'mfspr': + res['0'] = 'd:RS' # RS: Rdest1_EXTRA3 + res['1'] = 's:SPR' # SPR: Rsrc1_EXTRA3 + elif name == 'CRio' and insn_name == 'mcrf': res['0'] = 'd:BF' # BFA: Rdest1_EXTRA3 res['1'] = 's:BFA' # BFA: Rsrc1_EXTRA3 elif 'mfcr' in insn_name or 'mfocrf' in insn_name: -- 2.30.2