From c685c04a5cf033f5bdf488fd8786e150bc3cb81f Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Wed, 23 Dec 2020 23:46:28 +0000 Subject: [PATCH] comment out mcrxr --- openpower/opcode_regs_deduped.mdwn | 4 ---- openpower/sv_analysis.py | 8 ++++++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/openpower/opcode_regs_deduped.mdwn b/openpower/opcode_regs_deduped.mdwn index edc49125f..0dd0f6c8c 100644 --- a/openpower/opcode_regs_deduped.mdwn +++ b/openpower/opcode_regs_deduped.mdwn @@ -248,8 +248,6 @@ major.csv | 16 | bc | B-Form | [[!table data=""" CSV | opcode | asm | form | minor_19.csv | 0b0000000000 | mcrf | XL-Form | -minor_31.csv | 0b1000000000 | mcrxr | X-Form | -minor_31.csv | 0b1001000000 | mcrxrx | X-Form | minor_63l.csv | 0b000000010 | 2/0=mcrfs | -Form | minor_63l.csv | 0b011000001 | 1/6=mtfsb1 | -Form | minor_63l.csv | 0b011000010 | 2/6=mtfsb0 | -Form | @@ -730,8 +728,6 @@ sthux | 2P | EXTRA2 | d:RS | d:RA | s:RB | | RA_OR_ZERO | RB | RS | NONE | NONE [[!table data=""" insn | Ptype | Etype | 0 | 1 | 2 | 3 | mcrf | 2P | EXTRA3 | d:BF | s:BFA | | | NONE | NONE | NONE | NONE | BFA | BF | -mcrxr | 2P | EXTRA3 | TODO | | | | | | | | | | -mcrxrx | 2P | EXTRA3 | TODO | | | | | | | | | | 2/0=mcrfs | 2P | EXTRA3 | TODO | | | | NONE | NONE | NONE | NONE | 0 | 1 | 1/6=mtfsb1 | 2P | EXTRA3 | TODO | | | | NONE | NONE | NONE | NONE | 0 | 0 | 2/6=mtfsb0 | 2P | EXTRA3 | TODO | | | | NONE | NONE | NONE | NONE | 0 | 0 | diff --git a/openpower/sv_analysis.py b/openpower/sv_analysis.py index 109e69222..e716b807b 100644 --- a/openpower/sv_analysis.py +++ b/openpower/sv_analysis.py @@ -197,7 +197,11 @@ def process_csvs(): for row in csv: if blank_key(row): continue - insns[row['comment']] = row # accumulate csv data by instruction + insn_name = row['comment'] + # skip instructions that are not suitable + if insn_name in ['mcrxr', 'mcrxrx']: + continue + insns[insn_name] = row # accumulate csv data by instruction dkey = create_key(row) key = tuple(dkey.values()) # print("key=", key) @@ -205,7 +209,7 @@ def process_csvs(): primarykeys.add(key) if key not in bykey: bykey[key] = [] - bykey[key].append((csvname, row['opcode'], row['comment'], + bykey[key].append((csvname, row['opcode'], insn_name, row['form'].upper() + '-Form')) # detect immediates, collate them (useful info) -- 2.30.2