Merge tag 'pull-target-arm-20211207' of https://git.linaro.org/people/pmaydell/qemu-arm into staging
target-arm queue:
* Fix calculation of ICH_MISR_EL2.LRENP to avoid incorrect generation
of maintenance interrupts
# gpg: Signature made Tue 07 Dec 2021 09:18:50 AM PST
# gpg: using RSA key E1A5C593CD419DE28E8315CF3C2525ED14360CDE
# gpg: issuer "peter.maydell@linaro.org"
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>" [full]
# gpg: aka "Peter Maydell <pmaydell@gmail.com>" [full]
# gpg: aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>" [full]
* tag 'pull-target-arm-20211207' of https://git.linaro.org/people/pmaydell/qemu-arm:
gicv3: fix ICH_MISR's LRENP computation
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
diff --git a/tcg/arm/tcg-target.c.inc b/tcg/arm/tcg-target.c.inc
index 633b8a3..9d322cd 100644
--- a/tcg/arm/tcg-target.c.inc
+++ b/tcg/arm/tcg-target.c.inc
@@ -2523,8 +2523,13 @@
tcg_out_vldst(s, INSN_VLD1 | 0x7d0, arg, arg1, arg2);
return;
case TCG_TYPE_V128:
- /* regs 2; size 8; align 16 */
- tcg_out_vldst(s, INSN_VLD1 | 0xae0, arg, arg1, arg2);
+ /*
+ * We have only 8-byte alignment for the stack per the ABI.
+ * Rather than dynamically re-align the stack, it's easier
+ * to simply not request alignment beyond that. So:
+ * regs 2; size 8; align 8
+ */
+ tcg_out_vldst(s, INSN_VLD1 | 0xad0, arg, arg1, arg2);
return;
default:
g_assert_not_reached();
@@ -2543,8 +2548,8 @@
tcg_out_vldst(s, INSN_VST1 | 0x7d0, arg, arg1, arg2);
return;
case TCG_TYPE_V128:
- /* regs 2; size 8; align 16 */
- tcg_out_vldst(s, INSN_VST1 | 0xae0, arg, arg1, arg2);
+ /* See tcg_out_ld re alignment: regs 2; size 8; align 8 */
+ tcg_out_vldst(s, INSN_VST1 | 0xad0, arg, arg1, arg2);
return;
default:
g_assert_not_reached();
diff --git a/tcg/tcg.c b/tcg/tcg.c
index 57f17a4..934aa85 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -3061,7 +3061,13 @@
g_assert_not_reached();
}
- assert(align <= TCG_TARGET_STACK_ALIGN);
+ /*
+ * Assume the stack is sufficiently aligned.
+ * This affects e.g. ARM NEON, where we have 8 byte stack alignment
+ * and do not require 16 byte vector alignment. This seems slightly
+ * easier than fully parameterizing the above switch statement.
+ */
+ align = MIN(TCG_TARGET_STACK_ALIGN, align);
off = ROUND_UP(s->current_frame_offset, align);
/* If we've exhausted the stack frame, restart with a smaller TB. */
