mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

decodetree: Improve identifier matching

Browse Source 
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>
This commit is contained in:
Richard Henderson 2020-09-03 12:23:34 -07:00 committed by Peter Maydell
parent c9ebc8c207
commit acfdd2398d
2 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
scripts/decodetree.py
View File

@ -42,8 +42,14 @@ output_fd = None
insntype = 'uint32_t' insntype = 'uint32_t'
decode_function = 'decode' 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): def error_with_file(file, lineno, *args):
"""Print an error message from file:line and args and exit.""" """Print an error message from file:line and args and exit."""
@ -632,7 +638,6 @@ class ExcMultiPattern(MultiPattern):
def parse_field(lineno, name, toks): def parse_field(lineno, name, toks):
"""Parse one instruction field from TOKS at LINENO""" """Parse one instruction field from TOKS at LINENO"""
global fields global fields
global re_ident
global insnwidth global insnwidth
# A "simple" field will have only one entry; # A "simple" field will have only one entry;
@ -641,7 +646,7 @@ def parse_field(lineno, name, toks):
width = 0 width = 0
func = None func = None
for t in toks: for t in toks:
if re.fullmatch('!function=' + re_ident, t): if re.match('^!function=', t):
if func: if func:
error(lineno, 'duplicate function') error(lineno, 'duplicate function')
func = t.split('=') func = t.split('=')
@ -695,7 +700,7 @@ def parse_field(lineno, name, toks):
def parse_arguments(lineno, name, toks): def parse_arguments(lineno, name, toks):
"""Parse one argument set from TOKS at LINENO""" """Parse one argument set from TOKS at LINENO"""
global arguments global arguments
global re_ident global re_C_ident
global anyextern global anyextern
flds = [] flds = []
@ -705,7 +710,7 @@ def parse_arguments(lineno, name, toks):
extern = True extern = True
anyextern = True anyextern = True
continue 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)) error(lineno, 'invalid argument set token "{0}"'.format(t))
if t in flds: if t in flds:
error(lineno, 'duplicate argument "{0}"'.format(t)) error(lineno, 'duplicate argument "{0}"'.format(t))
@ -791,7 +796,10 @@ def parse_generic(lineno, parent_pat, name, toks):
global arguments global arguments
global formats global formats
global allpatterns global allpatterns
global re_ident global re_arg_ident
global re_fld_ident
global re_fmt_ident
global re_C_ident
global insnwidth global insnwidth
global insnmask global insnmask
global variablewidth global variablewidth
@ -807,7 +815,7 @@ def parse_generic(lineno, parent_pat, name, toks):
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 explcit argument set.
if t[0] == '&': if re.fullmatch(re_arg_ident, t):
tt = t[1:] tt = t[1:]
if arg: if arg:
error(lineno, 'multiple argument sets') error(lineno, 'multiple argument sets')
@ -818,7 +826,7 @@ def parse_generic(lineno, parent_pat, name, toks):
continue continue
# '@Foo' gives a pattern an explicit format. # '@Foo' gives a pattern an explicit format.
if t[0] == '@': if re.fullmatch(re_fmt_ident, t):
tt = t[1:] tt = t[1:]
if fmt: if fmt:
error(lineno, 'multiple formats') error(lineno, 'multiple formats')
@ -829,19 +837,19 @@ def parse_generic(lineno, parent_pat, name, toks):
continue continue
# '%Foo' imports a field. # '%Foo' imports a field.
if t[0] == '%': if re.fullmatch(re_fld_ident, t):
tt = t[1:] tt = t[1:]
flds = add_field_byname(lineno, flds, tt, tt) flds = add_field_byname(lineno, flds, tt, tt)
continue continue
# 'Foo=%Bar' imports a field with a different name. # '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('=%') (fname, iname) = t.split('=%')
flds = add_field_byname(lineno, flds, fname, iname) flds = add_field_byname(lineno, flds, fname, iname)
continue continue
# 'Foo=number' sets an argument field to a constant value # '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('=') (fname, value) = t.split('=')
value = int(value) value = int(value)
flds = add_field(lineno, flds, fname, ConstField(value)) flds = add_field(lineno, flds, fname, ConstField(value))
@ -866,7 +874,7 @@ def parse_generic(lineno, parent_pat, name, toks):
fixedmask = (fixedmask << shift) | fms fixedmask = (fixedmask << shift) | fms
undefmask = (undefmask << shift) | ubm undefmask = (undefmask << shift) | ubm
# Otherwise, fieldname:fieldwidth # 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(':') (fname, flen) = t.split(':')
sign = False sign = False
if flen[0] == 's': if flen[0] == 's':
@ -971,6 +979,10 @@ def parse_generic(lineno, parent_pat, name, toks):
def parse_file(f, parent_pat): def parse_file(f, parent_pat):
"""Parse all of the patterns within a file""" """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 # Read all of the lines of the file. Concatenate lines
# ending in backslash; discard empty lines and comments. # ending in backslash; discard empty lines and comments.
@ -1063,14 +1075,16 @@ def parse_file(f, parent_pat):
continue continue
# Determine the type of object needing to be parsed. # 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) parse_field(start_lineno, name[1:], toks)
elif name[0] == '&': elif re.fullmatch(re_arg_ident, name):
parse_arguments(start_lineno, name[1:], toks) 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) parse_generic(start_lineno, None, name[1:], toks)
else: elif re.fullmatch(re_pat_ident, name):
parse_generic(start_lineno, parent_pat, name, toks) parse_generic(start_lineno, parent_pat, name, toks)
else:
error(lineno, 'invalid token "{0}"'.format(name))
toks = [] toks = []
if nesting != 0: if nesting != 0:

7
tests/decode/succ_ident1.decode Normal file
View File

@ -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