From 4a22d35cb3c6ef04fc1ba423e862ffc01560363f Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Wed, 23 Dec 2020 23:39:10 +0000 Subject: [PATCH] updating sv_analys.py svp64 table --- openpower/opcode_regs_deduped.mdwn | 62 +++++++++++++++--------------- openpower/sv_analysis.py | 6 +-- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/openpower/opcode_regs_deduped.mdwn b/openpower/opcode_regs_deduped.mdwn index 953a0f539..403ee397d 100644 --- a/openpower/opcode_regs_deduped.mdwn +++ b/openpower/opcode_regs_deduped.mdwn @@ -647,45 +647,45 @@ std | 2P | EXTRA3 | d:RS | s:RA | | | RA_OR_ZERO | | RS | NONE | NONE | NONE [[!table data=""" insn | Ptype | Etype | 0 | 1 | 2 | 3 | -lwarx | 2P | EXTRA2 | | | | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | RT | RA | RB | -ldx | 2P | EXTRA2 | | | | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | RT | RA | RB | -lwzx | 2P | EXTRA2 | | | | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | RT | RA | RB | -lbarx | 2P | EXTRA2 | | | | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | RT | RA | RB | -ldarx | 2P | EXTRA2 | | | | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | RT | RA | RB | -lbzx | 2P | EXTRA2 | | | | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | RT | RA | RB | -lharx | 2P | EXTRA2 | | | | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | RT | RA | RB | -lhzx | 2P | EXTRA2 | | | | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | RT | RA | RB | -lwax | 2P | EXTRA2 | | | | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | RT | RA | RB | -lhax | 2P | EXTRA2 | | | | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | RT | RA | RB | -ldbrx | 2P | EXTRA2 | | | | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | RT | RA | RB | -lwbrx | 2P | EXTRA2 | | | | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | RT | RA | RB | -lwzcix | 2P | EXTRA2 | | | | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | RT | RA | RB | -lhbrx | 2P | EXTRA2 | | | | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | RT | RA | RB | -lhzcix | 2P | EXTRA2 | | | | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | RT | RA | RB | -lbzcix | 2P | EXTRA2 | | | | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | RT | RA | RB | -ldcix | 2P | EXTRA2 | | | | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | RT | RA | RB | +lwarx | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | d:RT | +ldx | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | d:RT | +lwzx | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | d:RT | +lbarx | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | d:RT | +ldarx | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | d:RT | +lbzx | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | d:RT | +lharx | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | d:RT | +lhzx | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | d:RT | +lwax | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | d:RT | +lhax | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | d:RT | +ldbrx | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | d:RT | +lwbrx | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | d:RT | +lwzcix | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | d:RT | +lhbrx | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | d:RT | +lhzcix | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | d:RT | +lbzcix | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | d:RT | +ldcix | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | d:RT | """]] ## LDST-2R-1W-imm (LDSTRM-2P-2S1D) [[!table data=""" insn | Ptype | Etype | 0 | 1 | 2 | 3 | -stwu | 2P | EXTRA2 | | | | | RA_OR_ZERO | | RS | NONE | NONE | NONE | RT | RA | RB | -stbu | 2P | EXTRA2 | | | | | RA_OR_ZERO | | RS | NONE | NONE | NONE | RT | RA | RB | -sthu | 2P | EXTRA2 | | | | | RA_OR_ZERO | | RS | NONE | NONE | NONE | RT | RA | RB | -stdu | 2P | EXTRA2 | | | | | RA_OR_ZERO | | RS | NONE | NONE | NONE | RT | RA | RB | +stwu | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | | RS | NONE | NONE | NONE | d:RT | +stbu | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | | RS | NONE | NONE | NONE | d:RT | +sthu | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | | RS | NONE | NONE | NONE | d:RT | +stdu | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | | RS | NONE | NONE | NONE | d:RT | """]] ## LDST-2R-2W (LDSTRM-2P-2S1D) [[!table data=""" insn | Ptype | Etype | 0 | 1 | 2 | 3 | -ldux | 2P | EXTRA2 | | | | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | RT | RA | RB | -lwzux | 2P | EXTRA2 | | | | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | RT | RA | RB | -lbzux | 2P | EXTRA2 | | | | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | RT | RA | RB | -lhzux | 2P | EXTRA2 | | | | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | RT | RA | RB | -lwaux | 2P | EXTRA2 | | | | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | RT | RA | RB | -lhaux | 2P | EXTRA2 | | | | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | RT | RA | RB | +ldux | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | d:RT | +lwzux | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | d:RT | +lbzux | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | d:RT | +lhzux | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | d:RT | +lwaux | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | d:RT | +lhaux | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | RB | NONE | RT | NONE | NONE | d:RT | """]] ## LDST-3R (LDSTRM-2P-3S) @@ -719,10 +719,10 @@ sthcx | 2P | EXTRA2 | s:RS,d:CR0 | s:RA | s:RB | | RA_OR_ZERO | RB | RS | NONE [[!table data=""" insn | Ptype | Etype | 0 | 1 | 2 | 3 | -stdux | 2P | EXTRA2 | | | | | RA_OR_ZERO | RB | RS | NONE | NONE | NONE | RT | RA | RB | -stwux | 2P | EXTRA2 | | | | | RA_OR_ZERO | RB | RS | NONE | NONE | NONE | RT | RA | RB | -stbux | 2P | EXTRA2 | | | | | RA_OR_ZERO | RB | RS | NONE | NONE | NONE | RT | RA | RB | -sthux | 2P | EXTRA2 | | | | | RA_OR_ZERO | RB | RS | NONE | NONE | NONE | RT | RA | RB | +stdux | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | RB | RS | NONE | NONE | NONE | d:RT | +stwux | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | RB | RS | NONE | NONE | NONE | d:RT | +stbux | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | RB | RS | NONE | NONE | NONE | d:RT | +sthux | 2P | EXTRA2 | | s:RA | s:RB | | RA_OR_ZERO | RB | RS | NONE | NONE | NONE | d:RT | """]] ## CRio (RM-2P-1S1D) diff --git a/openpower/sv_analysis.py b/openpower/sv_analysis.py index 63a0580f8..7d953707e 100644 --- a/openpower/sv_analysis.py +++ b/openpower/sv_analysis.py @@ -381,9 +381,9 @@ def process_csvs(): res['2'] = 's:RB' # RB: Rsrc1_EXTRA2 else: res['Etype'] = 'EXTRA2' # RM EXTRA2 type - res['d0'] = 'RT' # RT: Rdest1_EXTRA2 - res['s1'] = 'RA' # RA: Rsrc1_EXTRA2 - res['s2'] = 'RB' # RB: Rsrc2_EXTRA2 + res['d0'] = 'd:RT' # RT: Rdest1_EXTRA2 + res['1'] = 's:RA' # RA: Rsrc1_EXTRA2 + res['2'] = 's:RB' # RB: Rsrc2_EXTRA2 elif value == 'LDSTRM-2P-3S': res['Etype'] = 'EXTRA2' # RM EXTRA2 type -- 2.30.2