|
@@ -94,7 +94,7 @@ def str_indent(c):
|
|
|
|
|
|
|
|
|
|
def str_fields(fields):
|
|
def str_fields(fields):
|
|
- """Return a string uniquely identifing FIELDS"""
|
|
|
|
|
|
+ """Return a string uniquely identifying FIELDS"""
|
|
r = ''
|
|
r = ''
|
|
for n in sorted(fields.keys()):
|
|
for n in sorted(fields.keys()):
|
|
r += '_' + n
|
|
r += '_' + n
|
|
@@ -814,7 +814,7 @@ def parse_generic(lineno, parent_pat, name, toks):
|
|
arg = None
|
|
arg = None
|
|
fmt = None
|
|
fmt = None
|
|
for t in toks:
|
|
for t in toks:
|
|
- # '&Foo' gives a format an explcit argument set.
|
|
|
|
|
|
+ # '&Foo' gives a format an explicit argument set.
|
|
if re.fullmatch(re_arg_ident, t):
|
|
if re.fullmatch(re_arg_ident, t):
|
|
tt = t[1:]
|
|
tt = t[1:]
|
|
if arg:
|
|
if arg:
|
|
@@ -903,7 +903,7 @@ def parse_generic(lineno, parent_pat, name, toks):
|
|
elif not (is_format and width == 0) and width != insnwidth:
|
|
elif not (is_format and width == 0) and width != insnwidth:
|
|
error(lineno, 'definition has {0} bits'.format(width))
|
|
error(lineno, 'definition has {0} bits'.format(width))
|
|
|
|
|
|
- # Do not check for fields overlaping fields; one valid usage
|
|
|
|
|
|
+ # Do not check for fields overlapping fields; one valid usage
|
|
# is to be able to duplicate fields via import.
|
|
# is to be able to duplicate fields via import.
|
|
fieldmask = 0
|
|
fieldmask = 0
|
|
for f in flds.values():
|
|
for f in flds.values():
|