Add support for hex (and octal) values

[bitfield] / bitfield

diff --git a/bitfield b/bitfield
index ae5b1380b48ced412f579c13566f07164df08edf..7740ff2b0d375ebd049109ad4b7971e593faea2b 100644 (file)
--- a/bitfield
+++ b/bitfield
@@ -29,7 +29,7 @@ class bitfield:
                return len(self.bits)
 
        def add_value(self, value, description):
-               self.values[int(value)] = description
+               self.values[int(value, 0)] = description
 
        def mask(self, reg_width, value):
                ret = 0
@@ -54,9 +54,13 @@ class bitfield:
                val = mask << shift
                for i in range(0, width):
                        if mask & (1 << i):
-                               bits.append(width - i - 1 - shift)
+                               bits.insert(0, width - i - 1 - shift)
                return bits
 
+       @staticmethod
+       def mask_to_bits(width, mask):
+               return bitfield.mask_and_shift_to_bits(width, mask, 0)
+
        @staticmethod
        def parse_bitfield(line, reg):
                a = line.split(None, 1)
@@ -78,6 +82,10 @@ class bitfield:
                                        s.split('<<'))
                                bits.extend(bitfield.mask_and_shift_to_bits( \
                                        reg.width, mask, shift))
+                       elif s.startswith('&'):
+                               mask = int(s[1:], 0)
+                               bits.extend(bitfield.mask_to_bits(reg.width, \
+                                                       mask))
                        else:
                                bits.append(reg.bit_number(int(s)))