Skip to content

Commit 7a1e528

Browse files
authored
Merge branch 'master' into zimop
Signed-off-by: Neel Gala <neelgala@incoresemi.com>
2 parents 241203c + bf8a33e commit 7a1e528

File tree

9 files changed

+530
-14
lines changed

9 files changed

+530
-14
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
TWINE_PASSWORD: ${{ secrets.PYPIPASSWORD }}
5353
run: |
5454
python setup.py sdist bdist_wheel
55-
twine upload dist/*
55+
twine upload dist/* --verbose
5656
5757
- name: Extract release notes
5858
id: extract-release-notes

CHANGELOG.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,25 @@
22

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

5-
## [3.13.3] - 2023-09-22
5+
6+
## [3.14.3] - 2023-12-01
67
- Add support for Zimop extension
78

9+
## [3.14.2] - 2023-12-01
10+
- Add Zcmop extension.
11+
12+
## [3.14.1] - 2023-12-01
13+
- Add support for Zicfilp and Zicfiss extensions
14+
15+
## [3.14.0] - 2023-11-30
16+
- Include Sdext in the list of S extensions
17+
18+
## [3.13.4] - 2023-10-30
19+
- Add support for Zabha extension
20+
21+
## [3.13.3] - 2023-09-23
22+
- do not assign subfield to None
23+
824
## [3.13.2] - 2023-09-20
925
- Perform satp checks only when the CSR is accessible.
1026

riscv_config/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
from pkgutil import extend_path
22
__path__ = extend_path(__path__, __name__)
3-
__version__ = '3.13.3'
3+
__version__ = '3.14.3'
4+

riscv_config/constants.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
] + Zvef_extensions + Zved_extensions
2222

2323
Z_extensions = [
24-
"Zicbom", "Zicbop", "Zicboz", "Zicntr", "Zicsr", "Zicond", "Zifencei", "Zihintpause", "Zihpm", "Zimop",
24+
"Zicbom", "Zicbop", "Zicboz", "Zicntr", "Zicsr", "Zicond", "Zicfilp", "Zicfiss", "Zifencei", "Zihintpause", "Zihpm", "Zimop",
2525
"Zmmul",
26-
"Zam", "Zacas",
27-
"Zca", "Zcb", "Zcf", "Zcd" , "Zcmp", "Zcmt",
26+
"Zam", "Zabha", "Zacas",
27+
"Zca", "Zcb", "Zcf", "Zcd" , "Zcmp", "Zcmt", "Zcmop",
2828
"Zfh", "Zfa",
2929
"Zfinx", "Zdinx", "Zhinx", "Zhinxmin",
3030
"Ztso",
@@ -33,7 +33,7 @@
3333
"Zpn", "Zpsf"
3434
] + Zve_extensions + Zvl_extensions
3535

36-
S_extensions = ['Smrnmi','Svnapot','Svadu']
36+
S_extensions = ['Smrnmi','Svnapot','Svadu', 'Sdext']
3737

3838
sub_extensions = Z_extensions + S_extensions
3939

riscv_config/schemaValidator.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ def _check_with_smrnmi_check(self, field, value):
4040
"Register cannot be implemented without Smrnmi extension in ISA."
4141
)
4242

43+
def _check_with_zicfiss_check(self, field, value):
44+
global extension_list
45+
if value and 'Zicfiss' not in extension_list:
46+
self._error(field,
47+
"Register cannot be implemented without Zicfiss extension in ISA."
48+
)
4349

4450
def _check_with_satp_modes64(self, field, value):
4551
pass

riscv_config/schemas/schema_debug.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -942,6 +942,27 @@ hart_schema:
942942
- schema: { wlrl: *ref_wlrl }
943943
default: {ro_constant: 0}
944944
default: {implemented: false}
945+
pelp:
946+
type: dict
947+
schema:
948+
description:
949+
type: string
950+
default: previous expected-landing-pad (ELP) state.
951+
shadow: {type: string, default: , nullable: True}
952+
shadow_type: {type: string, default: rw, nullable: True, allowed: ['rw','ro']}
953+
msb: {type: integer, default: 18, allowed: [18]}
954+
lsb: {type: integer, default: 18, allowed: [18]}
955+
implemented: {type: boolean, default: true}
956+
type:
957+
type: dict
958+
check_with:
959+
- s_debug_check
960+
oneof:
961+
- schema: {ro_constant: {type: integer, max: 1 , min : 0}}
962+
- schema: { warl: *ref_warl }
963+
- schema: { wlrl: *ref_wlrl }
964+
default: {ro_constant: 0}
965+
default: {implemented: false}
945966
debugver:
946967
type: dict
947968
schema:

0 commit comments

Comments
 (0)