Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add unratified Zicfilp and Zicfiss extensions #153

Merged
merged 7 commits into from
Dec 1, 2023
Merged
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

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

## [3.14.1] - 2023-12-01
- Add support for Zicfilp and Zicfiss extensions

## [3.14.0] - 2023-11-30
- Include Sdext in the list of S extensions

Expand Down
3 changes: 2 additions & 1 deletion riscv_config/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from pkgutil import extend_path
__path__ = extend_path(__path__, __name__)
__version__ = '3.14.0'
__version__ = '3.14.1'

2 changes: 1 addition & 1 deletion riscv_config/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
] + Zvef_extensions + Zved_extensions

Z_extensions = [
"Zicbom", "Zicbop", "Zicboz", "Zicntr", "Zicsr", "Zicond", "Zifencei", "Zihintpause", "Zihpm",
"Zicbom", "Zicbop", "Zicboz", "Zicntr", "Zicsr", "Zicond", "Zicfilp", "Zicfiss", "Zifencei", "Zihintpause", "Zihpm",
"Zmmul",
"Zam", "Zabha", "Zacas",
"Zca", "Zcb", "Zcf", "Zcd" , "Zcmp", "Zcmt",
Expand Down
6 changes: 6 additions & 0 deletions riscv_config/schemaValidator.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ def _check_with_smrnmi_check(self, field, value):
"Register cannot be implemented without Smrnmi extension in ISA."
)

def _check_with_zicfiss_check(self, field, value):
global extension_list
if value and 'Zicfiss' not in extension_list:
self._error(field,
"Register cannot be implemented without Zicfiss extension in ISA."
)

def _check_with_satp_modes64(self, field, value):
pass
Expand Down
21 changes: 21 additions & 0 deletions riscv_config/schemas/schema_debug.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -942,6 +942,27 @@ hart_schema:
- schema: { wlrl: *ref_wlrl }
default: {ro_constant: 0}
default: {implemented: false}
pelp:
type: dict
schema:
description:
type: string
default: previous expected-landing-pad (ELP) state.
shadow: {type: string, default: , nullable: True}
shadow_type: {type: string, default: rw, nullable: True, allowed: ['rw','ro']}
msb: {type: integer, default: 18, allowed: [18]}
lsb: {type: integer, default: 18, allowed: [18]}
implemented: {type: boolean, default: true}
type:
type: dict
check_with:
- s_debug_check
oneof:
- schema: {ro_constant: {type: integer, max: 1 , min : 0}}
- schema: { warl: *ref_warl }
- schema: { wlrl: *ref_wlrl }
default: {ro_constant: 0}
default: {implemented: false}
debugver:
type: dict
schema:
Expand Down
Loading
Loading