From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-arm@nongnu.org, qemu-devel@nongnu.org
Cc: Richard Henderson <richard.henderson@linaro.org>
Subject: [PATCH 01/10] decodetree: Fix codegen for non-overlapping group inside overlapping group
Date: Mon, 12 Oct 2020 16:33:31 +0100 [thread overview]
Message-ID: <20201012153408.9747-9-peter.maydell@linaro.org> (raw)
In-Reply-To: <20201012153408.9747-1-peter.maydell@linaro.org>
For nested groups like:
{
[
pattern 1
pattern 2
]
pattern 3
}
the intended behaviour is that patterns 1 and 2 must not
overlap with each other; if the insn matches neither then
we fall through to pattern 3 as the next thing in the
outer overlapping group.
Currently we generate incorrect code for this situation,
because in the code path for a failed match inside the
inner non-overlapping group we generate a "return" statement,
which causes decode to stop entirely rather than continuing
to the next thing in the outer group.
Generate a "break" instead, so that decode flow behaves
as required for this nested group case.
Suggested-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
scripts/decodetree.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/decodetree.py b/scripts/decodetree.py
index 60fd3b5e5f6..c1bf3cfa85f 100644
--- a/scripts/decodetree.py
+++ b/scripts/decodetree.py
@@ -548,7 +548,7 @@ class Tree:
output(ind, ' /* ',
str_match_bits(innerbits, innermask), ' */\n')
s.output_code(i + 4, extracted, innerbits, innermask)
- output(ind, ' return false;\n')
+ output(ind, ' break;\n')
output(ind, '}\n')
# end Tree
--
2.20.1
next prev parent reply other threads:[~2020-10-12 15:44 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-12 15:33 [PATCH 00/10] target/arm: Various v8.1M minor features Peter Maydell
2020-10-12 15:33 ` [PATCH] Deprecate TileGX port Peter Maydell
2020-10-12 15:42 ` BALATON Zoltan via
2020-10-12 15:44 ` Peter Maydell
2020-10-12 15:33 ` [PATCH] Deprecate Unicore32 port Peter Maydell
2020-10-12 15:33 ` [PATCH] Deprecate lm32 port Peter Maydell
2020-10-12 15:33 ` [PATCH for-5.1] Makefile: Remove config-devices.mak on "make clean" Peter Maydell
2020-10-12 15:33 ` [PATCH RISU] arm.risu: Add patterns for fp16 insns Peter Maydell
2020-10-12 15:33 ` [PATCH RISU] arm.risu, thumb.risu: Add v8.2 DP and FHM insns Peter Maydell
2020-10-12 15:33 ` [PATCH] configure: Test that gio libs from pkg-config work Peter Maydell
2020-10-12 15:33 ` Peter Maydell [this message]
2020-10-12 15:33 ` [PATCH for-5.1] docs/system/arm/virt: Document mte machine option Peter Maydell
2020-10-12 15:45 ` no-reply
2020-10-12 15:33 ` [PATCH for-5.1] hw/arm/armsse: Assert info->num_cpus is in-bounds in armsse_realize() Peter Maydell
2020-10-12 15:33 ` [PATCH] hw/arm/mps2: New board model mps2-386 Peter Maydell
2020-10-12 15:33 ` [PATCH for-5.1] hw/arm/netduino2, netduinoplus2: Set system_clock_scale Peter Maydell
2020-10-14 0:29 ` Alistair Francis
2020-10-14 0:31 ` Alistair Francis
2020-10-14 12:39 ` Peter Maydell
2020-10-14 14:32 ` Alistair Francis
2020-10-12 15:33 ` [PATCH for-5.1] hw/arm/nrf51_soc: " Peter Maydell
2020-10-12 15:33 ` [PATCH] hw/display/bcm2835_fb.c: Initialize all fields of struct Peter Maydell
2020-10-12 15:33 ` [PATCH] hw/input/virtio-input-hid.c: Don't undef CONFIG_CURSES Peter Maydell
2020-10-12 15:33 ` [PATCH] hw/intc/arm_gicv3_cpuif: Don't copy CPU's maintenance interrupt Peter Maydell
2020-10-12 15:33 ` [PATCH] hw/intc/arm_gicv3_cpuif: Make GIC maintenance interrupts work Peter Maydell
2020-10-12 15:33 ` [PATCH] hw/timer/armv7m_systick: assert that board code set system_clock_scale Peter Maydell
2020-10-12 15:33 ` [PATCH for-5.1] hw/timer/imx_epit: Avoid assertion when CR.SWR is written Peter Maydell
2020-10-12 15:33 ` [PATCH] hw/virtio/virtio-iommu-pci.c: Fix typo in error message Peter Maydell
2020-10-12 15:33 ` [RFC PATCH v2] linux-user: Use FD_32BIT_MODE fd flag for 32-bit guests Peter Maydell
2020-10-12 15:33 ` [PATCH] linux-user/arm/signal.c: Drop TARGET_CONFIG_CPU_32 Peter Maydell
2020-10-12 15:33 ` [PATCH] meson.build: Don't look for libudev for static builds Peter Maydell
2020-10-12 15:33 ` [PATCH] msf2-soc, stellaris: Don't wire up SYSRESETREQ Peter Maydell
2020-10-12 15:33 ` [PATCH] net/tap-solaris.c: Include qemu-common.h for TFR macro Peter Maydell
2020-10-12 15:33 ` [PATCH] osdep.h: Add doc comment for qemu_get_thread_id() Peter Maydell
2020-10-12 15:33 ` [PATCH for-5.1] qapi/machine.json: Fix missing newline in doc comment Peter Maydell
2020-10-12 15:33 ` [PATCH v2] target/arm: Allow user-mode code to write CPSR.E via MSR Peter Maydell
2020-10-12 15:33 ` [PATCH] target/arm: Delete unused ARM_FEATURE_CRC Peter Maydell
2020-10-12 15:33 ` [PATCH] target/arm: Delete unused VFP_DREG macros Peter Maydell
-- strict thread matches above, loose matches on Subject: below --
2020-10-12 15:37 [PATCH 00/10] target/arm: Various v8.1M minor features Peter Maydell
2020-10-12 15:37 ` [PATCH 01/10] decodetree: Fix codegen for non-overlapping group inside overlapping group Peter Maydell
2020-10-13 16:02 ` Richard Henderson
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=20201012153408.9747-9-peter.maydell@linaro.org \
--to=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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).