-#!/usr/bin/python2.4
+#!/usr/bin/env python
#
# Utility to decode register values
# Copyright (c) 2006 Jeremy Kerr <jk@ozlabs.org>
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
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)
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)))
-
+
return bitfield(bits, name)
str += "%*s: 0x%x\n" \
% (name_width, field.name, v)
return str
-
+
def bit_number(self, number):
if self.bit_order == self.bit_0_is_lsb:
number = self.width - 1 - number
"Invalid bit order %s in %s" % \
(order_str, id))
reg.bit_order = order_map[order_str]
-
+
elif t[0] == 'alias':
alias_id = t[1].strip()
value_iter = args.__iter__()
else:
value_iter = iter(sys.stdin.readline, '')
-
+
try:
for value in value_iter:
decode_value(reg, value.strip(), options)