From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PULL 6/9] decodetree: Implement non-overlapping groups
Date: Tue, 9 Jun 2020 09:25:01 -0700 [thread overview]
Message-ID: <20200609162504.780080-7-richard.henderson@linaro.org> (raw)
In-Reply-To: <20200609162504.780080-1-richard.henderson@linaro.org>
Intended to be nested within overlapping groups.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
scripts/decodetree.py | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/scripts/decodetree.py b/scripts/decodetree.py
index 0ba01e049c..7e3b1d1399 100755
--- a/scripts/decodetree.py
+++ b/scripts/decodetree.py
@@ -1021,16 +1021,20 @@ def parse_file(f, parent_pat):
del toks[0]
# End nesting?
- if name == '}':
+ if name == '}' or name == ']':
if len(toks) != 0:
error(start_lineno, 'extra tokens after close brace')
if len(parent_pat.pats) < 2:
error(lineno, 'less than two patterns within braces')
+ # Make sure { } and [ ] nest properly.
+ if (name == '}') != isinstance(parent_pat, IncMultiPattern):
+ error(lineno, 'mismatched close brace')
+
try:
parent_pat = nesting_pats.pop()
except:
- error(lineno, 'mismatched close brace')
+ error(lineno, 'extra close brace')
nesting -= 2
if indent != nesting:
@@ -1044,11 +1048,14 @@ def parse_file(f, parent_pat):
error(start_lineno, 'indentation ', indent, ' != ', nesting)
# Start nesting?
- if name == '{':
+ if name == '{' or name == '[':
if len(toks) != 0:
error(start_lineno, 'extra tokens after open brace')
- nested_pat = IncMultiPattern(start_lineno)
+ if name == '{':
+ nested_pat = IncMultiPattern(start_lineno)
+ else:
+ nested_pat = ExcMultiPattern(start_lineno)
parent_pat.pats.append(nested_pat)
nesting_pats.append(parent_pat)
parent_pat = nested_pat
@@ -1067,6 +1074,9 @@ def parse_file(f, parent_pat):
else:
parse_generic(start_lineno, parent_pat, name, toks)
toks = []
+
+ if nesting != 0:
+ error(lineno, 'missing close brace')
# end parse_file
--
2.25.1
next prev parent reply other threads:[~2020-06-09 16:30 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-09 16:24 [PULL 0/9] decodetree: Add non-overlapping groups Richard Henderson
2020-06-09 16:24 ` [PULL 1/9] decodetree: Tidy error_with_file Richard Henderson
2020-06-09 16:24 ` [PULL 2/9] decodetree: Rename MultiPattern to IncMultiPattern Richard Henderson
2020-06-09 16:24 ` [PULL 3/9] decodetree: Split out MultiPattern from IncMultiPattern Richard Henderson
2020-06-09 16:24 ` [PULL 4/9] decodetree: Allow group covering the entire insn space Richard Henderson
2020-06-09 16:25 ` [PULL 5/9] decodetree: Move semantic propagation into classes Richard Henderson
2020-06-09 16:25 ` Richard Henderson [this message]
2020-06-09 16:25 ` [PULL 7/9] tests/decode: Test non-overlapping groups Richard Henderson
2020-06-09 16:25 ` [PULL 8/9] decodetree: Drop check for less than 2 patterns in a group Richard Henderson
2020-06-09 16:25 ` [PULL 9/9] target/arm: Use a non-overlapping group for misc control Richard Henderson
2020-06-11 12:07 ` [PULL 0/9] decodetree: Add non-overlapping groups Peter Maydell
2020-08-01 17:42 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200609162504.780080-7-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=f4bug@amsat.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).