decodetree: Improve identifier matching
Only argument set members have to be C identifiers, everything
else gets prefixed during conversion to C. Some places just
checked the leading character, and some places matched a leading
character plus a C identifier.
Convert everything to match full identifiers, including the
[&%@&] prefix, and drop the full C identifier requirement.
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20200903192334.1603773-1-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
diff --git a/scripts/decodetree.py b/scripts/decodetree.py
index 4cd1e10..c02de98 100644
--- a/scripts/decodetree.py
+++ b/scripts/decodetree.py
@@ -42,8 +42,14 @@
insntype = 'uint32_t'
decode_function = 'decode'
-re_ident = '[a-zA-Z][a-zA-Z0-9_]*'
+# An identifier for C.
+re_C_ident = '[a-zA-Z][a-zA-Z0-9_]*'
+# Identifiers for Arguments, Fields, Formats and Patterns.
+re_arg_ident = '&[a-zA-Z0-9_]*'
+re_fld_ident = '%[a-zA-Z0-9_]*'
+re_fmt_ident = '@[a-zA-Z0-9_]*'
+re_pat_ident = '[a-zA-Z0-9_]*'
def error_with_file(file, lineno, *args):
"""Print an error message from file:line and args and exit."""
@@ -632,7 +638,6 @@
def parse_field(lineno, name, toks):
"""Parse one instruction field from TOKS at LINENO"""
global fields
- global re_ident
global insnwidth
# A "simple" field will have only one entry;
@@ -641,7 +646,7 @@
width = 0
func = None
for t in toks:
- if re.fullmatch('!function=' + re_ident, t):
+ if re.match('^!function=', t):
if func:
error(lineno, 'duplicate function')
func = t.split('=')
@@ -695,7 +700,7 @@
def parse_arguments(lineno, name, toks):
"""Parse one argument set from TOKS at LINENO"""
global arguments
- global re_ident
+ global re_C_ident
global anyextern
flds = []
@@ -705,7 +710,7 @@
extern = True
anyextern = True
continue
- if not re.fullmatch(re_ident, t):
+ if not re.fullmatch(re_C_ident, t):
error(lineno, 'invalid argument set token "{0}"'.format(t))
if t in flds:
error(lineno, 'duplicate argument "{0}"'.format(t))
@@ -791,7 +796,10 @@
global arguments
global formats
global allpatterns
- global re_ident
+ global re_arg_ident
+ global re_fld_ident
+ global re_fmt_ident
+ global re_C_ident
global insnwidth
global insnmask
global variablewidth
@@ -807,7 +815,7 @@
fmt = None
for t in toks:
# '&Foo' gives a format an explcit argument set.
- if t[0] == '&':
+ if re.fullmatch(re_arg_ident, t):
tt = t[1:]
if arg:
error(lineno, 'multiple argument sets')
@@ -818,7 +826,7 @@
continue
# '@Foo' gives a pattern an explicit format.
- if t[0] == '@':
+ if re.fullmatch(re_fmt_ident, t):
tt = t[1:]
if fmt:
error(lineno, 'multiple formats')
@@ -829,19 +837,19 @@
continue
# '%Foo' imports a field.
- if t[0] == '%':
+ if re.fullmatch(re_fld_ident, t):
tt = t[1:]
flds = add_field_byname(lineno, flds, tt, tt)
continue
# 'Foo=%Bar' imports a field with a different name.
- if re.fullmatch(re_ident + '=%' + re_ident, t):
+ if re.fullmatch(re_C_ident + '=' + re_fld_ident, t):
(fname, iname) = t.split('=%')
flds = add_field_byname(lineno, flds, fname, iname)
continue
# 'Foo=number' sets an argument field to a constant value
- if re.fullmatch(re_ident + '=[+-]?[0-9]+', t):
+ if re.fullmatch(re_C_ident + '=[+-]?[0-9]+', t):
(fname, value) = t.split('=')
value = int(value)
flds = add_field(lineno, flds, fname, ConstField(value))
@@ -866,7 +874,7 @@
fixedmask = (fixedmask << shift) | fms
undefmask = (undefmask << shift) | ubm
# Otherwise, fieldname:fieldwidth
- elif re.fullmatch(re_ident + ':s?[0-9]+', t):
+ elif re.fullmatch(re_C_ident + ':s?[0-9]+', t):
(fname, flen) = t.split(':')
sign = False
if flen[0] == 's':
@@ -971,6 +979,10 @@
def parse_file(f, parent_pat):
"""Parse all of the patterns within a file"""
+ global re_arg_ident
+ global re_fld_ident
+ global re_fmt_ident
+ global re_pat_ident
# Read all of the lines of the file. Concatenate lines
# ending in backslash; discard empty lines and comments.
@@ -1063,14 +1075,16 @@
continue
# Determine the type of object needing to be parsed.
- if name[0] == '%':
+ if re.fullmatch(re_fld_ident, name):
parse_field(start_lineno, name[1:], toks)
- elif name[0] == '&':
+ elif re.fullmatch(re_arg_ident, name):
parse_arguments(start_lineno, name[1:], toks)
- elif name[0] == '@':
+ elif re.fullmatch(re_fmt_ident, name):
parse_generic(start_lineno, None, name[1:], toks)
- else:
+ elif re.fullmatch(re_pat_ident, name):
parse_generic(start_lineno, parent_pat, name, toks)
+ else:
+ error(lineno, 'invalid token "{0}"'.format(name))
toks = []
if nesting != 0:
diff --git a/tests/decode/succ_ident1.decode b/tests/decode/succ_ident1.decode
new file mode 100644
index 0000000..f15cfbe
--- /dev/null
+++ b/tests/decode/succ_ident1.decode
@@ -0,0 +1,7 @@
+%1f 0:8
+%2f 8:8
+%3f 16:8
+
+&3arg a b c
+@3arg ........ ........ ........ ........ &3arg a=%1f b=%2f c=%3f
+3insn 00000000 ........ ........ ........ @3arg
