Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

Commit

Permalink
Compressed instruction support for rvopcodesdecoder (#73)
Browse files Browse the repository at this point in the history 
* fixed isac for compressed instr

* fixed isac for compressed instr

* Update rvopcodesdecoder.py

Signed-off-by: Mahendra Vamshi A <[email protected]>

* Update rvopcodesdecoder.py

added immideate feilds for compressed instructions

Signed-off-by: Mahendra Vamshi A <[email protected]>

* remove extra comments in the decoder.

Signed-off-by: Karthik B K <[email protected]>

* minor cleanup

Signed-off-by: Karthik B K <[email protected]>

* Update CHANGELOG.md

Signed-off-by: Karthik B K <[email protected]>

* Update setup.cfg to 0.18.0

Signed-off-by: Karthik B K <[email protected]>

* Update setup.py to 0.18.0

Signed-off-by: Karthik B K <[email protected]>

* Update __init__.py to version 0.18.0

Signed-off-by: Karthik B K <[email protected]>

---------

Signed-off-by: Mahendra Vamshi A <[email protected]>
Signed-off-by: Karthik B K <[email protected]>
Co-authored-by: vamshi <vamshi@LAPTOP-MTLHJ5FE>
Co-authored-by: Mahendra Vamshi A <[email protected]>
  • Loading branch information
@iamkarthikbk @mahendraVamshi
3 people authored Jul 27, 2023
1 parent a4b25fa commit db75040
Show file tree
Hide file tree
Showing 5 changed files with 198 additions and 10 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.18.0] - 2023-07-26
- Add support to decode compressed instructions

## [0.17.0] - 2022-10-25
- Improve data propagation reports to capture multiple signature updates per coverpoint
Expand Down
2 changes: 1 addition & 1 deletion riscv_isac/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@

__author__ = """InCore Semiconductors Pvt Ltd"""
__email__ = '[email protected]'
__version__ = '0.17.0'
__version__ = '0.18.0'

200 changes: 193 additions & 7 deletions riscv_isac/data/rvopcodesdecoder.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,9 +329,7 @@ def decode(self, instrObj_temp):
instr = None

temp_instrobj = instrObj_temp

mcode = temp_instrobj.instr

name_args = disassembler.get_instr(disassembler.INST_DICT, mcode)
if not name_args:
name_args = instr
Expand All @@ -355,25 +353,25 @@ def decode(self, instrObj_temp):
if file_name in ['rv_f', 'rv64_f', 'rv_d','rv64_d']:
reg_type = 'f'
for arg in args[:-1]:
if arg == 'rd':
if 'rd' in arg:
treg = reg_type
if any([instr_name.startswith(x) for x in [
'fcvt.w','fcvt.l','fmv.s','fmv.d','flt','feq','fle','fclass']]):
treg = 'x'
temp_instrobj.rd = (int(get_arg_val(arg)(mcode), 2), treg)
if arg == 'rs1':
if 'rs1' in arg:
treg = reg_type
if any([instr_name.startswith(x) for x in [
'fsw','fsd','fcvt.s','fcvt.d','fmv.w','fmv.l']]):
treg = 'x'
temp_instrobj.rs1 = (int(get_arg_val(arg)(mcode), 2), treg)
if arg == 'rs2':
if 'rs2' in arg:
treg = reg_type
temp_instrobj.rs2 = (int(get_arg_val(arg)(mcode), 2), treg)
if arg == 'rs3':
if 'rs3' in arg:
treg = reg_type
temp_instrobj.rs3 = (int(get_arg_val(arg)(mcode), 2), treg)
if arg == 'csr':
if 'csr' in arg:
temp_instrobj.csr = int(get_arg_val(arg)(mcode), 2)
if arg == 'shamt':
temp_instrobj.shamt = int(get_arg_val(arg)(mcode), 2)
Expand Down Expand Up @@ -420,6 +418,194 @@ def decode(self, instrObj_temp):
imm = imm[0] + imm_temp[-1] + imm[1:] + imm_temp[0:4] + '0'
else:
imm = imm + imm_temp
if arg == 'c_uimm7hi':
imm_temp = get_arg_val(arg)(mcode)
if imm:
imm = imm[-1] + imm_temp + imm[0] + '00'
else:
imm = imm_temp + imm
if arg == 'c_uimm7lo':
imm_temp = get_arg_val(arg)(mcode)
if imm:
imm = imm_temp[-1] + imm + imm_temp[0] + '00'
else:
imm = imm + imm_temp

if arg == 'c_uimm8lo':
imm_temp = get_arg_val(arg)(mcode)
if imm:
imm = imm_temp[-1] + imm + imm_temp[0] + '00'
else:
imm = imm + imm_temp
if arg == 'c_uimm8hi':
imm_temp = get_arg_val(arg)(mcode)
if imm:
imm = imm[-1] + imm_temp + imm[0] + '00'
else:
imm = imm_temp + imm

if arg == 'c_uimm9lo':
imm_temp = get_arg_val(arg)(mcode)
if imm:
imm = imm_temp[-1] + imm + imm_temp[0] + '00'
else:
imm = imm + imm_temp
elif arg == 'c_uimm9hi':
imm_temp = get_arg_val(arg)(mcode)
if imm:
imm = imm[-1] + imm_temp + imm[0] + '00'
else:
imm = imm_temp + imm

elif arg == 'c_nzimm6lo':
imm_temp = get_arg_val(arg)(mcode)
if imm:
imm = imm_temp[-1] + imm + imm_temp[0] + '00'
else:
imm = imm + imm_temp
elif arg == 'c_nzimm6hi':
imm_temp = get_arg_val(arg)(mcode)
if imm:
imm = imm[-1] + imm_temp + imm[0] + '00'
else:
imm = imm_temp + imm

elif arg == 'c_imm6lo':
imm_temp = get_arg_val(arg)(mcode)
if imm:
imm = imm_temp[-1] + imm + imm_temp[0] + '00'
else:
imm = imm + imm_temp
elif arg == 'c_imm6hi':
imm_temp = get_arg_val(arg)(mcode)
if imm:
imm = imm[-1] + imm_temp + imm[0] + '00'
else:
imm = imm_temp + imm

elif arg == 'c_nzimm10hi':
imm_temp = get_arg_val(arg)(mcode)
if imm:
imm = imm[-1] + imm_temp + imm[0] + '00'
else:
imm = imm_temp + imm
elif arg == 'c_nzimm10lo':
imm_temp = get_arg_val(arg)(mcode)
if imm:
imm = imm_temp[-1] + imm + imm_temp[0] + '00'
else:
imm = imm + imm_temp

elif arg == 'c_nzimm18hi':
imm_temp = get_arg_val(arg)(mcode)
if imm:
imm = imm[-1] + imm_temp + imm[0] + '00'
else:
imm = imm_temp + imm
elif arg == 'c_nzimm18lo':
imm_temp = get_arg_val(arg)(mcode)
if imm:
imm = imm_temp[-1] + imm + imm_temp[0] + '00'
else:
imm = imm + imm_temp

elif arg == 'c_imm12':
imm_temp = get_arg_val(arg)(mcode)
if imm:
imm = imm[-1] + imm_temp + imm[0] + '00'
else:
imm = imm_temp + imm

elif arg == 'c_bimm9lo':
imm_temp = get_arg_val(arg)(mcode)
if imm:
imm = imm_temp[-1] + imm + imm_temp[0] + '00'
else:
imm = imm + imm_temp
elif arg == 'c_bimm9hi':
imm_temp = get_arg_val(arg)(mcode)
if imm:
imm = imm[-1] + imm_temp + imm[0] + '00'
else:
imm = imm_temp + imm

elif arg == 'c_nzuimm5':
imm_temp = get_arg_val(arg)(mcode)
imm = imm_temp + imm

elif arg == 'c_nzuimm6lo':
imm_temp = get_arg_val(arg)(mcode)
if imm:
imm = imm_temp[-1] + imm + imm_temp[0] + '00'
else:
imm = imm + imm_temp


elif arg == 'c_nzuimm6hi':
imm_temp = get_arg_val(arg)(mcode)
if imm:
imm = imm[-1] + imm_temp + imm[0] + '00'
else:
imm = imm_temp + imm

elif arg == 'c_uimm8splo':
imm_temp = get_arg_val(arg)(mcode)
if imm:
imm = imm_temp[-1] + imm + imm_temp[0] + '00'
else:
imm = imm + imm_temp

elif arg == 'c_uimm8sphi':
imm_temp = get_arg_val(arg)(mcode)
if imm:
imm = imm[-1] + imm_temp + imm[0] + '00'
else:
imm = imm_temp + imm

elif arg == 'c_uimm8sp_s':
imm_temp = get_arg_val(arg)(mcode)
imm = imm[-1] + imm_temp + imm[0] + '00'

elif arg == 'c_uimm10splo':
imm_temp = get_arg_val(arg)(mcode)
if imm:
imm = imm_temp[-1] + imm + imm_temp[0] + '00'
else:
imm = imm + imm_temp

elif arg == 'c_uimm10sphi':
imm_temp = get_arg_val(arg)(mcode)
if imm:
imm = imm[-1] + imm_temp + imm[0] + '00'
else:
imm = imm_temp + imm

elif arg == 'c_uimm9splo':
imm_temp = get_arg_val(arg)(mcode)
if imm:
imm = imm_temp[-1] + imm + imm_temp[0] + '00'
else:
imm = imm + imm_temp

elif arg == 'c_uimm9sphi':
imm_temp = get_arg_val(arg)(mcode)
if imm:
imm = imm[-1] + imm_temp + imm[0] + '00'
else:
imm = imm_temp + imm

elif arg == 'c_uimm10sp_s':
imm_temp = get_arg_val(arg)(mcode)
imm = imm_temp + imm

elif arg == 'c_uimm9sp_s':
imm_temp = get_arg_val(arg)(mcode)
imm = imm_temp + imm

elif arg == 'c_nzuimm10':
imm_temp = get_arg_val(arg)(mcode)
imm = imm_temp + imm

if imm:
numbits = len(imm)
temp_instrobj.imm = disassembler.twos_comp(int(imm, 2), numbits)
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.17.0
current_version = 0.18.0
commit = True
tag = True

Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def read_requires():

setup(
name='riscv_isac',
version='0.17.0',
version='0.18.0',
description="RISC-V ISAC",
long_description=readme + '\n\n',
classifiers=[
Expand Down

0 comments on commit db75040

Please sign in to comment.