Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion riscv_config/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"Zicbom", "Zicbop", "Zicboz", "Zicntr", "Zicsr", "Zicond", "Zicfilp", "Zicfiss", "Zifencei", "Zihintpause", "Zihpm", "Zilsd", "Zimop",
"Zmmul",
"Zam", "Zabha", "Zacas", "Zalasr",
"Zca", "Zcb", "Zcf", "Zcd" , "Zcmp", "Zcmt", "Zcmop", "Zcmlsd",
"Zca", "Zcb", "Zcf", "Zcd" , "Zcmp", "Zcmt", "Zcmop", "Zclsd",
"Zfh", "Zfa",
"Zfinx", "Zdinx", "Zhinx", "Zhinxmin",
"Ztso",
Expand Down
8 changes: 4 additions & 4 deletions riscv_config/isa_validator.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ def get_extension_list(isa):
if 'S' in extension_list and not 'U' in extension_list:
err_list.append( "S cannot exist without U.")
err = True
if 'Zcmlsd' in extension_list and 'Zcf' in extension_list:
err_list.append( "Zcmlsd encodings are mutually exclusive with Zcf.")
if 'Zclsd' in extension_list and 'Zcf' in extension_list:
err_list.append( "Zclsd encodings are mutually exclusive with Zcf.")
err = True
if 'Zcmlsd' in extension_list and 'Zilsd' not in extension_list:
err_list.append( "Zcmlsd cannot exist without Zilsd.")
if 'Zclsd' in extension_list and 'Zilsd' not in extension_list:
err_list.append( "Zclsd cannot exist without Zilsd.")
err = True
if 'Zkn' in extension_list and ( set(['Zbkb', 'Zbkc', 'Zbkx', 'Zkne', 'Zknd', 'Zknh']) & set(extension_list)):
err_list.append( "Zkn is a superset of Zbkb, Zbkc, Zbkx, Zkne, Zknd, Zknh. In presence of Zkn the subsets must be ignored in the ISA string.")
Expand Down