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

decodetree: Allow multiple input files

Browse Source 
While it would be possible to concatenate input files with make,
passing the original input files to decodetree.py allows us to
generate error messages which allows compilation environments
(read: emacs) to next-error to the correct input file.

Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2018-10-26 14:59:43 +01:00
parent 3a7be55465
commit 6699ae6a8e
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
scripts/decodetree.py
View File

@ -175,15 +175,15 @@ decode_function = 'decode'
re_ident = '[a-zA-Z][a-zA-Z0-9_]*' re_ident = '[a-zA-Z][a-zA-Z0-9_]*'
def error(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."""
global output_file global output_file
global output_fd global output_fd
if lineno: if lineno:
r = '{0}:{1}: error:'.format(input_file, lineno) r = '{0}:{1}: error:'.format(file, lineno)
elif input_file: elif input_file:
r = '{0}: error:'.format(input_file) r = '{0}: error:'.format(file)
else: else:
r = 'error:' r = 'error:'
for a in args: for a in args:
@ -195,6 +195,8 @@ def error(lineno, *args):
os.remove(output_file) os.remove(output_file)
exit(1) exit(1)
def error(lineno, *args):
error_with_file(input_file, lineno, args)
def output(*args): def output(*args):
global output_fd global output_fd
@ -420,6 +422,7 @@ class General:
"""Common code between instruction formats and instruction patterns""" """Common code between instruction formats and instruction patterns"""
def __init__(self, name, lineno, base, fixb, fixm, udfm, fldm, flds): def __init__(self, name, lineno, base, fixb, fixm, udfm, fldm, flds):
self.name = name self.name = name
self.file = input_file
self.lineno = lineno self.lineno = lineno
self.base = base self.base = base
self.fixedbits = fixb self.fixedbits = fixb
@ -472,7 +475,7 @@ class Pattern(General):
global translate_prefix global translate_prefix
ind = str_indent(i) ind = str_indent(i)
arg = self.base.base.name arg = self.base.base.name
output(ind, '/* line ', str(self.lineno), ' */\n') output(ind, '/* ', self.file, ':', str(self.lineno), ' */\n')
if not extracted: if not extracted:
output(ind, self.base.extract_name(), '(&u.f_', arg, ', insn);\n') output(ind, self.base.extract_name(), '(&u.f_', arg, ', insn);\n')
for n, f in self.fields.items(): for n, f in self.fields.items():
@ -920,8 +923,9 @@ def build_tree(pats, outerbits, outermask):
if innermask == 0: if innermask == 0:
pnames = [] pnames = []
for p in pats: for p in pats:
pnames.append(p.name + ':' + str(p.lineno)) pnames.append(p.name + ':' + p.file + ':' + str(p.lineno))
error(pats[0].lineno, 'overlapping patterns:', pnames) error_with_file(pats[0].file, pats[0].lineno,
'overlapping patterns:', pnames)
fullmask = outermask | innermask fullmask = outermask | innermask
@ -1012,10 +1016,11 @@ def main():
if len(args) < 1: if len(args) < 1:
error(0, 'missing input file') error(0, 'missing input file')
input_file = args[0] for filename in args:
f = open(input_file, 'r') input_file = filename
parse_file(f) f = open(filename, 'r')
f.close() parse_file(f)
f.close()
t = build_tree(patterns, 0, 0) t = build_tree(patterns, 0, 0)
prop_format(t) prop_format(t)