Add &mask syntax

[bitfield] / bitfield

diff --git a/bitfield b/bitfield
index 467bf6ba7e6d50da91df2a16dabb886393f9798b..3851c4c9119bb1ecdecf0c47c1057df780cad626 100644 (file)
--- a/bitfield
+++ b/bitfield
@@ -57,6 +57,10 @@ class bitfield:
                                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)))