From 8be8e4b360049dc0d11ff997044df1e30642019f Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Sat, 28 Nov 2020 14:47:25 +0000 Subject: [PATCH] further categorise SV ops --- openpower/opcode_regs_deduped.mdwn | 44 +++++++++++++++--------------- openpower/sv_analysis.py | 12 ++++++-- 2 files changed, 32 insertions(+), 24 deletions(-) diff --git a/openpower/opcode_regs_deduped.mdwn b/openpower/opcode_regs_deduped.mdwn index fd6182666..d20bd601d 100644 --- a/openpower/opcode_regs_deduped.mdwn +++ b/openpower/opcode_regs_deduped.mdwn @@ -10,23 +10,23 @@ LDST-2R-2W | - | LDST-3R | - | LDST-3R-CRo | - | LDST-3R-1W | - | - | - | -imm | - | -CRi | - | -CRi | - | -CRio | R | -1W | - | -1W-CRi | - | + | non-SV | +imm | non-SV | +CRi | non-SV | +CRi | non-SV | +CRio | R/TBD | +1W | non-SV | +1W-CRi | TBD | 1R | - | -1R-imm | - | -1R-CRo | - | -1R-CRio | - | +1R-imm | non-SV | +1R-CRo | I | +1R-CRio | TBD | 1R-1W | R | 1R-1W-imm | I | 1R-1W-CRo | R | 1R-1W-CRo | R | 1R-1W-CRio | R | -2R | - | +2R | non-SV | 2R-CRo | R | 2R-CRio | R | 2R-1W | R | @@ -192,7 +192,7 @@ minor_31.csv | 0b0011110111 | stbux | X-Form| minor_31.csv | 0b0110110111 | sthux | X-Form| """]] -## (-) +## (non-SV) [[!table data=""" CSV | opcode | asm | form| @@ -213,14 +213,14 @@ minor_31.csv | 0b1001010110 | sync | X-Form| minor_31.csv | 0b1111010110 | icbi | X-Form| """]] -## imm (-) +## imm (non-SV) [[!table data=""" CSV | opcode | asm | form| major.csv | 18 | b | I-Form| """]] -## CRi (-) +## CRi (non-SV) [[!table data=""" CSV | opcode | asm | form| @@ -229,14 +229,14 @@ minor_19.csv | 0b1000010000 | bcctr | XL-Form| minor_19.csv | 0b1000110000 | bctar | XL-Form| """]] -## CRi (-) +## CRi (non-SV) [[!table data=""" CSV | opcode | asm | form| major.csv | 16 | bc | B-Form| """]] -## CRio (R) +## CRio (R/TBD) [[!table data=""" CSV | opcode | asm | form| @@ -257,7 +257,7 @@ minor_63l.csv | 0b011000010 | 2/6=mtfsb0 | -Form| minor_63l.csv | 0b011000100 | 4/6=mtfsfi | -Form| """]] -## 1W (-) +## 1W (non-SV) [[!table data=""" CSV | opcode | asm | form| @@ -266,7 +266,7 @@ minor_31.csv | 0b0001010011 | mfmsr | X-Form| minor_31.csv | 0b0101010011 | mfspr | XFX-Form| """]] -## 1W-CRi (-) +## 1W-CRi (TBD) [[!table data=""" CSV | opcode | asm | form| @@ -285,7 +285,7 @@ minor_31.csv | 0b0100110010 | tlbie | X-Form| minor_31.csv | 0b0111010011 | mtspr | XFX-Form| """]] -## 1R-imm (-) +## 1R-imm (non-SV) [[!table data=""" CSV | opcode | asm | form| @@ -293,7 +293,7 @@ major.csv | 2 | tdi | D-Form| major.csv | 3 | twi | D-Form| """]] -## 1R-CRo (-) +## 1R-CRo (I) [[!table data=""" CSV | opcode | asm | form| @@ -301,7 +301,7 @@ major.csv | 10 | cmpli | D-Form| major.csv | 11 | cmpi | D-Form| """]] -## 1R-CRio (-) +## 1R-CRio (TBD) [[!table data=""" CSV | opcode | asm | form| @@ -414,7 +414,7 @@ minor_63l.csv | 0b111111001 | 25/15=fctidz | -Form| minor_63l.csv | 0b111111101 | 29/15=fctiduz | -Form| """]] -## 2R (-) +## 2R (non-SV) [[!table data=""" CSV | opcode | asm | form| diff --git a/openpower/sv_analysis.py b/openpower/sv_analysis.py index 8f7cfc44b..1713872e5 100644 --- a/openpower/sv_analysis.py +++ b/openpower/sv_analysis.py @@ -190,15 +190,23 @@ def process_csvs(): '2R-1W-CRio': 'R', '2R-1W-CRi': 'R', '2R-1W-CRo': 'R', + '2R': 'non-SV', '2R-1W': 'R', + '1R-CRio': 'TBD', '2R-CRio': 'R', '2R-CRo': 'R', '1R-1W-CRio': 'R', '1R-1W-CRo': 'R', '1R-1W': 'R', '1R-1W-imm': 'I', - '1R-Imm': 'U', - 'CRio': 'R', + '1R-CRo': 'I', + '1R-imm': 'non-SV', + '1W': 'non-SV', + '1W-CRi': 'TBD', + 'CRio': 'R/TBD', + 'CRi': 'non-SV', + 'imm': 'non-SV', + '': 'non-SV', 'LDST-2R-imm': 'S', 'LDST-2R-1W-imm': 'S', 'LDST-1R-1W-imm': 'I', -- 2.30.2