From 7572df1d4a9e8828ca738ccaf6070b728b566181 Mon Sep 17 00:00:00 2001
From: Pieter Donker <donker@astron.nl>
Date: Fri, 23 Jun 2017 09:06:07 +0000
Subject: [PATCH] Task #893: backup
---
tools/oneclick/prestudy/YAML/py_mm_lib/peripheral.py | 6 ++++--
.../oneclick/prestudy/YAML/py_mm_lib/peripheral_lib/ram.py | 6 +++---
.../prestudy/YAML/py_mm_lib/peripheral_lib/register.py | 2 +-
tools/oneclick/prestudy/YAML/py_mm_lib/rom_system.py | 2 +-
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/tools/oneclick/prestudy/YAML/py_mm_lib/peripheral.py b/tools/oneclick/prestudy/YAML/py_mm_lib/peripheral.py
index 4409dcc785..0cf7fcfb31 100755
--- a/tools/oneclick/prestudy/YAML/py_mm_lib/peripheral.py
+++ b/tools/oneclick/prestudy/YAML/py_mm_lib/peripheral.py
@@ -287,8 +287,9 @@ class Peripheral(BaseObject):
if isinstance(result, float):
result = int(result)
except NameError:
- result = _val
- logger.debug("_eval(%s) returns eval(%s) = %s", str(val), _val, str(result))
+ q
+ q result = _val
+ logger.debug(" _eval(%s) returns eval(%s) = %s", str(val), _val, str(result))
return result
def add_parameter(self, name, value):
@@ -324,6 +325,7 @@ class Peripheral(BaseObject):
# 'address_offset', 'reset_value', 'software_value', 'radix', 'field_description']
for field in fields.values():
+ logger.debug("eval field %s", field.name())
field.width(val=self._eval(field.width()))
field.bit_offset(val=self._eval(field.bit_offset()))
field.access_mode(val=self._eval(field.access_mode()))
diff --git a/tools/oneclick/prestudy/YAML/py_mm_lib/peripheral_lib/ram.py b/tools/oneclick/prestudy/YAML/py_mm_lib/peripheral_lib/ram.py
index a8f10b42f0..6e18c684f7 100644
--- a/tools/oneclick/prestudy/YAML/py_mm_lib/peripheral_lib/ram.py
+++ b/tools/oneclick/prestudy/YAML/py_mm_lib/peripheral_lib/ram.py
@@ -69,9 +69,9 @@ class RAM(BaseObject):
return
n_words = 0
for field in self.fields.values():
- n_words += int(ceil(float(field.width()) / c_word_w)) * field.number_of_fields()
- logger.debug("n_words=%d", n_words)
- n_words = 2**ceil_log2(n_words)
+ n_words += ceil_pow2(int(ceil(float(field.width()) / c_word_w)) * field.number_of_fields())
+ #logger.debug("n_words=%d", n_words)
+ n_words = ceil_pow2(n_words)
self.set_kv('address_length', n_words)
def address_length(self, val=None):
diff --git a/tools/oneclick/prestudy/YAML/py_mm_lib/peripheral_lib/register.py b/tools/oneclick/prestudy/YAML/py_mm_lib/peripheral_lib/register.py
index 5edf781bcd..3dc0dbffdf 100644
--- a/tools/oneclick/prestudy/YAML/py_mm_lib/peripheral_lib/register.py
+++ b/tools/oneclick/prestudy/YAML/py_mm_lib/peripheral_lib/register.py
@@ -77,7 +77,7 @@ class Register(BaseObject):
n_words = 0
for field in self.fields.values():
n_words += ceil_pow2(int(ceil(float(field.width()) / c_word_w)) * field.number_of_fields())
- logger.debug("n_words=%d", n_words)
+ #logger.debug("n_words=%d", n_words)
n_words = ceil_pow2(n_words) # round up to power of 2
self.set_kv('address_length', n_words)
diff --git a/tools/oneclick/prestudy/YAML/py_mm_lib/rom_system.py b/tools/oneclick/prestudy/YAML/py_mm_lib/rom_system.py
index 533ca92bd6..580dea5338 100644
--- a/tools/oneclick/prestudy/YAML/py_mm_lib/rom_system.py
+++ b/tools/oneclick/prestudy/YAML/py_mm_lib/rom_system.py
@@ -189,7 +189,7 @@ class RomSystem(object):
for rkey, rval in peripheral.registers.items():
n_addresses = rval.get_kv('address_length')
- nof_inst = rval.number_of_slaves() * peripheral.number_of_peripherals() * len(rval.fields)
+ nof_inst = rval.number_of_slaves() * peripheral.number_of_peripherals()
if rval.user_defined_name() is not None:
_name = rval.user_defined_name()
else:
--
GitLab