-#!/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):
+ def mask(self, reg, value):
ret = 0
out_len = len(self.bits)
- for out_bit in range(0, out_len):
- in_bit = self.bits[out_bit]
+
+ if reg.bit_order == reg.bit_0_is_msb:
+ bit_pairs = zip(self.bits, range(0, out_len))
+ else:
+ bit_pairs = zip(self.bits, range(out_len - 1, -1, -1))
+
+ for (in_bit, out_bit) in bit_pairs:
# shift this bit down to the LSB (and mask the rest)
- i = (value >> (reg_width - in_bit - 1)) & 1
+ i = (value >> (reg.width - in_bit - 1)) & 1
# shift back to the output position in the field
i <<= out_len - out_bit - 1
ret |= i
return None
@staticmethod
- def parse_bitfield(line):
+ def mask_and_shift_to_bits(width, mask, shift):
+ bits = []
+ val = mask << shift
+ for i in range(0, width):
+ if mask & (1 << i):
+ 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)
if len(a) != 2:
return None
bits = []
for s in range_str.split(','):
if ':' in s:
- (start, end) = s.split(':')
- bits.extend(range(int(start), int(end) + 1, 1))
+ (start, end) = map( \
+ lambda s: reg.bit_number(int(s)),
+ s.split(':'))
+ bits.extend(range(start, end - 1, -1))
+ elif '<<' in s:
+ (mask, shift) = map(lambda s: int(s.strip()),
+ 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(int(s))
-
+ bits.append(reg.bit_number(int(s)))
+
return bitfield(bits, name)
+
+
@staticmethod
def parse_value(line):
a = line.split(None, 1)
return a
class register:
- def __init__(self, id, name, width):
+ bit_0_is_msb = 0
+ bit_0_is_lsb = 1
+
+ def __init__(self, id):
self.id = id
- self.name = name
- self.width = width
self.fields = []
+ # set defaults
+ self.name = None
+ self.bit_order = self.bit_0_is_msb
+ self.width = 64
def add_field(self, field):
self.fields.append(field)
str = "0x%0*lx [%d]\n" % (field_width, value, value)
for field in self.fields:
- v = field.mask(self.width, value);
+ v = field.mask(self, value);
if ignore_zero and v == 0:
continue
desc = field.value(v)
% (name_width, field.name, v)
return str
+ def bit_number(self, number):
+ if self.bit_order == self.bit_0_is_lsb:
+ number = self.width - number - 1
+ return number
+
def list_regs(regs):
for (id, r) in regs.iteritems():
print "%18s : %s" % (id, r.name)
tokens = bnf.parseString(f.read())
+ order_map = {'bit-0-is-lsb': register.bit_0_is_lsb,
+ 'bit-0-is-msb': register.bit_0_is_msb,
+ 'ibm': register.bit_0_is_msb,
+ 'default': register.bit_0_is_msb}
+
for tok in tokens:
ts = tok.asList()
id = ts.pop(0)
raise ConfigurationError(file,
"Register %s is already defined" % id)
- # default to 64 bit registers
- width = 64
- name = None
+ reg = register(id)
+
+ alias_id = None
fields = []
for t in ts:
if t[0] == 'name':
name = t[1]
- name = name.strip()
+ reg.name = name.strip()
elif t[0] == 'width':
- width = int(t[1])
+ reg.width = int(t[1])
elif t[0] == 'field':
- f = bitfield.parse_bitfield(t[1])
+ f = bitfield.parse_bitfield(t[1], reg)
if f is None:
raise ConfigurationError(file,
"Invalid field in %s" % id)
"Invalid value in %s" % id)
fields[-1].add_value(v[0], v[1])
+ elif t[0] == 'order':
+ if len(fields) != 0:
+ raise ConfigurationError(file,
+ ("bit order defined after " \
+ + "fields in %s") % id)
+
+ order_str = t[1].strip().lower()
+ order_str = order_str.replace(' ', '-')
+
+ if order_str not in order_map.keys():
+ raise ConfigurationError(file,
+ "Invalid bit order %s in %s" % \
+ (order_str, id))
+ reg.bit_order = order_map[order_str]
- if name is None or name == '':
+ elif t[0] == 'alias':
+ alias_id = t[1].strip()
+
+ if alias_id is not None:
+ if reg.name is not None or fields != []:
+ raise ConfigurationError(file, ("Definiton " \
+ + "for %s is an alias, but has other " \
+ + "attributes") % id)
+
+ if not regs.has_key(alias_id):
+ raise ConfigurationError(file, "Aliasing "
+ "non-existent register %s (from %s)" \
+ % (alias_id, id))
+
+ reg = regs[alias_id]
+ continue
+
+ if reg.name is None or reg.name == '':
raise ConfigurationError(file,
"No name for entry %s" % id)
raise ConfigurationError(file,
"Register %s has no fields" % id)
- r = register(id, name, width)
for f in fields:
- r.add_field(f)
+ reg.add_field(f)
- regs[id] = r
+ regs[id] = reg
def parse_config_dir(data, dir, fnames):
(bnf, regs) = data
value_iter = args.__iter__()
else:
value_iter = iter(sys.stdin.readline, '')
-
+
try:
for value in value_iter:
decode_value(reg, value.strip(), options)
projects / bitfield / blobdiff