diff options
Diffstat (limited to 'src/python/m5/params.py')
| -rw-r--r-- | src/python/m5/params.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/python/m5/params.py b/src/python/m5/params.py index 88d38f87a..dfc3ede3b 100644 --- a/src/python/m5/params.py +++ b/src/python/m5/params.py @@ -626,9 +626,17 @@ class Addr(CheckedInt): self.value = value.value else: try: + # Often addresses are referred to with sizes. Ex: A device + # base address is at "512MB". Use toMemorySize() to convert + # these into addresses. If the address is not specified with a + # "size", an exception will occur and numeric translation will + # proceed below. self.value = convert.toMemorySize(value) - except TypeError: - self.value = long(value) + except (TypeError, ValueError): + # Convert number to string and use long() to do automatic + # base conversion (requires base=0 for auto-conversion) + self.value = long(str(value), base=0) + self._check() def __add__(self, other): if isinstance(other, Addr): |