python: Fix AddrRange legacy ParamValue wrapper

This change fixes a bug that would manifest if a user would
instantiate an AddrRange ParamValue using the kwargs 'intlvBits' and
'intlvHighBit' without specifying the optional 'xorHighBit'.

Change-Id: I2091c432234df9cf907d52af6ba7f0cadd8c37a8
Signed-off-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/19248
Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
Tested-by: kokoro <noreply+kokoro@google.com>

diff --git a/src/python/m5/params.py b/src/python/m5/params.py
index da1304d9c658f13e2d6f0560e050efaf21b98f10..b9afff2a1dccf4e1e1904949a298472ad7b74e95 100644 (file)
--- a/src/python/m5/params.py
+++ b/src/python/m5/params.py
@@ -757,8 +757,6 @@ class AddrRange(ParamValue):
 
     def __init__(self, *args, **kwargs):
         # Disable interleaving and hashing by default
-        self.intlvHighBit = 0
-        self.xorHighBit = 0
         self.intlvBits = 0
         self.intlvMatch = 0
         self.masks = []
@@ -782,20 +780,22 @@ class AddrRange(ParamValue):
                 self.masks = [ long(x) for x in list(kwargs.pop('masks')) ]
                 self.intlvBits = len(self.masks)
             else:
-                if 'intlvHighBit' in kwargs:
-                    intlv_high_bit = int(kwargs.pop('intlvHighBit'))
-                if 'xorHighBit' in kwargs:
-                    xor_high_bit = int(kwargs.pop('xorHighBit'))
                 if 'intlvBits' in kwargs:
                     self.intlvBits = int(kwargs.pop('intlvBits'))
                     self.masks = [0] * self.intlvBits
-                for i in range(0, self.intlvBits):
-                    bit1 = intlv_high_bit - i
-                    mask = 1 << bit1
-                    if xor_high_bit != 0:
-                        bit2 = xor_high_bit - i
-                        mask |= 1 << bit2
-                    self.masks[self.intlvBits - i - 1] = mask
+                    if 'intlvHighBit' not in kwargs:
+                        raise TypeError("No interleave bits specified")
+                    intlv_high_bit = int(kwargs.pop('intlvHighBit'))
+                    xor_high_bit = 0
+                    if 'xorHighBit' in kwargs:
+                        xor_high_bit = int(kwargs.pop('xorHighBit'))
+                    for i in range(0, self.intlvBits):
+                        bit1 = intlv_high_bit - i
+                        mask = 1 << bit1
+                        if xor_high_bit != 0:
+                            bit2 = xor_high_bit - i
+                            mask |= 1 << bit2
+                        self.masks[self.intlvBits - i - 1] = mask
 
         if len(args) == 0:
             self.start = Addr(kwargs.pop('start'))