From c4e2ada937815c96fb3def609995f40ca8243089 Mon Sep 17 00:00:00 2001 From: Karthik B K Date: Tue, 28 May 2024 11:38:34 +0530 Subject: [PATCH 1/4] utils: log raw error message from load_yaml the load_yaml function performs a bit of post-processing on the error message obtained from the ruamel constructor. log the raw error message until the post-processing is corrected. Signed-off-by: Karthik B K --- riscv_config/utils.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/riscv_config/utils.py b/riscv_config/utils.py index dfd948f..1a9098a 100644 --- a/riscv_config/utils.py +++ b/riscv_config/utils.py @@ -45,8 +45,7 @@ def load_yaml(foo, no_anchors=False): return yaml.load(file) except ruamel.yaml.constructor.DuplicateKeyError as msg: logger = logging.getLogger(__name__) - error = "\n".join(str(msg).split("\n")[2:-7]) - logger.error(error) + logger.error(msg) raise SystemExit From 19afc2962ace2ecdc2149643a92d3553b3f1ff30 Mon Sep 17 00:00:00 2001 From: Karthik B K Date: Tue, 28 May 2024 11:41:11 +0530 Subject: [PATCH 2/4] isa_validator: nullify Svnapot in march strings the get_march_mabi function should return a string that can be consumed by the riscv-gcc right away. the compiler complains about the presence of svnapot in the said string. "nullify" this extension, resulting in exclusion during march generation. Signed-off-by: Karthik B K --- riscv_config/isa_validator.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/riscv_config/isa_validator.py b/riscv_config/isa_validator.py index 94f7412..98df6f3 100644 --- a/riscv_config/isa_validator.py +++ b/riscv_config/isa_validator.py @@ -210,6 +210,9 @@ def get_march_mabi (isa : str, opt_remove_custom_exts: bool = False): 'Zbf', 'Zbm', 'Zbr', + + # supervisor address translations + 'Svnapot', ] # add Zbp and Zbt to null_ext if Zbpbo is present From a5819eb8967d17957dfc51b30340586ec2148f4f Mon Sep 17 00:00:00 2001 From: Karthik B K Date: Tue, 28 May 2024 11:49:50 +0530 Subject: [PATCH 3/4] update changelog. Signed-off-by: Karthik B K --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cbde9be..00b1f0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [3.18.3] - 2024-05-28 + - exclude Svnapot from march generation. fixes #178. + - log raw error messages from ruamel while loading yamls. fixes #179. + ## [3.18.2] - 2024-04-16 - added yaml dump_flag which provides for the functions that dump yaml. From 01fd4985a6b8506317143b46e34e9387071e750c Mon Sep 17 00:00:00 2001 From: Karthik B K Date: Tue, 28 May 2024 11:50:03 +0530 Subject: [PATCH 4/4] =?UTF-8?q?Bump=20version:=203.18.2=20=E2=86=92=203.18?= =?UTF-8?q?.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- riscv_config/__init__.py | 2 +- setup.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/riscv_config/__init__.py b/riscv_config/__init__.py index 4c64bcc..3821f42 100644 --- a/riscv_config/__init__.py +++ b/riscv_config/__init__.py @@ -1,4 +1,4 @@ from pkgutil import extend_path __path__ = extend_path(__path__, __name__) -__version__ = '3.18.2' +__version__ = '3.18.3' diff --git a/setup.cfg b/setup.cfg index a21fc70..c6427e0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.18.2 +current_version = 3.18.3 commit = True tag = True