From f9fb1c7ed805ef40803e135f77916230eced1049 Mon Sep 17 00:00:00 2001 From: Tim Fischer Date: Tue, 4 Feb 2025 18:05:29 +0100 Subject: [PATCH] lint: Python sources --- util/clustergen.py | 1 + util/clustergen/cluster.py | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/util/clustergen.py b/util/clustergen.py index 59165e3e6..88c5a71ea 100755 --- a/util/clustergen.py +++ b/util/clustergen.py @@ -16,6 +16,7 @@ # Regex to find hex numbers with optional underscores HEX_PATTERN = re.compile(r"0x[0-9a-fA-F]+(?:_[0-9a-fA-F]+)*") + def preprocess_hex_in_hjson(text): """ Converts hex numbers (e.g., 0x8000_0000) to decimal before parsing HJSON. """ def hex_to_decimal(match): diff --git a/util/clustergen/cluster.py b/util/clustergen/cluster.py index 86a8cb515..599f92a26 100644 --- a/util/clustergen/cluster.py +++ b/util/clustergen/cluster.py @@ -246,7 +246,8 @@ def gen_pma_cfg(self): pma_cfg = PMACfg() for region in self.cfg['external_addr_regions']: if region["cacheable"]: - pma_cfg.add_region_length(PMA.CACHED, region['address'], region['length'], self.cfg['cluster']['addr_width']) + pma_cfg.add_region_length(PMA.CACHED, region['address'], region['length'], + self.cfg['cluster']['addr_width']) # Populate the list of cached regions self.cfg['pmas'] = dict() self.cfg['pmas']['cached'] = list() @@ -295,7 +296,8 @@ def gen_mask(c, s): if ssr['pointer_width'] is None: ssr['pointer_width'] = 10 + clog2(self.cfg['cluster']['tcdm']['size']) if ssr['index_width'] is None: - ssr['index_width'] = ssr['pointer_width'] - clog2(self.cfg['cluster']['data_width']/8) + ssr['index_width'] = ssr['pointer_width'] + - clog2(self.cfg['cluster']['data_width']/8) # Sort SSRs by register indices (required by decoding logic) core['ssrs'].sort(key=lambda x: x['reg_idx']) # Minimum 1 element to avoid illegal ranges (Xssr prevents generation)