5636aff5b1
- target/i386: csv: Support inject secret for CSV3 guest only if the extension is enabled
- target/i386: csv: Support load kernel hashes for CSV3 guest only if the extension is enabled
- target/i386: csv: Request to set private memory of CSV3 guest if the extension is enabled
- target/i386: kvm: Support to get and enable extensions for Hygon CoCo guest
- qapi/qom,target/i386: csv-guest: Introduce secret-header-file=str and secret-file=str options
- bakcend: VirtCCA:resolve hugepage memory waste issue in vhost-user scenario
- parallels: fix ext_off assertion failure due to overflow
- backends/cryptodev-vhost-user: Fix local_error leaks
- hw/usb/hcd-ehci: Fix debug printf format string
- target/riscv/vector_helper.c: fix 'vmvr_v' memcpy endianess
- target/riscv/vector_helper.c: optimize loops in ldst helpers
- target/riscv/vector_helper.c: set vstart = 0 in GEN_VEXT_VSLIDEUP_VX()
- target/hexagon: don't look for static glib
- virtio-net: Fix network stall at the host side waiting for kick
- Add if condition to avoid assertion failed error in blockdev_init
- target/arm: Use float_status copy in sme_fmopa_s
- target/arm: take HSTR traps of cp15 accesses to EL2, not EL1
- target/arm: Reinstate "vfp" property on AArch32 CPUs
- target/i386/cpu: Fix notes for CPU models
- target/arm: LDAPR should honour SCTLR_ELx.nAA
- target/riscv: Avoid bad shift in riscv_cpu_do_interrupt()
- hvf: remove unused but set variable
- hw/misc/nrf51_rng: Don't use BIT_MASK() when we mean BIT()
- Avoid taking address of out-of-bounds array index
- target/arm: Fix VCMLA Dd, Dn, Dm[idx]
- target/arm: Fix UMOPA/UMOPS of 16-bit values
- target/arm: Fix SVE/SME gross MTE suppression checks
- target/arm: Fix nregs computation in do_{ld,st}_zpa
- crypto: fix error check on gcry_md_open
- Change vmstate_cpuhp_sts vmstateDescription version_id
- hw/pci: Remove unused pci_irq_pulse() method
- hw/intc: Don't clear pending bits on IRQ lowering
- target/arm: Drop user-only special case in sve_stN_r
- migration: Ensure vmstate_save() sets errp
- target/i386: fix hang when using slow path for ptw_setl
- contrib/plugins: add compat for g_memdup2
- hw/audio/hda: fix memory leak on audio setup
- crypto: perform runtime check for hash/hmac support in gcrypt
- target/arm: Fix incorrect aa64_tidcp1 feature check
- target/arm: fix exception syndrome for AArch32 bkpt insn
- target/arm: Don't get MDCR_EL2 in pmu_counter_enabled() before checking ARM_FEATURE_PMU
- linux-user: Print tid not pid with strace
- target/arm: Fix A64 scalar SQSHRN and SQRSHRN
- target/arm: Don't assert for 128-bit tile accesses when SVL is 128
- hw/timer/exynos4210_mct: fix possible int overflow
- target/arm: Avoid shifts by -1 in tszimm_shr() and tszimm_shl()
- hw/audio/virtio-snd: Always use little endian audio format
- target/riscv: Fix vcompress with rvv_ta_all_1s
- usb-hub: Fix handling port power control messages
Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
(cherry picked from commit d4a20b24ff377fd07fcbf2b72eecaf07a3ac4cc0)
84 lines
3.1 KiB
Diff
84 lines
3.1 KiB
Diff
From b6a6427bf45c249e8397bf758055ebb54622e8e2 Mon Sep 17 00:00:00 2001
|
|
From: gubin <gubin_yewu@cmss.chinamobile.com>
|
|
Date: Tue, 17 Dec 2024 14:32:17 +0800
|
|
Subject: [PATCH] target/arm: Fix nregs computation in do_{ld,st}_zpa
|
|
|
|
cherry-pick from 64c6e7444dff64b42d11b836b9aec9acfbe8ecc2
|
|
|
|
The field is encoded as [0-3], which is convenient for
|
|
indexing our array of function pointers, but the true
|
|
value is [1-4]. Adjust before calling do_mem_zpa.
|
|
|
|
Add an assert, and move the comment re passing ZT to
|
|
the helper back next to the relevant code.
|
|
|
|
Cc: qemu-stable@nongnu.org
|
|
Fixes: 206adacfb8d ("target/arm: Add mte helpers for sve scalar + int loads")
|
|
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
|
|
Tested-by: Gustavo Romero <gustavo.romero@linaro.org>
|
|
Message-id: 20240207025210.8837-3-richard.henderson@linaro.org
|
|
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
Signed-off-by: gubin <gubin_yewu@cmss.chinamobile.com>
|
|
---
|
|
target/arm/tcg/translate-sve.c | 16 ++++++++--------
|
|
1 file changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/target/arm/tcg/translate-sve.c b/target/arm/tcg/translate-sve.c
|
|
index dd0c633897..1d8e0d29bf 100644
|
|
--- a/target/arm/tcg/translate-sve.c
|
|
+++ b/target/arm/tcg/translate-sve.c
|
|
@@ -4459,11 +4459,7 @@ static void do_mem_zpa(DisasContext *s, int zt, int pg, TCGv_i64 addr,
|
|
TCGv_ptr t_pg;
|
|
int desc = 0;
|
|
|
|
- /*
|
|
- * For e.g. LD4, there are not enough arguments to pass all 4
|
|
- * registers as pointers, so encode the regno into the data field.
|
|
- * For consistency, do this even for LD1.
|
|
- */
|
|
+ assert(mte_n >= 1 && mte_n <= 4);
|
|
if (s->mte_active[0]) {
|
|
int msz = dtype_msz(dtype);
|
|
|
|
@@ -4477,6 +4473,11 @@ static void do_mem_zpa(DisasContext *s, int zt, int pg, TCGv_i64 addr,
|
|
addr = clean_data_tbi(s, addr);
|
|
}
|
|
|
|
+ /*
|
|
+ * For e.g. LD4, there are not enough arguments to pass all 4
|
|
+ * registers as pointers, so encode the regno into the data field.
|
|
+ * For consistency, do this even for LD1.
|
|
+ */
|
|
desc = simd_desc(vsz, vsz, zt | desc);
|
|
t_pg = tcg_temp_new_ptr();
|
|
|
|
@@ -4614,7 +4615,7 @@ static void do_ld_zpa(DisasContext *s, int zt, int pg,
|
|
* accessible via the instruction encoding.
|
|
*/
|
|
assert(fn != NULL);
|
|
- do_mem_zpa(s, zt, pg, addr, dtype, nreg, false, fn);
|
|
+ do_mem_zpa(s, zt, pg, addr, dtype, nreg + 1, false, fn);
|
|
}
|
|
|
|
static bool trans_LD_zprr(DisasContext *s, arg_rprr_load *a)
|
|
@@ -5182,14 +5183,13 @@ static void do_st_zpa(DisasContext *s, int zt, int pg, TCGv_i64 addr,
|
|
if (nreg == 0) {
|
|
/* ST1 */
|
|
fn = fn_single[s->mte_active[0]][be][msz][esz];
|
|
- nreg = 1;
|
|
} else {
|
|
/* ST2, ST3, ST4 -- msz == esz, enforced by encoding */
|
|
assert(msz == esz);
|
|
fn = fn_multiple[s->mte_active[0]][be][nreg - 1][msz];
|
|
}
|
|
assert(fn != NULL);
|
|
- do_mem_zpa(s, zt, pg, addr, msz_dtype(s, msz), nreg, true, fn);
|
|
+ do_mem_zpa(s, zt, pg, addr, msz_dtype(s, msz), nreg + 1, true, fn);
|
|
}
|
|
|
|
static bool trans_ST_zprr(DisasContext *s, arg_rprr_store *a)
|
|
--
|
|
2.41.0.windows.1
|
|
|