Merge pull request #180 from iamkarthikbk/master

exclude svnapot and fix errors logged from ruamel.

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.
 

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'
 

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

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
 
 

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.18.2
+current_version = 3.18.3
 commit = True
 tag = True