a8263c0693
- Include upstream patches designated as stable material and reviewed for applicability to include here block-Separate-blk_is_writable-and-blk_s.patch hw-intc-arm_gic-Fix-interrupt-ID-in-GICD.patch hw-net-lan9118-Fix-RX-Status-FIFO-PEEK-v.patch hw-timer-slavio_timer-Allow-64-bit-acces.patch net-Fix-handling-of-id-in-netdev_add-and.patch target-arm-Don-t-decode-insns-in-the-XSc.patch target-arm-Fix-MTE0_ACTIVE.patch target-arm-Introduce-PREDDESC-field-defi.patch target-arm-Update-PFIRST-PNEXT-for-pred_.patch target-arm-Update-REV-PUNPK-for-pred_des.patch target-arm-Update-ZIP-UZP-TRN-for-pred_d.patch tcg-Use-memset-for-large-vector-byte-rep.patch ui-vnc-Add-missing-lock-for-send_color_m.patch virtio-move-use-disabled-flag-property-t.patch - binutils v2.36 has changed the handling of the assembler's -mx86-used-note, resulting in a build failure. To compensate, we now explicitly specify -mx86-used-note=no in the seabios Makefile (boo#1181775) build-be-explicit-about-mx86-used-note-n.patch OBS-URL: https://build.opensuse.org/request/show/869843 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=614
49 lines
2.1 KiB
Diff
49 lines
2.1 KiB
Diff
From: Peter Maydell <peter.maydell@linaro.org>
|
|
Date: Fri, 8 Jan 2021 19:51:57 +0000
|
|
Subject: target/arm: Don't decode insns in the XScale/iWMMXt space as cp insns
|
|
|
|
Git-commit: e4d51ac6921dc861bfb3d20e4c7dcf345840a9da
|
|
|
|
In commit cd8be50e58f63413c0 we converted the A32 coprocessor
|
|
insns to decodetree. This accidentally broke XScale/iWMMXt insns,
|
|
because it moved the handling of "cp insns which are handled
|
|
by looking up the cp register in the hashtable" from after the
|
|
call to the legacy disas_xscale_insn() decode to before it,
|
|
with the result that all XScale/iWMMXt insns now UNDEF.
|
|
|
|
Update valid_cp() so that it knows that on XScale cp 0 and 1
|
|
are not standard coprocessor instructions; this will cause
|
|
the decodetree trans_ functions to ignore them, so that
|
|
execution will correctly get through to the legacy decode again.
|
|
|
|
Cc: qemu-stable@nongnu.org
|
|
Reported-by: Guenter Roeck <linux@roeck-us.net>
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
|
|
Tested-by: Guenter Roeck <linux@roeck-us.net>
|
|
Message-id: 20210108195157.32067-1-peter.maydell@linaro.org
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
target/arm/translate.c | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
diff --git a/target/arm/translate.c b/target/arm/translate.c
|
|
index 6d04ca3a8a09818cfbfba706a4c3..8089a4ff7e542204a6a1bf6f5637 100644
|
|
--- a/target/arm/translate.c
|
|
+++ b/target/arm/translate.c
|
|
@@ -5275,7 +5275,14 @@ static bool valid_cp(DisasContext *s, int cp)
|
|
* only cp14 and cp15 are valid, and other values aren't considered
|
|
* to be in the coprocessor-instruction space at all. v8M still
|
|
* permits coprocessors 0..7.
|
|
+ * For XScale, we must not decode the XScale cp0, cp1 space as
|
|
+ * a standard coprocessor insn, because we want to fall through to
|
|
+ * the legacy disas_xscale_insn() decoder after decodetree is done.
|
|
*/
|
|
+ if (arm_dc_feature(s, ARM_FEATURE_XSCALE) && (cp == 0 || cp == 1)) {
|
|
+ return false;
|
|
+ }
|
|
+
|
|
if (arm_dc_feature(s, ARM_FEATURE_V8) &&
|
|
!arm_dc_feature(s, ARM_FEATURE_M)) {
|
|
return cp >= 14;
|