More error checking - check width of input value - better reporting of value parse...

[bitfield] / bitfield

diff --git a/bitfield b/bitfield
index b0dfcc0a341ce0982c0ab8962ae701eaf4acf7dc..32a0405648b0d4dade7caff3b4a1421facf704e5 100644 (file)
--- a/bitfield
+++ b/bitfield
@@ -71,7 +71,8 @@ class bitfield:
                return a
 
 class register:
-       def __init__(self, name, width):
+       def __init__(self, id, name, width):
+               self.id = id
                self.name = name
                self.width = width
                self.fields = []
@@ -89,7 +90,7 @@ class register:
                                continue
                        desc = field.value(v)
                        if desc is not None:
-                               str += "%*s: 0x%s [%s]\n" \
+                               str += "%*s: 0x%x [%s]\n" \
                                        % (name_width, field.name, v, desc)
                        else:
                                str += "%*s: 0x%x\n" \
@@ -112,7 +113,7 @@ class ConfigurationError(Exception):
 def parse_config(bnf, regs, file):
        f = open(file)
 
-       tokens = bnf.parseString("".join(f.readlines()))
+       tokens = bnf.parseString(f.read())
 
        for tok in tokens:
                ts = tok.asList()
@@ -158,7 +159,7 @@ def parse_config(bnf, regs, file):
                        raise ConfigurationError(file,
                                "Register %s has no fields" % id)
 
-               r = register(name, width)
+               r = register(id, name, width)
                for f in fields:
                        r.add_field(f)
 
@@ -208,7 +209,22 @@ def parse_all_configs(configs):
        return regs
 
 def usage(prog):
-       print "Usage: %s <-l> | <-s pattern> | register [value...]" % prog
+       print "Usage: %s <-l> | <-s pattern> | [-n] register [value...]" % prog
+
+def decode_value(reg, value, options):
+       try:
+               i = long(value, 0)
+       except ValueError, e:
+               print "error: invalid value '%s'" % value
+               return
+
+       if i > ((1 << reg.width) - 1):
+               print ("error: value '%s' is too large " + \
+                       "for %d-bit register '%s'") % (value, reg.width, reg.id)
+               return
+
+       print reg.decode(i, options.has_key('non_zero'))
+
 
 def main():
        try:
@@ -269,8 +285,7 @@ def main():
                        return
 
        for value in values:
-               i = long(value.strip(), 0)
-               print r.decode(i, options['non-zero'])
+               decode_value(r, value.strip(), options)
 
        return 0