Merge pull request #150 from riscv-software-src/fix-subfield-assignment

do not assign subfield to None
riscv-software-src · Sep 23, 2023 · b550aaa · b550aaa
2 parents 1fa3713 + ddb60a5
commit b550aaa
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.13.3] - 2023-09-23
+  - do not assign subfield to None
+
 ## [3.13.2] - 2023-09-20
   - Perform satp checks only when the CSR is accessible.
 

diff --git a/riscv_config/__init__.py b/riscv_config/__init__.py
@@ -1,3 +1,3 @@
 from pkgutil import extend_path
 __path__ = extend_path(__path__, __name__)
-__version__ = '3.13.2'
+__version__ = '3.13.3'
diff --git a/riscv_config/warl.py b/riscv_config/warl.py
@@ -502,19 +502,18 @@ def create_uarch_depends(self, uarch_signals):
                             subfield = d.split('::')[1]
                         else:
                             depcsrname = d
-                            subfield = None
 
                         # if the depcsrname has the 'uarch_' prefix, then drop that dependency for all checks entirely
                         if depcsrname.startswith('uarch_'):
-                            subfield_str = '' if subfield is None else f'{subfield} field from '
+                            subfield_str = '' if subfield == '' else f'{subfield} field from '
                             logger.warning(f'WARL for csr {csrname} depends on \
 {subfield_str}uarch csr {depcsrname}. Treating this as a uarch dependency.')
-                            if subfield is None:
+                            if subfield == '':
                                 subfield = depcsrname
                                 depcsrname = 'uarch_signals'
                             if depcsrname not in self.uarch_depends:
                                 self.uarch_depends[depcsrname] = []
-                            if subfield is not None and subfield not in self.uarch_depends[depcsrname]:
+                            if subfield != '' and subfield not in self.uarch_depends[depcsrname]:
                                 self.uarch_depends[depcsrname].append(subfield)
                             logger.debug(f'uArch dependencies are: {self.uarch_depends}')
 
@@ -585,7 +584,6 @@ def iserr(self):
                             subfield = d.split('::')[1]
                         else:
                             depcsrname = d
-                            subfield = None
 
                         # if the csr is a uarch dependency and also exists in the spec, throw an error
                         if depcsrname in self.uarch_depends and depcsrname in self.spec:

diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.13.2
+current_version = 3.13.3
 commit = True
 tag = True