From nobody Sat Nov 15 12:14:52 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1751455266; cv=none; d=zohomail.com; s=zohoarc; b=FCxqo1jh1u+qiOsFJlBpWSUBMxrjhZ9PJPqdbj/269F+sXphDGZLHs7gQ3j/BPdzOpHSWvbTxYuvo4MghA4jNn3iDa++qm2/a5BZASAf2u0euze/UT7PmHGK+o9fH8evqTPxNsTKrs1l/NBJKhGumeJCt8YWVt3P/K7JuJfPFpc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751455266; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=FkWfQ1CcufARevD0crlAL/PMguTtM1aqN7M4uHH1bEM=; b=BEsNlLP/yG8uggRt0rU4ZcCXV2GHIEVfEJ82hPn7yFIhrQCUzcgYpEQDMhKu3r9kVPQc2AjeNG2KQp2PxT7oO1zHhI7SSRDqF0Xuf5wCVEfNI+BLcY9xZS5CDluQPWUnII5AFY/pGpzxtLk3JBgSqga1+9cqUWgCmd2naDnQy8Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1751455266217507.52410089608975; Wed, 2 Jul 2025 04:21:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uWvVf-0007VM-Pz; Wed, 02 Jul 2025 07:20:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uWvVY-0007Sc-Fy; Wed, 02 Jul 2025 07:20:08 -0400 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uWvVV-0002GT-UI; Wed, 02 Jul 2025 07:20:07 -0400 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-234bfe37cccso80705455ad.0; Wed, 02 Jul 2025 04:20:05 -0700 (PDT) Received: from localhost (pa49-178-74-199.pa.nsw.optusnet.com.au. [49.178.74.199]) by smtp.gmail.com with UTF8SMTPSA id 41be03b00d2f7-b362cef26dfsm3355840a12.46.2025.07.02.04.20.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 04:20:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751455203; x=1752060003; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FkWfQ1CcufARevD0crlAL/PMguTtM1aqN7M4uHH1bEM=; b=i6ovtHgi8XMwK/KOn1rXf/FwA5PLab52XNu4EH18YpDBDgfkQ7gI1YxxGoAquvwoPl C65pnfJKtcSYi6nTTYkP9niXymax2RoWr1y3KXeI55sB35FqUfvJMHEtkh5JNVY2oH4J O0HDs1NJDMh1/hrY1+HZ0E+b0PrnATGlG/K45tVFAJwwFu0jzeYo2+YEVHRO46jOCrid vjOIO9MljJQFO1a57NnTVNZQvvqKkQeldbrX8IpjbQzrDJ1BH3uEc3/A1m7OMI46Ze+m w8/zXh2ljj9oy8J3Dwz1uCOzWXTWngjmwXDWheNOhP2knNKe6VAV4hN05GTE477NMaOB YbrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751455203; x=1752060003; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FkWfQ1CcufARevD0crlAL/PMguTtM1aqN7M4uHH1bEM=; b=hPY06mCs+cPsEOAcQ+BclxZsWN6hog53sVDk9QbCHNWD3pQfyT7STXD0tkJzkJiSd+ 9Cu5SRZts081szrc/dZf/+kUj2qc2e4enTX8JM35lnS9RQRZu5/nWpkbVH5KkgplyYRg hAUB3SVwOs75ZTkvWybYRMDGtQAkh2fdjw/AmC+fnUJRCamGNlGBiKfqalGhxhbvfSMH Vz5W96xCDmpM12M4lq+Fe9bWDw34YFW4Z+Mi4/nYmBvYeAujePdnyJeeaKJbMYrRUmi+ rwevzGnBGgAx10OTfN+DtmmY6Ak8rmqzS9FBN9vXE6x+rtbypruuM7cMpyZ6hOVv0Bb3 v6GA== X-Forwarded-Encrypted: i=1; AJvYcCXKW1Tgplf/e7uW3cdmaTr5tomCLOMh7Cb53rnxQ85CJfbuGzGB9h7volG8BdMRjiGMSH5xL814jA==@nongnu.org X-Gm-Message-State: AOJu0YyvlTQEONbkresJmcxWuTQ64dlKLamTRvl2AoZtQ4aSbgQlfbXx aA6PNxwii2r9sIv39SuUn2fPdZFDDCrwYNjohGbKGaLy+qPUI2ri8O+mhGoBizZ5a9g= X-Gm-Gg: ASbGncvzrooNVsLGt4218nte/sP/FJQr3EszQUEVFRNK5JIPQZQWZfoszTACNmcu0WP dGyfhNdDAW4uCrvfWOoMWxaBFQL8o2YitmrwVyeJQEXV+h/9qJIWSZlms7buRnOVx0bRtYurQfS JmRk5HHXvTKQ2C3zYP/C4MMezjKbDG8l0C1zjROFPhS3i3XN1iCAw+6q1jTAdUT//8Cm6WTqMHq uPa4R8ZGq45YcCLSQi71hDUFpu4SM1nhdsBrksH7rk/p2gLdnXHjFAbqwjzbt9hn3u9kNYaRJE9 jQrfAKP9ARz0JA57CR+sUMVV81q+z+gb4QKvF3CmQVbgSO1OO29gT6ACFR31aaKZsalc5zuDyTs U8ID0pbFZgPffmOwTlCiY3BwUeoTbaCMTprS4DfbVe0Q= X-Google-Smtp-Source: AGHT+IGSnZqRB2lHLFyUQ+fs/OEy1aripPg8ByNO/rXp1zgPGkl9E3HwDBSt1G/cvC/47nvqSJJaeA== X-Received: by 2002:a17:902:db05:b0:235:2403:779f with SMTP id d9443c01a7336-23c6e5f4c50mr33718285ad.29.1751455203481; Wed, 02 Jul 2025 04:20:03 -0700 (PDT) From: William Kosasih To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, William Kosasih Subject: [PATCH v3 01/12] target/arm: Bring VLSTM/VLLDM helper store/load closer to the ARM pseudocode Date: Wed, 2 Jul 2025 20:49:43 +0930 Message-ID: <20250702111954.128563-2-kosasihwilliam4@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250702111954.128563-1-kosasihwilliam4@gmail.com> References: <20250702111954.128563-1-kosasihwilliam4@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62c; envelope-from=kosasihwilliam4@gmail.com; helo=mail-pl1-x62c.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1751455267294116600 Content-Type: text/plain; charset="utf-8" This patch brings the VLSTM and VLLDM helper functions closer to the ARM pseudocode by adding MO_ALIGN to the MemOpIdx of the associated store (`cpu_stl_mmu`) operations and load (`cpu_ldl_mmu`) operations. Note that this is not a bug fix: an 8-byte alignment check already exists and remains in place, enforcing stricter alignment than the 4 bytes requirement in the individual loads and stores. This change merely makes the helper implementations closer to the ARM pseudocode. That said, as a side effect, the MMU index is now resolved once instead of on every `cpu_*_data_ra` call, reducing redundant lookups Signed-off-by: William Kosasih Reviewed-by: Richard Henderson --- target/arm/tcg/m_helper.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/target/arm/tcg/m_helper.c b/target/arm/tcg/m_helper.c index 6614719832..251e12edf9 100644 --- a/target/arm/tcg/m_helper.c +++ b/target/arm/tcg/m_helper.c @@ -1048,6 +1048,9 @@ void HELPER(v7m_vlstm)(CPUARMState *env, uint32_t fpt= r) bool s =3D env->v7m.fpccr[M_REG_S] & R_V7M_FPCCR_S_MASK; bool lspact =3D env->v7m.fpccr[s] & R_V7M_FPCCR_LSPACT_MASK; uintptr_t ra =3D GETPC(); + ARMMMUIdx mmu_idx =3D arm_mmu_idx(env); + MemOpIdx oi =3D make_memop_idx(MO_TEUL | MO_ALIGN, + arm_to_core_mmu_idx(mmu_idx)); =20 assert(env->v7m.secure); =20 @@ -1073,7 +1076,7 @@ void HELPER(v7m_vlstm)(CPUARMState *env, uint32_t fpt= r) * Note that we do not use v7m_stack_write() here, because the * accesses should not set the FSR bits for stacking errors if they * fail. (In pseudocode terms, they are AccType_NORMAL, not AccType_ST= ACK - * or AccType_LAZYFP). Faults in cpu_stl_data_ra() will throw exceptio= ns + * or AccType_LAZYFP). Faults in cpu_stl_mmu() will throw exceptions * and longjmp out. */ if (!(env->v7m.fpccr[M_REG_S] & R_V7M_FPCCR_LSPEN_MASK)) { @@ -1089,12 +1092,12 @@ void HELPER(v7m_vlstm)(CPUARMState *env, uint32_t f= ptr) if (i >=3D 16) { faddr +=3D 8; /* skip the slot for the FPSCR */ } - cpu_stl_data_ra(env, faddr, slo, ra); - cpu_stl_data_ra(env, faddr + 4, shi, ra); + cpu_stl_mmu(env, faddr, slo, oi, ra); + cpu_stl_mmu(env, faddr + 4, shi, oi, ra); } - cpu_stl_data_ra(env, fptr + 0x40, vfp_get_fpscr(env), ra); + cpu_stl_mmu(env, fptr + 0x40, vfp_get_fpscr(env), oi, ra); if (cpu_isar_feature(aa32_mve, cpu)) { - cpu_stl_data_ra(env, fptr + 0x44, env->v7m.vpr, ra); + cpu_stl_mmu(env, fptr + 0x44, env->v7m.vpr, oi, ra); } =20 /* @@ -1121,6 +1124,9 @@ void HELPER(v7m_vlldm)(CPUARMState *env, uint32_t fpt= r) { ARMCPU *cpu =3D env_archcpu(env); uintptr_t ra =3D GETPC(); + ARMMMUIdx mmu_idx =3D arm_mmu_idx(env); + MemOpIdx oi =3D make_memop_idx(MO_TEUL | MO_ALIGN, + arm_to_core_mmu_idx(mmu_idx)); =20 /* fptr is the value of Rn, the frame pointer we load the FP regs from= */ assert(env->v7m.secure); @@ -1155,16 +1161,16 @@ void HELPER(v7m_vlldm)(CPUARMState *env, uint32_t f= ptr) faddr +=3D 8; /* skip the slot for the FPSCR and VPR */ } =20 - slo =3D cpu_ldl_data_ra(env, faddr, ra); - shi =3D cpu_ldl_data_ra(env, faddr + 4, ra); + slo =3D cpu_ldl_mmu(env, faddr, oi, ra); + shi =3D cpu_ldl_mmu(env, faddr + 4, oi, ra); =20 dn =3D (uint64_t) shi << 32 | slo; *aa32_vfp_dreg(env, i / 2) =3D dn; } - fpscr =3D cpu_ldl_data_ra(env, fptr + 0x40, ra); + fpscr =3D cpu_ldl_mmu(env, fptr + 0x40, oi, ra); vfp_set_fpscr(env, fpscr); if (cpu_isar_feature(aa32_mve, cpu)) { - env->v7m.vpr =3D cpu_ldl_data_ra(env, fptr + 0x44, ra); + env->v7m.vpr =3D cpu_ldl_mmu(env, fptr + 0x44, oi, ra); } } =20 --=20 2.48.1 From nobody Sat Nov 15 12:14:52 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1751455340; cv=none; d=zohomail.com; s=zohoarc; b=JNrzeVQk7IZ7y2EaMa2EevYy039MxLHGqL8Q95xd9b0XKaBnzePAowFjRAy5ZWXktYh1JI8w5MKsqGAd1CfAehDRzhWZhujLvDukaD7YJmMIMBBRwzv9T+B0mp00qqZ0QD7dy8RkuNIbF8ll57Oi3RCLhArG/kwBI2r8F7jpalk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751455340; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=XxWORJNR5cWeeNL6wFpxR5xESZhNAoZLn5RWItiQ610=; b=jv5fcjXW0nDRFV1jhABq6fQz/eXB6X2DIQ5CYP7wXOlAYcSYbiK2ZWxoDVrr19YeIckUDiSVZJbQsceNSlIpqP9d2A0ii6XT/dah3PeemXHgECMee0J24FZKSNWvMMVktHtzhNX5s7Ujb8eb4JtgyXbaYE/Nuy2sM/q+iBhbKPg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1751455340206302.231570827439; Wed, 2 Jul 2025 04:22:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uWvVn-0007Z2-7M; Wed, 02 Jul 2025 07:20:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uWvVh-0007XX-U8; Wed, 02 Jul 2025 07:20:17 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uWvVa-0002HZ-B1; Wed, 02 Jul 2025 07:20:16 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-235f9e87f78so43792535ad.2; Wed, 02 Jul 2025 04:20:09 -0700 (PDT) Received: from localhost (pa49-178-74-199.pa.nsw.optusnet.com.au. [49.178.74.199]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-23acb3b9344sm133618575ad.192.2025.07.02.04.20.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 04:20:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751455208; x=1752060008; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XxWORJNR5cWeeNL6wFpxR5xESZhNAoZLn5RWItiQ610=; b=OnqKUPDEu0cEUxjRuYZRUx9E4koqOvlq/ApDLfCQDifZWVBgFxwEin5dguNdMUgcn0 9h9sWqxiq6wTbBF0U5cs8heRCBa5bYpoxKgrOZ3QIwIuMXMG90ycWAsgHh+A1w8VOWYt XcWG+xhK4hjQ4nQRhTZTkJT4Rf6V7grMayPalCDBW/UC0V5p61q6NcmvZg7rSGmHTkbg 3ULj9obA4uPyhE6tZtnz/y2Ygei0tEmp1Hd75R9bByXTCK+kCIChkHZPj+87WSOji7Vj toDICEljHVc2SkYUdI9Br1k0/N595AO1V1roBUDMDds2l4iGpyRUJ5ZOmzOeGyFtqCcx 0WeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751455208; x=1752060008; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XxWORJNR5cWeeNL6wFpxR5xESZhNAoZLn5RWItiQ610=; b=QPF1Iqd4rco84rgOeiEpgmz/XgCpFDuKGjPiQ5ToNpLjS5kkAl5efc6WNkq2UoWm4Q AMAEb027lTfBljjZ/uKnRUogIHAmOQjEv3ulM63foeIZiosBKb0YCzvackFCP5kNprbL vjb1/A7JVrKhS/jiT4QWaFM0OoPzrvAomAIgWFsqtWf77M62ED9SOC26F6Q6GFERJW8J 3wakxF0IwgBoJuAWH2JehceTY/hvm80sSC7i9PpN9YglSdPqkWGBfvKvCBWk+BDFrbLF u9d58AXe2KmW6wY+pYs+E2nHG7NC3N+sLGC9vySBXVnkhASf8D8evoMccP13vLEXITuw GJUg== X-Forwarded-Encrypted: i=1; AJvYcCVQnyR8dKHjRTZaUAg+HSnOZAADDl2bBb9KDVMRdnfDegXgo/3jvsz1C1XQoyXfBSFLb3XYij9MYw==@nongnu.org X-Gm-Message-State: AOJu0Yy7ZXuRpzAYok/AqCOvVClTUnlesEod9caLU4AobzfWZKxCLkRw xIVhwQZG+T0JWy0OxiaIHJp/ahHf8phB4kmq7q2eZKBHSPKfLj0GtrnXoxjXUvGVvQQ= X-Gm-Gg: ASbGncvODxZht45UJ5QigCzjNxR0DT4SmR6IT/yHfGeFfgiC+zpXWySehPuytnskXio hCIzGf2h1vx8IGzilrrzlvcb5D8mObzHUf7VKpEV4lpJhXioHzqYdRbqbYX8BI+4l7Ob91duKZ0 liIlFJgr4T8BT9qlWFO3mxMzphm+ELCddDA1CULfPE47zJJYzvjfmcZlkvWxDIlM/JjtgMl85Hz NFh5UYWhoCAdZYsb9Z3/lPMPCYpWstx5qfEJwzSK2CJxiMJj0Ah8WVnociAN+RkMhoiXzy7kVUy cG8uOOiSJ2EfOhIFNg6LqSrXjhIQEPfOCBHXvUHBzRNuAkH9AfDOC0f7urS5JwF6thmgTCtL0GD PbnM4j4tTPA7Af4l2eMRjrw5NXAAS2aNhXYgxC573/EU= X-Google-Smtp-Source: AGHT+IHvHNx5HU2xaNXOcLWj6xgR7jZOUnmnNeddmrZDTNSusAG2WFVC8O83sXbD6jUipZbmUJfrXQ== X-Received: by 2002:a17:903:1ae3:b0:234:d292:be95 with SMTP id d9443c01a7336-23c6e56f58bmr34420655ad.42.1751455207675; Wed, 02 Jul 2025 04:20:07 -0700 (PDT) From: William Kosasih To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, William Kosasih Subject: [PATCH v3 02/12] target/arm: Fix BLXNS helper store alignment checks Date: Wed, 2 Jul 2025 20:49:44 +0930 Message-ID: <20250702111954.128563-3-kosasihwilliam4@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250702111954.128563-1-kosasihwilliam4@gmail.com> References: <20250702111954.128563-1-kosasihwilliam4@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=kosasihwilliam4@gmail.com; helo=mail-pl1-x62f.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1751455341803116600 Content-Type: text/plain; charset="utf-8" This patch adds alignment checks in the store operations (when stacking the return pc and psr) in the BLXNS instruction. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1154 Signed-off-by: William Kosasih Reviewed-by: Richard Henderson --- target/arm/tcg/m_helper.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/target/arm/tcg/m_helper.c b/target/arm/tcg/m_helper.c index 251e12edf9..f342d93489 100644 --- a/target/arm/tcg/m_helper.c +++ b/target/arm/tcg/m_helper.c @@ -632,8 +632,11 @@ void HELPER(v7m_blxns)(CPUARMState *env, uint32_t dest) } =20 /* Note that these stores can throw exceptions on MPU faults */ - cpu_stl_data_ra(env, sp, nextinst, GETPC()); - cpu_stl_data_ra(env, sp + 4, saved_psr, GETPC()); + ARMMMUIdx mmu_idx =3D arm_mmu_idx(env); + MemOpIdx oi =3D make_memop_idx(MO_TEUL | MO_ALIGN, + arm_to_core_mmu_idx(mmu_idx)); + cpu_stl_mmu(env, sp, nextinst, oi, GETPC()); + cpu_stl_mmu(env, sp + 4, saved_psr, oi, GETPC()); =20 env->regs[13] =3D sp; env->regs[14] =3D 0xfeffffff; --=20 2.48.1 From nobody Sat Nov 15 12:14:52 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1751455336; cv=none; d=zohomail.com; s=zohoarc; b=JrBag7VkFBLBnYuzV5SpRS+3kVGgL8L8cwiP/tJcg1Ll7U8iicZ0gKW10tpVAiAdNbRVzWlp05Ia0X6zi1NVfzOSDf2u41cZ8dt4cwqSkttVDKCmf9m1rvxRzWI702qUbFVBFom9V3iIdQsi6VFCJscoOEPgqQ418COrYhCaEhI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751455336; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=wnu/gBrofYGPtwFVydQpKrmYxzDenOFmEobdvM+2Gm8=; b=IKhF57zDyPVZS7iZ5JiizrwxpQ/4/DQUEmwv1YAFUfS1pRbpHInUpNinGJGylF9lAmmAScgj/X1uIbQ2meta+lnq0/Y1h3Fd4FeMUEp7rsObOcFI91IP6ExgogeFzbif+scWiYIKD04DY7mmiDoK2Kz1T5hFJ9Us848+AVJmr+E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 175145533680962.031597998156144; Wed, 2 Jul 2025 04:22:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uWvVn-0007aL-Td; Wed, 02 Jul 2025 07:20:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uWvVm-0007ZR-Ig; Wed, 02 Jul 2025 07:20:22 -0400 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uWvVg-0002JJ-C6; Wed, 02 Jul 2025 07:20:21 -0400 Received: by mail-pj1-x1035.google.com with SMTP id 98e67ed59e1d1-3138b2f0249so5428226a91.2; Wed, 02 Jul 2025 04:20:13 -0700 (PDT) Received: from localhost (pa49-178-74-199.pa.nsw.optusnet.com.au. [49.178.74.199]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-318c152338bsm13886434a91.47.2025.07.02.04.20.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 04:20:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751455212; x=1752060012; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wnu/gBrofYGPtwFVydQpKrmYxzDenOFmEobdvM+2Gm8=; b=Duwk4noDgvTeLbqyhIjIv+hBLc6jP4DCxoDJkjEW8jfYf3sG8a+94gjqZNggm6RbJX i/mg2M50nQi5h4r4P5K32evBUc8+NQ1rWmS2xbEqrW6K6LpLE10WQhQ0lIB0sizFN406 8LWa+qApebYfWa/MxWN9X7igpN80epOUIPrneDqzvMe9lN1oAJyUbkISCS9UtE6njKIq eYsYNLHP0bAM9d4am1rnZSu+bSiAk5kpq7g+YCJQpC6meqlVUVAZwYyjPjcJfS+wWK0w k4bvo0cpdnf+YuOQ94F0A72Ptj2ZcKM4G+3AZi752ZrUeJ9JbDFL/rFhsFevFINsknVC jKpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751455212; x=1752060012; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wnu/gBrofYGPtwFVydQpKrmYxzDenOFmEobdvM+2Gm8=; b=aebF11XemHdiraqpbyA9ru/9Y2TLN6zH6KcPX9TYUCZyO0d4mqFY8BDsR5GKzWfK0N vghZJsHc7itHZvVQkcFISoP3Mp8jwN+5+dA8kHFdSYl+/dGB7AqlqbXCuizajMuXfxLe rh0QIRGULvSN6FfXqOR2d884vTd59bxfQjcC+Z5C/cALFVFVoIH348VKZgokHL8adHFK eWPOO/m3fYBYShj7Mb4+k5VQK4qgDgiG6XjuTPI+jOWPVPGQdDFhllYcac6TRRwwvAV9 p+4oIojqHfOXfnsTA8OpjjXydyCo7RJUFtamYfIg61SXhRDaO6SUXIFuKDBdy2sizK3f u2dQ== X-Forwarded-Encrypted: i=1; AJvYcCWiC/QQBe2i1B8gVmRN2uIN7DufXF+HHRDYgkpMawH4/nbBhVkC7eUi1BrnT1GMaCWZPNaD5QPGAA==@nongnu.org X-Gm-Message-State: AOJu0Yzy0MUYSea+SOqhTJXxUymyeaaKDeZiApp6Ru8ViLwvrUlZH3hq IFDlC3F0ZxAqs5iSe+bcXdHmJTg/YAAvDlYvgC7Ni8lu4mcNTx2s+slT7UHjDNg5+HU= X-Gm-Gg: ASbGncubiYeHPfb4V67xDfAtA5tcyvsnVSTuVKQldeTxtbycNBBvfJa2kN1zov+2pOX nsDXUfpxDlSzLYAtcnJ2KOaheP8M1tslZgh0Va+cRaw8QVUFtZBylK9JeQf95qFRWnbyTIWgbtJ +X7NLdDrIc6AN+ZR0JIyCiBl2PVbAEJOnW57ttM4dl2p5eKhKaKafcmoUNEF1TC2vDxhuS2ry70 F9iTq8waLxqviLOiPlb96RSCm0U99t9l/JUQlMx5lhUStmDNNblxuYM9Nk+QYdcjXPMfvmpt62X y+D5Ymb8JiBQr4ro3lHvnTFA/fo0ZN7bTzlvh8qca1gWW6y4wGbt3ODbpKv7Fg1QqU0cMexHLIh YfrItV7oqb//IaLPbZthQrFG8vU/GnmXAAMdkrh0ih/w= X-Google-Smtp-Source: AGHT+IFFbJ9huGhqopeUYK1fxeFKxWnZSMAdBaFgifZO2zNRASUFvRnkG30KWc04jSDd0nfpN+TvRA== X-Received: by 2002:a17:90b:5787:b0:311:9c1f:8522 with SMTP id 98e67ed59e1d1-31a90b2a07amr4119983a91.10.1751455211787; Wed, 02 Jul 2025 04:20:11 -0700 (PDT) From: William Kosasih To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, William Kosasih Subject: [PATCH v3 03/12] target/arm: Fix function_return helper load alignment checks Date: Wed, 2 Jul 2025 20:49:45 +0930 Message-ID: <20250702111954.128563-4-kosasihwilliam4@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250702111954.128563-1-kosasihwilliam4@gmail.com> References: <20250702111954.128563-1-kosasihwilliam4@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1035; envelope-from=kosasihwilliam4@gmail.com; helo=mail-pj1-x1035.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1751455337721116600 Content-Type: text/plain; charset="utf-8" This patch adds alignment checks in the load operations (when unstacking the return pc and psr) in the FunctionReturn pseudocode. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1154 Signed-off-by: William Kosasih Reviewed-by: Richard Henderson --- target/arm/tcg/m_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/tcg/m_helper.c b/target/arm/tcg/m_helper.c index f342d93489..28307b5615 100644 --- a/target/arm/tcg/m_helper.c +++ b/target/arm/tcg/m_helper.c @@ -1946,7 +1946,7 @@ static bool do_v7m_function_return(ARMCPU *cpu) * do them as secure, so work out what MMU index that is. */ mmu_idx =3D arm_v7m_mmu_idx_for_secstate(env, true); - oi =3D make_memop_idx(MO_LEUL, arm_to_core_mmu_idx(mmu_idx)); + oi =3D make_memop_idx(MO_LEUL | MO_ALIGN, arm_to_core_mmu_idx(mmu_= idx)); newpc =3D cpu_ldl_mmu(env, frameptr, oi, 0); newpsr =3D cpu_ldl_mmu(env, frameptr + 4, oi, 0); =20 --=20 2.48.1 From nobody Sat Nov 15 12:14:52 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1751455337; cv=none; d=zohomail.com; s=zohoarc; b=AYd6YQvpkygwMMZqrSQ6VgqlS3HfYUEKRbLzS2q7Lp3RHejxZsxcghiuAdWOkY7nvoJSdl0VeCW+/imPRGhCzOe8gsr1TLW/PdwvQA45RAyfIn/Vd3YzQBq9JoPtz/4dsJIygpBPK1jmRzt4JIMMavvAQZ57tr/JlH7IOPFaNQI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751455337; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=3J4Bv1vpjzwpdZe6XYejX5dLNpz+G5brIjasw5lYx80=; b=R4/8rfTz0tjwitwsYoQnCpOG5FqmDKVxEqqrlIWt22jjLhDy1JsaUtmDv1arH6hLpUAjfD3CZnyB0wjUFH5og40VqBzt3944drOmqcUPBZ4vQLgO4yfYuNbGq+l9kk1IoYKZNlH55wvHtFqURWh4gWC1Bbc2Ecg27M+LsGdqeXA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1751455337689212.62270733054527; Wed, 2 Jul 2025 04:22:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uWvVo-0007ah-2B; Wed, 02 Jul 2025 07:20:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uWvVl-0007Yz-Vv; Wed, 02 Jul 2025 07:20:22 -0400 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uWvVj-0002Lc-KH; Wed, 02 Jul 2025 07:20:21 -0400 Received: by mail-pg1-x52f.google.com with SMTP id 41be03b00d2f7-b0b2d0b2843so5681153a12.2; Wed, 02 Jul 2025 04:20:17 -0700 (PDT) Received: from localhost (pa49-178-74-199.pa.nsw.optusnet.com.au. [49.178.74.199]) by smtp.gmail.com with UTF8SMTPSA id 41be03b00d2f7-b34e320fc3bsm11469354a12.75.2025.07.02.04.20.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 04:20:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751455216; x=1752060016; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3J4Bv1vpjzwpdZe6XYejX5dLNpz+G5brIjasw5lYx80=; b=iffLnyARVCGKfoPtEZ4AZ+UQEmXaK7jCLfHnP5zBkllvhBoPHcC7OoCg2tHQuoHhST jXWUgh8mrbuSrWjDwYv79pWEZ1i61/hCyusXZk8+g9ekbU/nm2oJqY8DBKI4LrWkCn/S 2bw8qADvmHWWA9DFbcq4p28YhtRk7lhYtvOrOtaT+a61TNWQRs2zGsth2RGFeJ1mkEw/ i1qLLmrRuaGWFl+xP/h4TuaZ58tAkDqs6KkLAHMmYTzoMHv5oEneam7B53tdNJGc+w7w bv2nsmh+aCk9w01LEbREMqQyW3ppknLJUaF4xoHeX9sVzsoYNkUap2+W0T6aeNw7qxzV 8UJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751455216; x=1752060016; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3J4Bv1vpjzwpdZe6XYejX5dLNpz+G5brIjasw5lYx80=; b=vAXdlsj86hv2ItuOF+MNE0OloGJ466NPjVcjn5kjFl/eM/ZWu1a07NE8dVDhzo1xs2 IiAINgg8zfgDVwCuE5+Tg+lVqgCr4isWgNp0QXXtVQCiX40y6AWFu9pQh8ML4gEWlFCj yytT3zdiYulaWw5NLtAfu9xF00CxfQR7modjNWyCGl+EGdxCxDW13qUyEoidqvr1MuI+ 43fxfNxzGeIKzfWmKRMTdTWRmKukST5aYdfB46IPYDHL6ogWXbJMbHQ69tFFN/W8ezHd BrS0pdrOWYwpX40d5lo8NPm7Osip4Ohm/LET5IyJ/Cns8iaPiomANpDEhUA/60MlYD9L 2QcQ== X-Forwarded-Encrypted: i=1; AJvYcCXPtQgCPYtuIydNC/KS4mIZopG7UCSC5bI7H2zSvxFChypFmFp9ZIE4PxOjyIIwqrDYkSQyLAKKyQ==@nongnu.org X-Gm-Message-State: AOJu0YyMak1293ZRxUU4CEzqVJvxbGdldvq6gXmcFKT18IY5mippuyJt NIZiHM3zb7fwowRifq6qVZ1dWzZyy9CbUjxhFrTrY6w6Zj2y1bECGuvddhDW8l6pKdE= X-Gm-Gg: ASbGnct2bNM/bhkAL23SHpR9fjsYd+j9jSjjpPepZgur6YzQ7fO0W2yx5llwLxW/Bne EuElZGX0N+DjHf014m75HNApKo+A5fGmjN9ZEvJ/Jca5MMBVAXpU8MI3ZCPf88vcwpTSsL16w7i EeCt2yqVuu+jIh1R2HqKJpOL66C9Nm+ScvMhft1FK9LvgSVlEabs6Lw5aSMG14CVwop5xXE+ZRf mn+cRZmc3majQliZto6uIPC7mLeSQfEAWBUiRVdoIq9FzFsWZMAFYKrw65CoipKBjRCSTe7Q85S QdIvq+oFHwr/iza2WgG0NcDFWYMe2VkiuIZATpi9GBzc2OCkPXrw63WfcwwmtRHa3rU+hSTv34T jI2tkIFBaEwpfyX1zy9/6SgXD3OreUvNRvGsxEBgpjPg= X-Google-Smtp-Source: AGHT+IF68756L99A9VzBRT2/V6cS0pnieY6wP4CjbVZVbV7SVoo+jCcCARvky1tubENTSz30QbmUbg== X-Received: by 2002:a17:90b:33c4:b0:316:d69d:49fb with SMTP id 98e67ed59e1d1-31a90b3d073mr4734170a91.14.1751455215922; Wed, 02 Jul 2025 04:20:15 -0700 (PDT) From: William Kosasih To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, William Kosasih Subject: [PATCH v3 04/12] target/arm: Fix VLDR helper load alignment checks Date: Wed, 2 Jul 2025 20:49:46 +0930 Message-ID: <20250702111954.128563-5-kosasihwilliam4@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250702111954.128563-1-kosasihwilliam4@gmail.com> References: <20250702111954.128563-1-kosasihwilliam4@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::52f; envelope-from=kosasihwilliam4@gmail.com; helo=mail-pg1-x52f.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1751455339721116600 Content-Type: text/plain; charset="utf-8" This patch adds alignment checks in the load operations in the VLDR instruction. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1154 Signed-off-by: William Kosasih Reviewed-by: Richard Henderson --- target/arm/tcg/mve_helper.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/target/arm/tcg/mve_helper.c b/target/arm/tcg/mve_helper.c index 506d1c3475..1db626bb26 100644 --- a/target/arm/tcg/mve_helper.c +++ b/target/arm/tcg/mve_helper.c @@ -148,13 +148,15 @@ static void mve_advance_vpt(CPUARMState *env) } =20 /* For loads, predicated lanes are zeroed instead of keeping their old val= ues */ -#define DO_VLDR(OP, MSIZE, LDTYPE, ESIZE, TYPE) \ +#define DO_VLDR(OP, MFLAG, MSIZE, MTYPE, LDTYPE, ESIZE, TYPE) \ void HELPER(mve_##OP)(CPUARMState *env, void *vd, uint32_t addr) \ { \ TYPE *d =3D vd; \ uint16_t mask =3D mve_element_mask(env); \ uint16_t eci_mask =3D mve_eci_mask(env); \ unsigned b, e; \ + int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); \ + MemOpIdx oi =3D make_memop_idx(MFLAG | MO_ALIGN, mmu_idx); \ /* \ * R_SXTM allows the dest reg to become UNKNOWN for abandoned \ * beats so we don't care if we update part of the dest and \ @@ -163,7 +165,7 @@ static void mve_advance_vpt(CPUARMState *env) for (b =3D 0, e =3D 0; b < 16; b +=3D ESIZE, e++) { = \ if (eci_mask & (1 << b)) { \ d[H##ESIZE(e)] =3D (mask & (1 << b)) ? \ - cpu_##LDTYPE##_data_ra(env, addr, GETPC()) : 0; \ + (MTYPE)cpu_##LDTYPE##_mmu(env, addr, oi, GETPC()) : 0;\ } \ addr +=3D MSIZE; \ } \ @@ -185,20 +187,20 @@ static void mve_advance_vpt(CPUARMState *env) mve_advance_vpt(env); \ } =20 -DO_VLDR(vldrb, 1, ldub, 1, uint8_t) -DO_VLDR(vldrh, 2, lduw, 2, uint16_t) -DO_VLDR(vldrw, 4, ldl, 4, uint32_t) +DO_VLDR(vldrb, MO_UB, 1, uint8_t, ldb, 1, uint8_t) +DO_VLDR(vldrh, MO_TEUW, 2, uint16_t, ldw, 2, uint16_t) +DO_VLDR(vldrw, MO_TEUL, 4, uint32_t, ldl, 4, uint32_t) =20 DO_VSTR(vstrb, 1, stb, 1, uint8_t) DO_VSTR(vstrh, 2, stw, 2, uint16_t) DO_VSTR(vstrw, 4, stl, 4, uint32_t) =20 -DO_VLDR(vldrb_sh, 1, ldsb, 2, int16_t) -DO_VLDR(vldrb_sw, 1, ldsb, 4, int32_t) -DO_VLDR(vldrb_uh, 1, ldub, 2, uint16_t) -DO_VLDR(vldrb_uw, 1, ldub, 4, uint32_t) -DO_VLDR(vldrh_sw, 2, ldsw, 4, int32_t) -DO_VLDR(vldrh_uw, 2, lduw, 4, uint32_t) +DO_VLDR(vldrb_sh, MO_UB, 1, int8_t, ldb, 2, int16_t) +DO_VLDR(vldrb_sw, MO_UB, 1, int8_t, ldb, 4, int32_t) +DO_VLDR(vldrb_uh, MO_UB, 1, uint8_t, ldb, 2, uint16_t) +DO_VLDR(vldrb_uw, MO_UB, 1, uint8_t, ldb, 4, uint32_t) +DO_VLDR(vldrh_sw, MO_TEUW, 2, int16_t, ldw, 4, int32_t) +DO_VLDR(vldrh_uw, MO_TEUW, 2, uint16_t, ldw, 4, uint32_t) =20 DO_VSTR(vstrb_h, 1, stb, 2, int16_t) DO_VSTR(vstrb_w, 1, stb, 4, int32_t) --=20 2.48.1 From nobody Sat Nov 15 12:14:52 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1751455266; cv=none; d=zohomail.com; s=zohoarc; b=oIxIc4+USjwAdCnAeFLucn6E9AzQqJyuqZK0MkSzfRcacHsQZfEj/TYabuZH7kFU0Llfbm9gCVf5hL1bRSQZs9MdFO4HycoR6gxgqWPFeEfOs5qQBH3bus0XzVy3gntLRxPCU1EC4ubesfrWfzsNSHiG+1hZUwU+4IW+vXWeF9Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751455266; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=EGagJ9raKAPmcJyXmW93lh9+2lhFg+AHjUBxVVIGA34=; b=Fiho3pMDHv3ll/0rz6ntblA6T2vC11noUqIosBXfkhQkPFBbzM2++6xiHunu1bAniQx043KemjeZ5deR0T5W9xtQA+rTf79WPtB4rNMmipwsnAnvHJQlT4tEscQqkVrfmUQcGHm237jqMjgCgs/d/vvbIOL6+xKQyRiMhh2bJws= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17514552656221006.3929294726042; Wed, 2 Jul 2025 04:21:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uWvVt-0007cj-Rw; Wed, 02 Jul 2025 07:20:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uWvVs-0007bx-DA; Wed, 02 Jul 2025 07:20:28 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uWvVm-0002NQ-Aq; Wed, 02 Jul 2025 07:20:28 -0400 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-235a3dd4f0dso41655965ad.0; Wed, 02 Jul 2025 04:20:21 -0700 (PDT) Received: from localhost (pa49-178-74-199.pa.nsw.optusnet.com.au. [49.178.74.199]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-23acb3c94b3sm125892915ad.245.2025.07.02.04.20.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 04:20:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751455220; x=1752060020; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EGagJ9raKAPmcJyXmW93lh9+2lhFg+AHjUBxVVIGA34=; b=Z+JauEeGTzeFBNG2rT5TvIPJ89NwgrvDhYZ5puHWWQ5pjNbR+EcVjrXE2oHn+50PEk usRVaRYgDN4VsLJWBLQi6ZeB7Zs4qDaA9MZxuanZUIpvyev0BAKJS7EU1CHCWQq0Ubcw dK5NQ+KbIiwMpRwpbyOo1qeYOISjUaq817UFMl82DubRok1G39kvzGNvZk44451blGXT i3VnyrQhgdBf9TosEsIjQcK2bsrA5jY+38+hb5EVP+TbaF7ZKbbnvfrSCr1085ejFJkm mNQaXCg99Bh1N3tb6omaJfv4SYc+jqpr+vm0rZCUpml62X0dWeAh10HNfHy0VQB6NyAf UhgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751455220; x=1752060020; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EGagJ9raKAPmcJyXmW93lh9+2lhFg+AHjUBxVVIGA34=; b=YZ6MSOrm+H1QAMaXWMvMWZ1CDimhT0hTJJq4fEs2nr7DD+sF3a1+TKlgTgrGzMrEec vVaYhBCA3t3cSm/0AG4m3a++B6lqS3a2eabk5sxoc9bnADnpTFZwp/VYfAED1c/xWZ6X cvh8dGaMLLw80rLPSJZNZX2EzstDMbmp9y3+VJ1/+LnR7E8CY/A0Mhikqu5yby915hFU OT7boPXXiRXwt5mGTPrz+sGH+fl6kBVN9FR6IvpxqrAlGuHR57p9Gq0lhAFEupuLKAob 6UtXlQU1FC4li7Xo+3BVpzOLEVdYzHa8g+iPjFhJ/RLa4GK1z/11BCboSYapgxx3QYJO GatQ== X-Forwarded-Encrypted: i=1; AJvYcCWwdR13zOcZRj4EQA7SFZwjkihWvYAl0rYpXjs1OXbkBAshWIbgCOrbuIiKx7QVpi+/pt4HvGbC8Q==@nongnu.org X-Gm-Message-State: AOJu0YzSvzS3wAYL5maoUTdzOVQ03WNjNLBxKnD1ofrvP0DYKON5iPAJ jeUf9ui/OExjYofXqpnLJp29L2ccOKHc4f3MWlGE4WQiSMXWKKDnXUNv1OEk0rVpvCQ= X-Gm-Gg: ASbGncs5KVfwu68MO0JN4jz6lhY5/fofitQlRvp4tOVi/XF55qqKkmFAIQCd//hd2B1 G4pVAo7eCGV1HVwh/wJqNWKldGlfJUcMtlHZbKwEivPPszvKPTO0RfnGBHJTCGvqxk6BGKVw0QM fNKjncUG70SMABnXGioBZicP2UrxZezLcmT4cA6/up7hBXHcumuEuZXNr8GsMJYfMTNyjJCjrzw 105I2NZulO6bvREya+UP6zLqG/XYn3Au8xszYGBRNO1N0tOC7BfIHh66ah7eBnFE4S/RUxXr+rK nsDhnDwApCBIYEr8RNaPLakdNy4bnznSg3uHW/EFqrr+/JDELsXav0fAZ8x22BnKEGNuD6BCkQ4 mH3Vyys+Y0To2AGCrcdYninKpbHekFtgFLxB1F92UhNglxiww6sZyzA== X-Google-Smtp-Source: AGHT+IEv+yHJX5YAWNBIKiA7PBLl/DQVOObERCF9GEd5iErXg7FG9dJDITor928KsaRt9t2q7ZzHTQ== X-Received: by 2002:a17:902:fc8d:b0:234:a44c:18d with SMTP id d9443c01a7336-23c6e5253d6mr38625505ad.22.1751455219921; Wed, 02 Jul 2025 04:20:19 -0700 (PDT) From: William Kosasih To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, William Kosasih Subject: [PATCH v3 05/12] target/arm: Fix VSTR helper store alignment checks Date: Wed, 2 Jul 2025 20:49:47 +0930 Message-ID: <20250702111954.128563-6-kosasihwilliam4@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250702111954.128563-1-kosasihwilliam4@gmail.com> References: <20250702111954.128563-1-kosasihwilliam4@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=kosasihwilliam4@gmail.com; helo=mail-pl1-x631.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1751455267175116600 Content-Type: text/plain; charset="utf-8" This patch adds alignment checks in the store operations in the VSTR instruction. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1154 Signed-off-by: William Kosasih Reviewed-by: Richard Henderson --- target/arm/tcg/mve_helper.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/target/arm/tcg/mve_helper.c b/target/arm/tcg/mve_helper.c index 1db626bb26..9156cb8f9f 100644 --- a/target/arm/tcg/mve_helper.c +++ b/target/arm/tcg/mve_helper.c @@ -172,15 +172,17 @@ static void mve_advance_vpt(CPUARMState *env) mve_advance_vpt(env); \ } =20 -#define DO_VSTR(OP, MSIZE, STTYPE, ESIZE, TYPE) \ +#define DO_VSTR(OP, MFLAG, MSIZE, STTYPE, ESIZE, TYPE) \ void HELPER(mve_##OP)(CPUARMState *env, void *vd, uint32_t addr) \ { \ TYPE *d =3D vd; \ uint16_t mask =3D mve_element_mask(env); \ unsigned b, e; \ + int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); \ + MemOpIdx oi =3D make_memop_idx(MFLAG | MO_ALIGN, mmu_idx); \ for (b =3D 0, e =3D 0; b < 16; b +=3D ESIZE, e++) { = \ if (mask & (1 << b)) { \ - cpu_##STTYPE##_data_ra(env, addr, d[H##ESIZE(e)], GETPC())= ; \ + cpu_##STTYPE##_mmu(env, addr, d[H##ESIZE(e)], oi, GETPC())= ; \ } \ addr +=3D MSIZE; \ } \ @@ -191,9 +193,9 @@ DO_VLDR(vldrb, MO_UB, 1, uint8_t, ldb, 1, uint8_t) DO_VLDR(vldrh, MO_TEUW, 2, uint16_t, ldw, 2, uint16_t) DO_VLDR(vldrw, MO_TEUL, 4, uint32_t, ldl, 4, uint32_t) =20 -DO_VSTR(vstrb, 1, stb, 1, uint8_t) -DO_VSTR(vstrh, 2, stw, 2, uint16_t) -DO_VSTR(vstrw, 4, stl, 4, uint32_t) +DO_VSTR(vstrb, MO_UB, 1, stb, 1, uint8_t) +DO_VSTR(vstrh, MO_TEUW, 2, stw, 2, uint16_t) +DO_VSTR(vstrw, MO_TEUL, 4, stl, 4, uint32_t) =20 DO_VLDR(vldrb_sh, MO_UB, 1, int8_t, ldb, 2, int16_t) DO_VLDR(vldrb_sw, MO_UB, 1, int8_t, ldb, 4, int32_t) @@ -202,9 +204,9 @@ DO_VLDR(vldrb_uw, MO_UB, 1, uint8_t, ldb, 4, uint32_t) DO_VLDR(vldrh_sw, MO_TEUW, 2, int16_t, ldw, 4, int32_t) DO_VLDR(vldrh_uw, MO_TEUW, 2, uint16_t, ldw, 4, uint32_t) =20 -DO_VSTR(vstrb_h, 1, stb, 2, int16_t) -DO_VSTR(vstrb_w, 1, stb, 4, int32_t) -DO_VSTR(vstrh_w, 2, stw, 4, int32_t) +DO_VSTR(vstrb_h, MO_UB, 1, stb, 2, int16_t) +DO_VSTR(vstrb_w, MO_UB, 1, stb, 4, int32_t) +DO_VSTR(vstrh_w, MO_TEUW, 2, stw, 4, int32_t) =20 #undef DO_VLDR #undef DO_VSTR --=20 2.48.1 From nobody Sat Nov 15 12:14:52 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1751455313; cv=none; d=zohomail.com; s=zohoarc; b=WEmtrwbZ0MFNNUferuV5FWRklWkldQD8EQR1hZXOUVa52DQtzqN9N7PDNMeZgsCSL40HQLze3qkQ0kJXGIlqWivJutKKw0+4LGSsuk7HVvqYCqryXQbD0xx4HXjbce2IzbCoG4LW7aVjNvFbecbnMQzr0sDleIXCcYSmC0DN4e0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751455313; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=C/hzap+8413Yvyp9pIK0I+0pxInqZ0jCoTiR1Po7l1Q=; b=NlGqiGI28kYBRYUY0B0nScZ5kKnlnRrqxv464gXIIfPYVUkTp/EMkDwHuWXKsJfKkFz25voO2dNHTraUvb2ehsAU/EhDqU6rWcz9t3MX3qzpdshHNOYriv/9MOS47jWb4Pm8CJwyHp3/wVD52V1y/eYu4sKuSLjEZcQRdspzfEM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17514553138898.427316094770163; Wed, 2 Jul 2025 04:21:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uWvVw-0007dx-BW; Wed, 02 Jul 2025 07:20:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uWvVu-0007dM-JC; Wed, 02 Jul 2025 07:20:30 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uWvVr-0002PO-TC; Wed, 02 Jul 2025 07:20:30 -0400 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-2363497cc4dso56598475ad.1; Wed, 02 Jul 2025 04:20:25 -0700 (PDT) Received: from localhost (pa49-178-74-199.pa.nsw.optusnet.com.au. [49.178.74.199]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-23acb2e4c60sm127402455ad.50.2025.07.02.04.20.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 04:20:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751455224; x=1752060024; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=C/hzap+8413Yvyp9pIK0I+0pxInqZ0jCoTiR1Po7l1Q=; b=LO16R4iQSL0DqIp7muEWW/rzR74g0B/AiFEj92DXwYvW6AtPeuTQJY4mdSbDLLFr0H Yq3HeVOCr//spimgctJhoLBocfVBfZq90fgWubAEBxRxCPiGmDkHMCNLb/TrBjG8cBvr nEhAvZODGpvdjvdk6AIIoPHqmuONKFQsWUqW3J8MU60Yh5sfAPViJKIimkPQ2ssViQZB V5qgTSU2Gut+OxgkSaFcdCSxZN9cceT2y3Fj4J3l4/cNDdmEzfbKDAaFSRtoWR8JPQOP zhA2RGwUvUPvKMOKnLK2onMcE2uIE//Q8z7yFhU8VeH4HYDRIPraQCVxHiQ+TRjSqAzd qxwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751455224; x=1752060024; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=C/hzap+8413Yvyp9pIK0I+0pxInqZ0jCoTiR1Po7l1Q=; b=rgbHhBWa3w8GbUapkgHW3mj3vI621+/B6jM1Zl2v/avV7czgBHC+iVq2cl/Dsxyy4F EC0Wz+NOC67HBFwlYLhHCPrLF4UiJsPTl76MebENb0g/HY2HsGpuzCb4Svphe8Z8ydLb Xv1o+uCa6m3dOuH8Z/rgnmUN3dw5YvoDQxdgqD4TVPJRHFacVao4JlrNz6paBW5qPr3f IvsrDOmreYwcXIUj/6WBzVtlQA8JQ46FHVityV/LLj0P5m5YC7LJYsw8Vj3khbjYcUxJ TL/obbN10t2e1GsCfflX3a/C01rHW3HTHbV4Q2pRDiTOcTuFd1/ZMNEeN8SQ4MDb/FSY iBNA== X-Forwarded-Encrypted: i=1; AJvYcCXpczPSWE2lNTN6qOHkbDh7XkZUGqxHwusyrfWPjQglyMHR6NVAEhmCAozs09DdEOIwD/Ff0DFvVg==@nongnu.org X-Gm-Message-State: AOJu0YyTUdmBSRRVkFwCUK3EOZIIpd42ndkeRTX/yAShTbs/vRjb6z2v jXJ8ka0IoWCfOnr8H3P4Pe+fYu1IefHADygE94YoE3BP073lhojt+fWmxH0EfLyQyS0= X-Gm-Gg: ASbGncs4aOLHCD1hqhZVSN4PQnk+2MYNEmyyqV3rfoeGSeJ1rLLJYASzS4y5dO2DxEM c06wVtxwh8eB/nMKap09hDtb7EIJOMuIhoQv6hcrLpOx3Jd3HQFjqMcESi5wdSr1HrjUe3qhljD PtA00QKAMbVatLsz2aAgmsGhpukC9AevUqF2ioa3fAMrvrPGbJAoGopIrwBBmi648Dvyl8t3LPP gtptrI9dAGGZjVkGNd5rT8ke+6WZZ7bGiTfPIES+w255xslUANtPnwTV+GQSaYEfHIOTFKvlnXt zt0r/MluC/MWmR6nCVhDJcY+gP5/8An6Tq5J2qjXBwbFuPkXEW6IgGdKafn0DSK1LQMQuGc1PwH vioQBQug67KXXUasOgfRX69KxgyXwv2vx7nJBpuQkvBI= X-Google-Smtp-Source: AGHT+IE0u8SX36kgCl8aTK3KNzpHNFzX3llQD2kAgfmjlTr7X7dUHBuVQpSX89+2J9zv2U0AlHFx4g== X-Received: by 2002:a17:903:1664:b0:231:e331:b7df with SMTP id d9443c01a7336-23c6e4ffd13mr29730155ad.29.1751455223905; Wed, 02 Jul 2025 04:20:23 -0700 (PDT) From: William Kosasih To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, William Kosasih Subject: [PATCH v3 06/12] target/arm: Fix VLDR_SG helper load alignment checks Date: Wed, 2 Jul 2025 20:49:48 +0930 Message-ID: <20250702111954.128563-7-kosasihwilliam4@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250702111954.128563-1-kosasihwilliam4@gmail.com> References: <20250702111954.128563-1-kosasihwilliam4@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::635; envelope-from=kosasihwilliam4@gmail.com; helo=mail-pl1-x635.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1751455315490116600 Content-Type: text/plain; charset="utf-8" This patch adds alignment checks in the load operations in the VLDR_SG instructions. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1154 Signed-off-by: William Kosasih Reviewed-by: Richard Henderson --- target/arm/tcg/mve_helper.c | 42 ++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/target/arm/tcg/mve_helper.c b/target/arm/tcg/mve_helper.c index 9156cb8f9f..0d609668b5 100644 --- a/target/arm/tcg/mve_helper.c +++ b/target/arm/tcg/mve_helper.c @@ -218,7 +218,7 @@ DO_VSTR(vstrh_w, MO_TEUW, 2, stw, 4, int32_t) * For loads, predicated lanes are zeroed instead of retaining * their previous values. */ -#define DO_VLDR_SG(OP, LDTYPE, ESIZE, TYPE, OFFTYPE, ADDRFN, WB) \ +#define DO_VLDR_SG(OP, MFLAG, MTYPE, LDTYPE, ESIZE, TYPE, OFFTYPE, ADDRFN,= WB)\ void HELPER(mve_##OP)(CPUARMState *env, void *vd, void *vm, \ uint32_t base) \ { \ @@ -228,13 +228,15 @@ DO_VSTR(vstrh_w, MO_TEUW, 2, stw, 4, int32_t) uint16_t eci_mask =3D mve_eci_mask(env); \ unsigned e; \ uint32_t addr; \ + int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); \ + MemOpIdx oi =3D make_memop_idx(MFLAG | MO_ALIGN, mmu_idx); \ for (e =3D 0; e < 16 / ESIZE; e++, mask >>=3D ESIZE, eci_mask >>= =3D ESIZE) { \ if (!(eci_mask & 1)) { \ continue; \ } \ addr =3D ADDRFN(base, m[H##ESIZE(e)]); \ d[H##ESIZE(e)] =3D (mask & 1) ? \ - cpu_##LDTYPE##_data_ra(env, addr, GETPC()) : 0; \ + (MTYPE)cpu_##LDTYPE##_mmu(env, addr, oi, GETPC()) : 0; \ if (WB) { \ m[H##ESIZE(e)] =3D addr; \ } \ @@ -286,13 +288,15 @@ DO_VSTR(vstrh_w, MO_TEUW, 2, stw, 4, int32_t) uint16_t eci_mask =3D mve_eci_mask(env); \ unsigned e; \ uint32_t addr; \ + int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); \ + MemOpIdx oi =3D make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx); \ for (e =3D 0; e < 16 / 4; e++, mask >>=3D 4, eci_mask >>=3D 4) { = \ if (!(eci_mask & 1)) { \ continue; \ } \ addr =3D ADDRFN(base, m[H4(e & ~1)]); \ addr +=3D 4 * (e & 1); \ - d[H4(e)] =3D (mask & 1) ? cpu_ldl_data_ra(env, addr, GETPC()) = : 0; \ + d[H4(e)] =3D (mask & 1) ? cpu_ldl_mmu(env, addr, oi, GETPC()) = : 0; \ if (WB && (e & 1)) { \ m[H4(e & ~1)] =3D addr - 4; \ } \ @@ -331,22 +335,26 @@ DO_VSTR(vstrh_w, MO_TEUW, 2, stw, 4, int32_t) #define ADDR_ADD_OSW(BASE, OFFSET) ((BASE) + ((OFFSET) << 2)) #define ADDR_ADD_OSD(BASE, OFFSET) ((BASE) + ((OFFSET) << 3)) =20 -DO_VLDR_SG(vldrb_sg_sh, ldsb, 2, int16_t, uint16_t, ADDR_ADD, false) -DO_VLDR_SG(vldrb_sg_sw, ldsb, 4, int32_t, uint32_t, ADDR_ADD, false) -DO_VLDR_SG(vldrh_sg_sw, ldsw, 4, int32_t, uint32_t, ADDR_ADD, false) +DO_VLDR_SG(vldrb_sg_sh, MO_UB, int8_t, ldb, 2, int16_t, uint16_t, ADDR_ADD= , false) +DO_VLDR_SG(vldrb_sg_sw, MO_UB, int8_t, ldb, 4, int32_t, uint32_t, ADDR_ADD= , false) +DO_VLDR_SG(vldrh_sg_sw, MO_TEUW, int16_t, ldw, 4, int32_t, uint32_t, ADDR_= ADD, false) =20 -DO_VLDR_SG(vldrb_sg_ub, ldub, 1, uint8_t, uint8_t, ADDR_ADD, false) -DO_VLDR_SG(vldrb_sg_uh, ldub, 2, uint16_t, uint16_t, ADDR_ADD, false) -DO_VLDR_SG(vldrb_sg_uw, ldub, 4, uint32_t, uint32_t, ADDR_ADD, false) -DO_VLDR_SG(vldrh_sg_uh, lduw, 2, uint16_t, uint16_t, ADDR_ADD, false) -DO_VLDR_SG(vldrh_sg_uw, lduw, 4, uint32_t, uint32_t, ADDR_ADD, false) -DO_VLDR_SG(vldrw_sg_uw, ldl, 4, uint32_t, uint32_t, ADDR_ADD, false) +DO_VLDR_SG(vldrb_sg_ub, MO_UB, uint8_t, ldb, 1, uint8_t, uint8_t, ADDR_ADD= , false) +DO_VLDR_SG(vldrb_sg_uh, MO_UB, uint8_t, ldb, 2, uint16_t, uint16_t, ADDR_A= DD, false) +DO_VLDR_SG(vldrb_sg_uw, MO_UB, uint8_t, ldb, 4, uint32_t, uint32_t, ADDR_A= DD, false) +DO_VLDR_SG(vldrh_sg_uh, MO_TEUW, uint16_t, ldw, 2, uint16_t, uint16_t, ADD= R_ADD, false) +DO_VLDR_SG(vldrh_sg_uw, MO_TEUW, uint16_t, ldw, 4, uint32_t, uint32_t, ADD= R_ADD, false) +DO_VLDR_SG(vldrw_sg_uw, MO_TEUL, uint32_t, ldl, 4, uint32_t, uint32_t, ADD= R_ADD, false) DO_VLDR64_SG(vldrd_sg_ud, ADDR_ADD, false) =20 -DO_VLDR_SG(vldrh_sg_os_sw, ldsw, 4, int32_t, uint32_t, ADDR_ADD_OSH, false) -DO_VLDR_SG(vldrh_sg_os_uh, lduw, 2, uint16_t, uint16_t, ADDR_ADD_OSH, fals= e) -DO_VLDR_SG(vldrh_sg_os_uw, lduw, 4, uint32_t, uint32_t, ADDR_ADD_OSH, fals= e) -DO_VLDR_SG(vldrw_sg_os_uw, ldl, 4, uint32_t, uint32_t, ADDR_ADD_OSW, false) +DO_VLDR_SG(vldrh_sg_os_sw, MO_TEUW, int16_t, ldw, 4, + int32_t, uint32_t, ADDR_ADD_OSH, false) +DO_VLDR_SG(vldrh_sg_os_uh, MO_TEUW, uint16_t, ldw, 2, + uint16_t, uint16_t, ADDR_ADD_OSH, false) +DO_VLDR_SG(vldrh_sg_os_uw, MO_TEUW, uint16_t, ldw, 4, + uint32_t, uint32_t, ADDR_ADD_OSH, false) +DO_VLDR_SG(vldrw_sg_os_uw, MO_TEUL, uint32_t, ldl, 4, + uint32_t, uint32_t, ADDR_ADD_OSW, false) DO_VLDR64_SG(vldrd_sg_os_ud, ADDR_ADD_OSD, false) =20 DO_VSTR_SG(vstrb_sg_ub, stb, 1, uint8_t, ADDR_ADD, false) @@ -362,7 +370,7 @@ DO_VSTR_SG(vstrh_sg_os_uw, stw, 4, uint32_t, ADDR_ADD_O= SH, false) DO_VSTR_SG(vstrw_sg_os_uw, stl, 4, uint32_t, ADDR_ADD_OSW, false) DO_VSTR64_SG(vstrd_sg_os_ud, ADDR_ADD_OSD, false) =20 -DO_VLDR_SG(vldrw_sg_wb_uw, ldl, 4, uint32_t, uint32_t, ADDR_ADD, true) +DO_VLDR_SG(vldrw_sg_wb_uw, MO_TEUL, uint32_t, ldl, 4, uint32_t, uint32_t, = ADDR_ADD, true) DO_VLDR64_SG(vldrd_sg_wb_ud, ADDR_ADD, true) DO_VSTR_SG(vstrw_sg_wb_uw, stl, 4, uint32_t, ADDR_ADD, true) DO_VSTR64_SG(vstrd_sg_wb_ud, ADDR_ADD, true) --=20 2.48.1 From nobody Sat Nov 15 12:14:52 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1751455301; cv=none; d=zohomail.com; s=zohoarc; b=feNKSZd7LbEcOyUNHYbMalKAUQXta8f6UVUaS+XGlJbtaPn/T3a0m+KL/bmpryjHtsn4+Xdpsm1/4aCgYRwq9YRr/qPYu2AZ6G5xSTxutEG7nLrWj2e28PafoJz4/MqpJGvfqy8gjRbSSO7lFTUY/P1k7xrs+u8/0a+5MgiPI60= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751455301; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=gYbMvV6JPX7BYsIi9SkdULx5qyOjMhaqmvcgcL63Ea0=; b=fgIrFs7b7efGhigkSSDyP5gpajIXhqL9hmK8TqnOctl9yxC9vUGKOw1r1dIzC8rnIuNptNseLivxXSjKI13fmX7DZfMSyAEH1nJrFVV8hkCngwXQV1eMNr+UhiPmJsprYlMmfFeLOsNu96/Vzx/JZ/5R4MLmkxFloiofpaZTz4g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 175145530133077.09942426083626; Wed, 2 Jul 2025 04:21:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uWvWC-0007gh-LG; Wed, 02 Jul 2025 07:20:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uWvW1-0007fT-2u; Wed, 02 Jul 2025 07:20:37 -0400 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uWvVu-0002QH-DO; Wed, 02 Jul 2025 07:20:36 -0400 Received: by mail-pj1-x102e.google.com with SMTP id 98e67ed59e1d1-313154270bbso4542196a91.2; Wed, 02 Jul 2025 04:20:29 -0700 (PDT) Received: from localhost (pa49-178-74-199.pa.nsw.optusnet.com.au. [49.178.74.199]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-318c1523351sm14112844a91.48.2025.07.02.04.20.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 04:20:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751455228; x=1752060028; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gYbMvV6JPX7BYsIi9SkdULx5qyOjMhaqmvcgcL63Ea0=; b=nFmHCkRfeImCW3nsygA0Da4YlmQi3JXCgQP1Sk09Sv+dZ/s33PkbZSoE1gX4ZFl0cY QQRFBYsoCwmyGAdIDvQT7gy3gKEeS/15JZKxglhj+GhZ5y+E9IvndBcSZUwWo8sv4B+p lDElaxsLiPkI8eWYU05Z4J4dqQ6zp9BQrbrEdq329nrjK56yznvAPDL48SOlFTAtVWHG RpKHuDh0zwOPGUTsPLxxmjHEB8/FE8BE/P0YiDP9F8laTcfjBVn/1gzno/XRm82D9Fup Z9tkZ1wr4wUZ7Y4/Rjh3oAkXBMgknp9a4mmQDFIO7jp2iiA9nxbJkmqP7F80JYKW9gfn RzYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751455228; x=1752060028; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gYbMvV6JPX7BYsIi9SkdULx5qyOjMhaqmvcgcL63Ea0=; b=VKk0ZzT00nkN7PYZNChbdOxcZgmGSJzaDrbdUw3edg5B/3MDCpgbH4oBCGwuYuBLjc WV0gM8eg2Wn2jVB2DYSyYyRFnxVcu3qrDlQ/CfRq8DWX0k80BEdQ9RKlUMC6y0D6tr8W P3ptYH8iDsW/yKov0MGXf1sg+9ee8MzRIgfbgZ/fMB8YAM00ufKDou9/kKRUAzvakQQW L7o6YD+8L5AR1RYD53wZuZZXAW93a5vCJqeqD/dHSELAugWpZG26Roai+DXj7xOmSrnt UqwGUPhto/U8U3wWRsU1bBU4CQE0VV/6BvNeV6fb9rT6pauOpSS/4mk9ZBkDGbUZQQxR cWIQ== X-Forwarded-Encrypted: i=1; AJvYcCWlN0Xkg0SSz3vcQni754keKnSX3GQc/RLAa0qH35mTJG5GtBiDivUeqHktnTnygSyoPb9But30WQ==@nongnu.org X-Gm-Message-State: AOJu0YzLQDEOlpkz4NC+/H6EpkUNnObQYGCcyY0oHfzmxXDhy4tS1cyP T27zynKPDGyUJtpDwJ/h1Xt9cWfE+d+b1edHw2oHRAVo+pJvCJt4NErCY8W92hXV9Wg= X-Gm-Gg: ASbGncu9kljFpxUKxwOJKqSYsS+nRbel9ZgPKDTE5+G7WNPzS18U/yogbY/5oBmJ7rW qMxhAf5FVyQko30UhuDuqruCrispF8w3U7RlW2WQxyAaoZ3hvH0V3EOVda8RRTML/wRA2RSmhfp PcJiYG595NYFbVBAYJVC+2YM3hTH3wu1fNV3DAWwWbQvgFPNzfmzUitIzneeW4LNJlmemQItxeO loqkTf6FfVmqWMaodO48KKux0tPkygU9f98mT7hpMUx9ezOWMKC4si6/DDEhO2Uq0yQYu7Xcvtx pSkfYWUKXcOG9/7uSBce1nGc9P9njQOXzbDgngCIjdMBFbz2lQTyYYaaTIkaBtduggGC5nJEZvE K+4Bc0Vcu4Cu2tPCdvya7Ja8x7UAvPsWzDJUDkfUUvmE= X-Google-Smtp-Source: AGHT+IHiMWYmbZyMZtX0xulkDr4xsdvCrF6PuP7DaF6nPS5ARutjhg1ezFQdmGkAYufW1HiKdrNWKA== X-Received: by 2002:a17:90b:1fcf:b0:311:d28a:73ef with SMTP id 98e67ed59e1d1-31a90b480f7mr4532578a91.10.1751455227934; Wed, 02 Jul 2025 04:20:27 -0700 (PDT) From: William Kosasih To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, William Kosasih Subject: [PATCH v3 07/12] target/arm: Fix VSTR_SG helper store alignment checks Date: Wed, 2 Jul 2025 20:49:49 +0930 Message-ID: <20250702111954.128563-8-kosasihwilliam4@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250702111954.128563-1-kosasihwilliam4@gmail.com> References: <20250702111954.128563-1-kosasihwilliam4@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::102e; envelope-from=kosasihwilliam4@gmail.com; helo=mail-pj1-x102e.google.com X-Spam_score_int: -13 X-Spam_score: -1.4 X-Spam_bar: - X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1751455303372116600 Content-Type: text/plain; charset="utf-8" This patch adds alignment checks in the store operations in the VSTR_SG instructions. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1154 Signed-off-by: William Kosasih Reviewed-by: Richard Henderson --- target/arm/tcg/mve_helper.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/target/arm/tcg/mve_helper.c b/target/arm/tcg/mve_helper.c index 0d609668b5..60e61ee538 100644 --- a/target/arm/tcg/mve_helper.c +++ b/target/arm/tcg/mve_helper.c @@ -245,7 +245,7 @@ DO_VSTR(vstrh_w, MO_TEUW, 2, stw, 4, int32_t) } =20 /* We know here TYPE is unsigned so always the same as the offset type */ -#define DO_VSTR_SG(OP, STTYPE, ESIZE, TYPE, ADDRFN, WB) \ +#define DO_VSTR_SG(OP, MFLAG, STTYPE, ESIZE, TYPE, ADDRFN, WB) \ void HELPER(mve_##OP)(CPUARMState *env, void *vd, void *vm, \ uint32_t base) \ { \ @@ -255,13 +255,15 @@ DO_VSTR(vstrh_w, MO_TEUW, 2, stw, 4, int32_t) uint16_t eci_mask =3D mve_eci_mask(env); \ unsigned e; \ uint32_t addr; \ + int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); \ + MemOpIdx oi =3D make_memop_idx(MFLAG | MO_ALIGN, mmu_idx); \ for (e =3D 0; e < 16 / ESIZE; e++, mask >>=3D ESIZE, eci_mask >>= =3D ESIZE) { \ if (!(eci_mask & 1)) { \ continue; \ } \ addr =3D ADDRFN(base, m[H##ESIZE(e)]); \ if (mask & 1) { \ - cpu_##STTYPE##_data_ra(env, addr, d[H##ESIZE(e)], GETPC())= ; \ + cpu_##STTYPE##_mmu(env, addr, d[H##ESIZE(e)], oi, GETPC())= ; \ } \ if (WB) { \ m[H##ESIZE(e)] =3D addr; \ @@ -314,6 +316,8 @@ DO_VSTR(vstrh_w, MO_TEUW, 2, stw, 4, int32_t) uint16_t eci_mask =3D mve_eci_mask(env); \ unsigned e; \ uint32_t addr; \ + int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); \ + MemOpIdx oi =3D make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx); \ for (e =3D 0; e < 16 / 4; e++, mask >>=3D 4, eci_mask >>=3D 4) { = \ if (!(eci_mask & 1)) { \ continue; \ @@ -321,7 +325,7 @@ DO_VSTR(vstrh_w, MO_TEUW, 2, stw, 4, int32_t) addr =3D ADDRFN(base, m[H4(e & ~1)]); \ addr +=3D 4 * (e & 1); \ if (mask & 1) { \ - cpu_stl_data_ra(env, addr, d[H4(e)], GETPC()); \ + cpu_stl_mmu(env, addr, d[H4(e)], oi, GETPC()); \ } \ if (WB && (e & 1)) { \ m[H4(e & ~1)] =3D addr - 4; \ @@ -357,22 +361,22 @@ DO_VLDR_SG(vldrw_sg_os_uw, MO_TEUL, uint32_t, ldl, 4, uint32_t, uint32_t, ADDR_ADD_OSW, false) DO_VLDR64_SG(vldrd_sg_os_ud, ADDR_ADD_OSD, false) =20 -DO_VSTR_SG(vstrb_sg_ub, stb, 1, uint8_t, ADDR_ADD, false) -DO_VSTR_SG(vstrb_sg_uh, stb, 2, uint16_t, ADDR_ADD, false) -DO_VSTR_SG(vstrb_sg_uw, stb, 4, uint32_t, ADDR_ADD, false) -DO_VSTR_SG(vstrh_sg_uh, stw, 2, uint16_t, ADDR_ADD, false) -DO_VSTR_SG(vstrh_sg_uw, stw, 4, uint32_t, ADDR_ADD, false) -DO_VSTR_SG(vstrw_sg_uw, stl, 4, uint32_t, ADDR_ADD, false) +DO_VSTR_SG(vstrb_sg_ub, MO_UB, stb, 1, uint8_t, ADDR_ADD, false) +DO_VSTR_SG(vstrb_sg_uh, MO_UB, stb, 2, uint16_t, ADDR_ADD, false) +DO_VSTR_SG(vstrb_sg_uw, MO_UB, stb, 4, uint32_t, ADDR_ADD, false) +DO_VSTR_SG(vstrh_sg_uh, MO_TEUW, stw, 2, uint16_t, ADDR_ADD, false) +DO_VSTR_SG(vstrh_sg_uw, MO_TEUW, stw, 4, uint32_t, ADDR_ADD, false) +DO_VSTR_SG(vstrw_sg_uw, MO_TEUL, stl, 4, uint32_t, ADDR_ADD, false) DO_VSTR64_SG(vstrd_sg_ud, ADDR_ADD, false) =20 -DO_VSTR_SG(vstrh_sg_os_uh, stw, 2, uint16_t, ADDR_ADD_OSH, false) -DO_VSTR_SG(vstrh_sg_os_uw, stw, 4, uint32_t, ADDR_ADD_OSH, false) -DO_VSTR_SG(vstrw_sg_os_uw, stl, 4, uint32_t, ADDR_ADD_OSW, false) +DO_VSTR_SG(vstrh_sg_os_uh, MO_TEUW, stw, 2, uint16_t, ADDR_ADD_OSH, false) +DO_VSTR_SG(vstrh_sg_os_uw, MO_TEUW, stw, 4, uint32_t, ADDR_ADD_OSH, false) +DO_VSTR_SG(vstrw_sg_os_uw, MO_TEUL, stl, 4, uint32_t, ADDR_ADD_OSW, false) DO_VSTR64_SG(vstrd_sg_os_ud, ADDR_ADD_OSD, false) =20 DO_VLDR_SG(vldrw_sg_wb_uw, MO_TEUL, uint32_t, ldl, 4, uint32_t, uint32_t, = ADDR_ADD, true) DO_VLDR64_SG(vldrd_sg_wb_ud, ADDR_ADD, true) -DO_VSTR_SG(vstrw_sg_wb_uw, stl, 4, uint32_t, ADDR_ADD, true) +DO_VSTR_SG(vstrw_sg_wb_uw, MO_TEUL, stl, 4, uint32_t, ADDR_ADD, true) DO_VSTR64_SG(vstrd_sg_wb_ud, ADDR_ADD, true) =20 /* --=20 2.48.1 From nobody Sat Nov 15 12:14:52 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1751455328; cv=none; d=zohomail.com; s=zohoarc; b=HIUnNC5IunW6loqAqOF23J8tNIeVnrsoKxi3JwCG3zV5wksZ0ixSPJU2sUlqxjqY+KwJmIaDqJVD2fAvKt9jpLDUQbWwQhOBgjTn+JpW8mZHQhx/2p/DwzCAO3W4wTYaJjCTzhN0pA4IxevmcTCK7oc9unBKVS2m8R7Ap5TRpSY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751455328; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=san6//J2Bh6vdrxuitot85Z9Yr39VPnyAsBLC3xaxGM=; b=SwtNeZ882QRFVKk41Ht+IDw00VCVLf8qNXfT3t+3tH9OxsXJb2dE8NvMTWIBCOaNFxpWdeikn3e8tffquvCkDtdlbH3uvLuzQdXcF/atKgrpmcVVRe6f4ObkgqBRxVkX1ptB6d8f8wznXtTqqkaGgfRxHGB4uVuiH8R+Z1B1ufg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1751455328864624.0945507277576; Wed, 2 Jul 2025 04:22:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uWvWT-0007pZ-7T; Wed, 02 Jul 2025 07:21:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uWvW5-0007gj-IR; Wed, 02 Jul 2025 07:20:49 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uWvVz-0002RG-KN; Wed, 02 Jul 2025 07:20:41 -0400 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-748fe69a7baso6396243b3a.3; Wed, 02 Jul 2025 04:20:33 -0700 (PDT) Received: from localhost (pa49-178-74-199.pa.nsw.optusnet.com.au. [49.178.74.199]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-74af55c6d49sm14174909b3a.119.2025.07.02.04.20.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 04:20:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751455232; x=1752060032; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=san6//J2Bh6vdrxuitot85Z9Yr39VPnyAsBLC3xaxGM=; b=bthzqdRepDQp98Ksu7Ye+9QrxT/79uUIZCZW3WrLWf4Xef4jOJp+doaxC+CEHkOTtC s8xE9DrRC11QeV0rQH+vQTiRteXTKJElCmQC+pcBQ7CVWM+nMTgooSjs4ZjBjnUcytDG 87exz1WGCZBzSF57n+W+L4JWnLU2mMYt3XVyisSjNGwYUGqMrCt85tl/Vy1DGrrfiWlh I7l2eqjtXYSokTuAHWklCXaM3iaYDU5YWO8wfolJiTohavpixZCeqeUV32GE6DNyA1ge XPabTvhhMU8jWYoCICaierstjNJjLQujKWQQAMLyJvqPrsRW2fk7D7n7xyNLvQGedYOq qyVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751455232; x=1752060032; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=san6//J2Bh6vdrxuitot85Z9Yr39VPnyAsBLC3xaxGM=; b=AUdjx1mqJ+yfcqC8Kt2fs5HRTWs1uwjuwtsr8HKGTlpc+CUPvN4uotNUa4S5M/MWEL EkyqRaeSvOXj3cXud3vPRctFLPoGSrfgqkOjD07kcVOmjOPc1iWGVB2aqB+MRfWNAQEk FsdQzJAnWxzSRsrkqnJriYdhi05BsgiVQf9ovV7saHbgFtiURIRWH5NKQOXQaQDycjGN JcRWSQIdIMMwsG/HgbHY+N30MKd0aySMuOkq8Cqg1LcwCw4k0QjqR+QP1VBnl516XDZE EV0RLi8c2yuH9N19MFkUTAeA+RMv1o50mquK5K0etEanIUDRrPBa05TY9f6CFuu5RSLT Llaw== X-Forwarded-Encrypted: i=1; AJvYcCV5uWYZRHmHRzghL02705TbVGZPr54TPKFqfdV9cJzUOH/XYkQYISwfUFolLZXRdXYmX7ZrjssRtw==@nongnu.org X-Gm-Message-State: AOJu0YzsVWk+QgVLKIpecud7A066dfLjUwhdFbdPyxfDx5XaUR0gVCKO T020HvQ6dtvLJ1NuLQAiWUHlzi2fME6m4n6Lux4zbQYGClmktgKcWId3TPu2ZO4ufLk= X-Gm-Gg: ASbGnctp+7n7jwSs2qbXGBxRJlc4+bbFvYbOak+i2FGMKXKTvQepp2X5zR/cFxQJeN2 yhbHKN91art8pP0MQwyLBqvBz5x/1Yj4wMPk9hHzxL81Or6DRXzZCTDS8wjHLfRwVTwsTT4OXrk Y5n+F76OoZVzyX/7fuhwKqt+XnzjWcmKDRbQKjPSAj6wjLEadwYRN5q3FQHTq/Vse5/+JYLB5zW vHPgUabIT9ex6LcoMoUYdISFW5GN7DkJelkcQC9XjcNvuztqvNEqCY+fvsYaw394qYvb4O822Oi 6w4e8g4JYsBz5LgtUOBFYuQKv1NaVCilfKIQk5FLUSJewGWqaB5VaUb2PjuIZh8zqWVQhBwPBVc Tbs6LfAaKMUSNc5odJiy3nBrpp32416fk79ovzxTLX3Y= X-Google-Smtp-Source: AGHT+IGoOAs5/BVBR2IcCo5qxcW272bnSex+toRHCgb+tksFf95EFmkCt+tPhcY9srLxSqa73+8pkg== X-Received: by 2002:a05:6a20:729a:b0:21f:7430:148a with SMTP id adf61e73a8af0-222d7ee7a65mr4653793637.28.1751455232184; Wed, 02 Jul 2025 04:20:32 -0700 (PDT) From: William Kosasih To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, William Kosasih Subject: [PATCH v3 08/12] target/arm: Fix VLD4 helper load alignment checks Date: Wed, 2 Jul 2025 20:49:50 +0930 Message-ID: <20250702111954.128563-9-kosasihwilliam4@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250702111954.128563-1-kosasihwilliam4@gmail.com> References: <20250702111954.128563-1-kosasihwilliam4@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::432; envelope-from=kosasihwilliam4@gmail.com; helo=mail-pf1-x432.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1751455329728116600 Content-Type: text/plain; charset="utf-8" This patch adds alignment checks in the load operations in the VLD4 instruction. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1154 Signed-off-by: William Kosasih Reviewed-by: Richard Henderson --- target/arm/tcg/mve_helper.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/target/arm/tcg/mve_helper.c b/target/arm/tcg/mve_helper.c index 60e61ee538..86eef54426 100644 --- a/target/arm/tcg/mve_helper.c +++ b/target/arm/tcg/mve_helper.c @@ -403,13 +403,15 @@ DO_VSTR64_SG(vstrd_sg_wb_ud, ADDR_ADD, true) uint16_t mask =3D mve_eci_mask(env); \ static const uint8_t off[4] =3D { O1, O2, O3, O4 }; \ uint32_t addr, data; \ + int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); \ + MemOpIdx oi =3D make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx); \ for (beat =3D 0; beat < 4; beat++, mask >>=3D 4) { = \ if ((mask & 1) =3D=3D 0) { = \ /* ECI says skip this beat */ \ continue; \ } \ addr =3D base + off[beat] * 4; \ - data =3D cpu_ldl_le_data_ra(env, addr, GETPC()); \ + data =3D cpu_ldl_mmu(env, addr, oi, GETPC()); \ for (e =3D 0; e < 4; e++, data >>=3D 8) { = \ uint8_t *qd =3D (uint8_t *)aa32_vfp_qreg(env, qnidx + e); \ qd[H1(off[beat])] =3D data; \ @@ -427,13 +429,15 @@ DO_VSTR64_SG(vstrd_sg_wb_ud, ADDR_ADD, true) uint32_t addr, data; \ int y; /* y counts 0 2 0 2 */ \ uint16_t *qd; \ + int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); \ + MemOpIdx oi =3D make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx); \ for (beat =3D 0, y =3D 0; beat < 4; beat++, mask >>=3D 4, y ^=3D 2= ) { \ if ((mask & 1) =3D=3D 0) { = \ /* ECI says skip this beat */ \ continue; \ } \ addr =3D base + off[beat] * 8 + (beat & 1) * 4; \ - data =3D cpu_ldl_le_data_ra(env, addr, GETPC()); \ + data =3D cpu_ldl_mmu(env, addr, oi, GETPC()); \ qd =3D (uint16_t *)aa32_vfp_qreg(env, qnidx + y); \ qd[H2(off[beat])] =3D data; \ data >>=3D 16; \ @@ -452,13 +456,15 @@ DO_VSTR64_SG(vstrd_sg_wb_ud, ADDR_ADD, true) uint32_t addr, data; \ uint32_t *qd; \ int y; \ + int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); \ + MemOpIdx oi =3D make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx); \ for (beat =3D 0; beat < 4; beat++, mask >>=3D 4) { = \ if ((mask & 1) =3D=3D 0) { = \ /* ECI says skip this beat */ \ continue; \ } \ addr =3D base + off[beat] * 4; \ - data =3D cpu_ldl_le_data_ra(env, addr, GETPC()); \ + data =3D cpu_ldl_mmu(env, addr, oi, GETPC()); \ y =3D (beat + (O1 & 2)) & 3; \ qd =3D (uint32_t *)aa32_vfp_qreg(env, qnidx + y); \ qd[H4(off[beat] >> 2)] =3D data; \ --=20 2.48.1 From nobody Sat Nov 15 12:14:52 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1751455329; cv=none; d=zohomail.com; s=zohoarc; b=mlKmDLJLGubV6EBGhjUwQqxAJWJGSNtmBK2h1BYQuYFvFgMTS/ddWqfE57vVrXC9CZx151UDm4DbFRL1LwTnhrVgM02ENWeg9afIskw5ncPb6IEMaDyud0Y4O7leqBz/TdWOIiuvmYkCOvrdSHm+YQj9eKsjZn4wssJm+Acx3Gw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751455329; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=TmGCorEGQlW7KnyvSorg2owRSTnel+NvEASPcPe6Kxg=; b=FAhz4390OwXm9XUKLeJ9Ugh5TXAE2rkN50USGgeWjF1gx8kAbpKGS49g3GAQokNKeViXyHuO7jYs6Z/C9LU7HAYNMgL2c0OeI494Gc2vfjE4B4JaE+C7+NJwam5vf+oOg0WzjafqxLBleWJt4ySJizQIo50m5mqoB/msuIhLI04= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1751455329388802.5317950109462; Wed, 2 Jul 2025 04:22:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uWvWQ-0007lN-5c; Wed, 02 Jul 2025 07:21:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uWvWB-0007hU-Fy; Wed, 02 Jul 2025 07:20:48 -0400 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uWvW5-0002Rp-3f; Wed, 02 Jul 2025 07:20:47 -0400 Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-747c2cc3419so6290216b3a.2; Wed, 02 Jul 2025 04:20:37 -0700 (PDT) Received: from localhost (pa49-178-74-199.pa.nsw.optusnet.com.au. [49.178.74.199]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-74af541a3e4sm13688454b3a.37.2025.07.02.04.20.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 04:20:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751455236; x=1752060036; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TmGCorEGQlW7KnyvSorg2owRSTnel+NvEASPcPe6Kxg=; b=d2lUAlP81WBhp8W8Wc1V6ByYcDfla6Dl9zcxRfa3EexWsCerNwJOcnStFU4h3+Sr9t 5Gx9Y43zNN/sGE5qLcuygTyWZrAnteM7rusfAruO2aapvhqqQGavnvf0eqQwY1dqZlrH arevpDLZQoJuFRh5D4CT706JBBRGf+pfZVAz2ONaRUPv9LE20Mjw4LgghWYXiKLtf8lJ 0+urCn0Q6nL59/t9RdI7gPPppQD/hZRptEVc2O/1jxu3c1BH14y3FVBcd/foso/1P9Iz aYJWDAXtYsUUWiWZiHz8dMbiMkoibXtxsEXtzmvJFziPtwCRmDYd9iL2bZxsFnN0vjjh n/Qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751455236; x=1752060036; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TmGCorEGQlW7KnyvSorg2owRSTnel+NvEASPcPe6Kxg=; b=P6WqysNOBofEocU9nQQQExehdJnfMsR4KRqQP3KO+C78t+nYmsPBkfr4qODZ987Iep t5lG2WRUpk8emt+nB6sVq1f6+b21xLbydx/KpfxW8fjbN+fViy5hJ6fNl5u60gbv0H8c Kt6/mIrmmJCTMiAcPMQ/RAjRN5RdH8CE84q31V+0dshlHvKEPVUB9s49X0EBMmcz+B2j qz9pOsxCWZlzbjzcpnpcoAhyqjmfiDw6n6U6Qy6ANFSx2TQUtqBb6VGZwDKulS2BLjGr Hd2ii3MVBniCgmB74sMn313/FEL2xJx/XupS/x0lCc2Owf2uJ57O76NTp5MIdhDnVAoD SKoA== X-Forwarded-Encrypted: i=1; AJvYcCWVdQJR7sb28Ih4bndry2agczO1HO3XjZQ9A0tx1DRzMXBnEjwL3fitYjPzO9dEwoRLIOpNnmqsbw==@nongnu.org X-Gm-Message-State: AOJu0Yw+eDEdP9QxmvOvqSQHUKyU0KbLC8+AatZSje6Rt010GGSNCndu xTZvlb2gSfN38R47aeJXuqmPNmwIzE7gj+gHvVsoTMGWwGQm7ltt/jtLQUt80bThC8Q= X-Gm-Gg: ASbGncuittJfBHWjuzC01IpXmUd7a7abCFa3Wh0CGEjW2yyK4Wwvqu/yp4dzCXCzW4W v+r2PoJd9VkyVAYVVADtpynFQTXSXjqh0Ws3PiIkU+KQTi/nUaSLSZoTn6Dz3HFhY1GPQkXsinY cJu31M5MisHXq+OUUZ5Isr2NfDcPuYSP8Fws7GH49nx3//J5ToW6yB4ZlOgcsZ3LDx6Nbr4kE+t 04Xtn+w3QHH7ytCMuf4I2HsEgpICWqTJE5Fic5jwk9jAtQcHSuvgDVexEPubDYBvSIwI/5vtk8k M4ORu4xtMxjPMILzHju+qPXawWhwpgdqARe7hJXbFbS6YIGaeq084Ag1r9E025yme7F9HSo+6dE 7UXV3uowhYSxjMatSidPGLvR1veO2zO3RbOnZNJT//Xg= X-Google-Smtp-Source: AGHT+IHmtW7yRIksNRadponOnePQ6rm+E08HySMZIYnNNVgebA2ajNRbYwSp0diz22YJtkG0xyM7dg== X-Received: by 2002:a05:6a00:1995:b0:749:1c27:bcc5 with SMTP id d2e1a72fcca58-74b5126948bmr3175468b3a.22.1751455236063; Wed, 02 Jul 2025 04:20:36 -0700 (PDT) From: William Kosasih To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, William Kosasih Subject: [PATCH v3 09/12] target/arm: Fix VLD2 helper load alignment checks Date: Wed, 2 Jul 2025 20:49:51 +0930 Message-ID: <20250702111954.128563-10-kosasihwilliam4@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250702111954.128563-1-kosasihwilliam4@gmail.com> References: <20250702111954.128563-1-kosasihwilliam4@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::436; envelope-from=kosasihwilliam4@gmail.com; helo=mail-pf1-x436.google.com X-Spam_score_int: -13 X-Spam_score: -1.4 X-Spam_bar: - X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1751455329729116600 Content-Type: text/plain; charset="utf-8" This patch adds alignment checks in the load operations in the VLD2 instruction. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1154 Signed-off-by: William Kosasih Reviewed-by: Richard Henderson --- target/arm/tcg/mve_helper.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/target/arm/tcg/mve_helper.c b/target/arm/tcg/mve_helper.c index 86eef54426..d6e2f1ac5a 100644 --- a/target/arm/tcg/mve_helper.c +++ b/target/arm/tcg/mve_helper.c @@ -495,13 +495,15 @@ DO_VLD4W(vld43w, 6, 7, 8, 9) static const uint8_t off[4] =3D { O1, O2, O3, O4 }; \ uint32_t addr, data; \ uint8_t *qd; \ + int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); \ + MemOpIdx oi =3D make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx); \ for (beat =3D 0; beat < 4; beat++, mask >>=3D 4) { = \ if ((mask & 1) =3D=3D 0) { = \ /* ECI says skip this beat */ \ continue; \ } \ addr =3D base + off[beat] * 2; \ - data =3D cpu_ldl_le_data_ra(env, addr, GETPC()); \ + data =3D cpu_ldl_mmu(env, addr, oi, GETPC()); \ for (e =3D 0; e < 4; e++, data >>=3D 8) { = \ qd =3D (uint8_t *)aa32_vfp_qreg(env, qnidx + (e & 1)); \ qd[H1(off[beat] + (e >> 1))] =3D data; \ @@ -519,13 +521,15 @@ DO_VLD4W(vld43w, 6, 7, 8, 9) uint32_t addr, data; \ int e; \ uint16_t *qd; \ + int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); \ + MemOpIdx oi =3D make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx); \ for (beat =3D 0; beat < 4; beat++, mask >>=3D 4) { = \ if ((mask & 1) =3D=3D 0) { = \ /* ECI says skip this beat */ \ continue; \ } \ addr =3D base + off[beat] * 4; \ - data =3D cpu_ldl_le_data_ra(env, addr, GETPC()); \ + data =3D cpu_ldl_mmu(env, addr, oi, GETPC()); \ for (e =3D 0; e < 2; e++, data >>=3D 16) { = \ qd =3D (uint16_t *)aa32_vfp_qreg(env, qnidx + e); \ qd[H2(off[beat])] =3D data; \ @@ -542,13 +546,15 @@ DO_VLD4W(vld43w, 6, 7, 8, 9) static const uint8_t off[4] =3D { O1, O2, O3, O4 }; \ uint32_t addr, data; \ uint32_t *qd; \ + int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); \ + MemOpIdx oi =3D make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx); \ for (beat =3D 0; beat < 4; beat++, mask >>=3D 4) { = \ if ((mask & 1) =3D=3D 0) { = \ /* ECI says skip this beat */ \ continue; \ } \ addr =3D base + off[beat]; \ - data =3D cpu_ldl_le_data_ra(env, addr, GETPC()); \ + data =3D cpu_ldl_mmu(env, addr, oi, GETPC()); \ qd =3D (uint32_t *)aa32_vfp_qreg(env, qnidx + (beat & 1)); \ qd[H4(off[beat] >> 3)] =3D data; \ } \ --=20 2.48.1 From nobody Sat Nov 15 12:14:52 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1751455386; cv=none; d=zohomail.com; s=zohoarc; b=MWOheZzONOcW7xDgKhElwH6+bACM0EhT+c4lrEdmX8jQE+ZJuo99Gy/qSUo+WD/vR/FZGMlXJIu6h1pRIi896b1cGpR+GvDuUQONznB/rRBbEN7VlD/Z/+INgpfJUPeK6n3Djm9wS3SvA53RU/R52/x0238M7Hf7NLGwtPs0wpM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751455386; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=sRN/1vFm2ZWO5FB3O8HE20lztbV9KvcYq5rghMJib5I=; b=QaEj5Am+BkU/RPlTfbIg0WA76tzG15Ko+Wxs0qpR2RAud0JJa8U5PHa89C2C10cICytYhMXMBsvfUfwSLJ+kJNW4K1t9aX1hOZZlIinGK3dgI+n4i9ORxDTSpl1Pu5XO6e8N1it0+GX3FynNt32uMAEZiyxv+iqA0zyJQGb7WwA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 175145538599669.98646722893886; Wed, 2 Jul 2025 04:23:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uWvWZ-00089m-EM; Wed, 02 Jul 2025 07:21:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uWvWE-0007jC-K3; Wed, 02 Jul 2025 07:20:53 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uWvW7-0002ST-0a; Wed, 02 Jul 2025 07:20:49 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-2350fc2591dso63963295ad.1; Wed, 02 Jul 2025 04:20:42 -0700 (PDT) Received: from localhost (pa49-178-74-199.pa.nsw.optusnet.com.au. [49.178.74.199]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-23acb39ba8esm133678985ad.129.2025.07.02.04.20.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 04:20:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751455240; x=1752060040; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sRN/1vFm2ZWO5FB3O8HE20lztbV9KvcYq5rghMJib5I=; b=kVuTjsGd6YR7FQlHD0CiYw0Wr4CTzo60Z/KXCnQCgmeiy9rBgLc32H887WYp6n/OIp Q1p4entxflSQdd3S4leD+rdhCkBJDsaR0w7PkRwhHp4HvmaFePiTaNpeviRQz/y8180l TzZ2Az1+luOlPj+l7p3+XyxqLET/3a1gcKcKjE4MxBjZlttB1OFm9V7lsB3dq/NwITCo BaiOFTj/7wFYMOCdwlvKgHNFWTSAd9lS9rniI/vK6On2JH39F+NT20XEEZ4EbJsp3vDb WVGA2NjHDpCBLX1/CzYOuAe6zONKVOLa9MCiEKWD13ow1plV4vj1SKw/f1fBtzaFxn24 ZMvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751455240; x=1752060040; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sRN/1vFm2ZWO5FB3O8HE20lztbV9KvcYq5rghMJib5I=; b=lhnkUERUkkVZVFF9Z9+1aUkKdJwxfSyXea35U70RGIqe+VqZV69fsmABADcgMSa/qQ lpCn/WV87H6D69gIHwCD8TfzgtWChVnzyJVyTUJP7JIdGb/C4kn6rIv5ugh3zuh8Zdn4 7z0iCB6X/urg10gmXv8rhMJz0zEojHW3gVg/4opaVeyKww/h038aF8wzS5YflRKjIXrb j0xQGomTTz0xKB1fUlb2blxxnQPjDypNNuNpr19EZZoykTpydPlSEmBCWaxwDaYiS+DO Bi0eLbJCoyh7hGx05M6BCcNVKohvycn/QsGvZAEMIriv46G7xr94spAR+s05FxjFUOM4 K4hA== X-Forwarded-Encrypted: i=1; AJvYcCXvwY+F41PBUQclaqoEG65EfXdQosMJ78iVcPcIjwGJo6qx8SYesmxq1VU3gey95sX+T1RS6dgALA==@nongnu.org X-Gm-Message-State: AOJu0YwoNrPGPf4mVpTDLlEPxUBPipegDKRKETut8NK2+Dwz+cjma73R lRS7/sNx1GD8DMs84M3G0INo1sA0St/0rbHpvSOye2j5eKhqn6jUvnFe2vAw/P+UI98= X-Gm-Gg: ASbGncs1CdYnGIk0l9aJ/NdOZJbdT+jLiKUp6fhyCqeM0UIYWgYMWg45alBdDzE3P0B yV3PWVP76N+HEL9B22OKK7MMThbnCC47g2m2nBwKy9BuY4BB6M8Hb/5OTivIOhYIR60Uih0sr3s dUdnEYilknz7ohL7F6Ghxa3KMLjoNfGHa1EngTcw2sy7qkg9wQ19Waij19aCqbzCa1MjCS2CQ3Y bp35ihKfOgskk5xrimbkb08WFInJC4IR5H8iEW8h/rS3ioxeoUFZMojCT7cyMYtn/woJ/7bJvLv HObfDlP+ogtv6P5mbTHdSdOxESAMtwyDvJtuKzZ+QjuQcaZ7C+lZqmHItozfxpKOrZgH8/MfyNI gH01uZ3JPAGsYmATaspIhJcrZPCYVPwxkf9uC5hnLU00= X-Google-Smtp-Source: AGHT+IHC/s/qSYdPExVgEatrfoPIiXkatqJqmR+YtTORnacO72vQiJoVtA5VweUm5I4Rrp22MM66zQ== X-Received: by 2002:a17:902:d2d0:b0:235:eca0:12e8 with SMTP id d9443c01a7336-23c6e759a54mr30180745ad.4.1751455240207; Wed, 02 Jul 2025 04:20:40 -0700 (PDT) From: William Kosasih To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, William Kosasih Subject: [PATCH v3 10/12] target/arm: Fix VST4 helper store alignment checks Date: Wed, 2 Jul 2025 20:49:52 +0930 Message-ID: <20250702111954.128563-11-kosasihwilliam4@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250702111954.128563-1-kosasihwilliam4@gmail.com> References: <20250702111954.128563-1-kosasihwilliam4@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=kosasihwilliam4@gmail.com; helo=mail-pl1-x62f.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1751455388358116600 Content-Type: text/plain; charset="utf-8" This patch adds alignment checks in the store operations in the VST4 instruction. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1154 Signed-off-by: William Kosasih Reviewed-by: Richard Henderson --- target/arm/tcg/mve_helper.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/target/arm/tcg/mve_helper.c b/target/arm/tcg/mve_helper.c index d6e2f1ac5a..185f6efeab 100644 --- a/target/arm/tcg/mve_helper.c +++ b/target/arm/tcg/mve_helper.c @@ -577,6 +577,8 @@ DO_VLD2W(vld21w, 8, 12, 16, 20) uint16_t mask =3D mve_eci_mask(env); \ static const uint8_t off[4] =3D { O1, O2, O3, O4 }; \ uint32_t addr, data; \ + int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); \ + MemOpIdx oi =3D make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx); \ for (beat =3D 0; beat < 4; beat++, mask >>=3D 4) { = \ if ((mask & 1) =3D=3D 0) { = \ /* ECI says skip this beat */ \ @@ -588,7 +590,7 @@ DO_VLD2W(vld21w, 8, 12, 16, 20) uint8_t *qd =3D (uint8_t *)aa32_vfp_qreg(env, qnidx + e); \ data =3D (data << 8) | qd[H1(off[beat])]; \ } \ - cpu_stl_le_data_ra(env, addr, data, GETPC()); \ + cpu_stl_mmu(env, addr, data, oi, GETPC()); \ } \ } =20 @@ -602,6 +604,8 @@ DO_VLD2W(vld21w, 8, 12, 16, 20) uint32_t addr, data; \ int y; /* y counts 0 2 0 2 */ \ uint16_t *qd; \ + int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); \ + MemOpIdx oi =3D make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx); \ for (beat =3D 0, y =3D 0; beat < 4; beat++, mask >>=3D 4, y ^=3D 2= ) { \ if ((mask & 1) =3D=3D 0) { = \ /* ECI says skip this beat */ \ @@ -612,7 +616,7 @@ DO_VLD2W(vld21w, 8, 12, 16, 20) data =3D qd[H2(off[beat])]; \ qd =3D (uint16_t *)aa32_vfp_qreg(env, qnidx + y + 1); \ data |=3D qd[H2(off[beat])] << 16; \ - cpu_stl_le_data_ra(env, addr, data, GETPC()); \ + cpu_stl_mmu(env, addr, data, oi, GETPC()); \ } \ } =20 @@ -626,6 +630,8 @@ DO_VLD2W(vld21w, 8, 12, 16, 20) uint32_t addr, data; \ uint32_t *qd; \ int y; \ + int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); \ + MemOpIdx oi =3D make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx); \ for (beat =3D 0; beat < 4; beat++, mask >>=3D 4) { = \ if ((mask & 1) =3D=3D 0) { = \ /* ECI says skip this beat */ \ @@ -635,7 +641,7 @@ DO_VLD2W(vld21w, 8, 12, 16, 20) y =3D (beat + (O1 & 2)) & 3; \ qd =3D (uint32_t *)aa32_vfp_qreg(env, qnidx + y); \ data =3D qd[H4(off[beat] >> 2)]; \ - cpu_stl_le_data_ra(env, addr, data, GETPC()); \ + cpu_stl_mmu(env, addr, data, oi, GETPC()); \ } \ } =20 --=20 2.48.1 From nobody Sat Nov 15 12:14:52 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1751455345; cv=none; d=zohomail.com; s=zohoarc; b=dk8ea1gzMWzer9F+6XDkWbQ0oCMGXNOcSrsCzgZNPAO+3LJLdTsvLI2dUFZ14Rgq/pDFl91NdpiR88WTGnJk6R+iC210T00FAVsqbWoW7nH56VkoGx/LMf6EDdFVYUVHbP4jwLuwWtZl6sA83FIeu08l4JpVHmUO7XhMeRq8cbs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751455345; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=CG0R9mTp11tTEY5zMYyUSL9wFDskVR0oTUKY6NSgROg=; b=gtUiVxNpAL8Z9a51Z0WfM24sD4BrXYFfVcQpFyFIQsTM2SDEw4ra2V/e9xTyNj+MLTCvJYMI29BnA1JlBssRi21N3mTxBbboseS1ujrXvAhhS0pzALKD+AoSZvZOo+GSY5p8XpF33cpCnbVw6+pr9MAoQUQ6GMCzPGEbikjjgCg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1751455345836568.5920286317809; Wed, 2 Jul 2025 04:22:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uWvWV-00082F-SA; Wed, 02 Jul 2025 07:21:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uWvWG-0007jY-CJ; Wed, 02 Jul 2025 07:20:53 -0400 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uWvWE-0002TK-B2; Wed, 02 Jul 2025 07:20:52 -0400 Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-7426c44e014so6771828b3a.3; Wed, 02 Jul 2025 04:20:45 -0700 (PDT) Received: from localhost (pa49-178-74-199.pa.nsw.optusnet.com.au. [49.178.74.199]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-74af540b25dsm13618409b3a.25.2025.07.02.04.20.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 04:20:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751455244; x=1752060044; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CG0R9mTp11tTEY5zMYyUSL9wFDskVR0oTUKY6NSgROg=; b=kFxQTTbQflh+xqpEnbQOFBWzb3dOyAWPQ6fn6dhYMzwhhfC74f14O9U7lwYT1gkQKK kJFAB9osKWco3Ze+FDaD7+zjuslYCpAPJGle/JcVrldIY78vnIGKwdoYc+aaBdJ0F5Yo eeInJ3KXrLJfgZvJTXkxhXMUf8bFHW8g2xq9LE/53oWzjyR6cKYGmRiF/vyNCEJnMf6z 2JB+j4BpVDRbJT+8cP+qOTttS8jmO8PoJNcR9VlWal/vvW6fFEyj3l8YLpnJhN6L+FLs UXBaaD3pxl2smvNHHCqh/SQMwbenmeRKJx1go4tOdq2iXSyRQLQuLncOvUn3GAUrgZVz uG+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751455244; x=1752060044; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CG0R9mTp11tTEY5zMYyUSL9wFDskVR0oTUKY6NSgROg=; b=bLjJTbA4KBstzI/eCuu4RjOMfbdr3C4wP6gzmKxRbkhdvE8FqauYC8tTMQN7AP2foH KzdFF5axzPrrEhXDfVruS43unuXFDxdP61DR2KLdwQVGmLOBX/sQ67ocuVBQ/3I/tMm+ MxKkD3LCjnfXf40pOFyfKMoS+4j9mklgZFcFEX11un9jPbpnNCLbZUUnQghwq3EQ8zXE C+wffXBJnh3fYhcedd05y+/pv6yuJ6LRVWOFF1MJNAuXXjme29A7fEkAjCUpAkuLmv3A qlhNDzG8dhdnAE5y0dpIIXJ/obrRrDT3VGhvksAnRLq0FXVkzqaJEeVyykjIU5TMEC38 cL7w== X-Forwarded-Encrypted: i=1; AJvYcCXFJivlMgg8RRYvjkIqrCE3I8SXY+eeng2rL90Wmrqy5X7Bp11KQs0gWIK5UodkANqXx4xvQ24c0Q==@nongnu.org X-Gm-Message-State: AOJu0YysMyNUxydxgVWevoM4IG1SpVrtt4Fzc/4gKkiGSGIl9g4ZrEUH oFblDGDuZMGzC1Oz9juq7CkZAS6Y05XVL9MbUjmDINmUk9zOUFbaxrnHQ3GS7YRIy2U= X-Gm-Gg: ASbGnctcSPejjSaVF1pO99t+5DsFLUdV4o6vYI6owJ8WZ1m+TpkUlgLSC16nt1O7zMr z9iBbaFJxAu4xoL2ZtLD/MWYGiRHWOpFR4cxhlzVAjYliBtpzKI1a2oB1PiRu1i4VGlCS1otHoP Izw+t01XYLeLxDAKCKkOoN5BrrEnU7vQ0UtYJ27McH6AQmHhJD6gBHk0i4AlEiiQ1Y4koV1Rt8J jABkKDj95nu7h6uAVdi+7u/yH44Gtj4vXE9HLDeFtybJeWXtYhsKzrnP0E0IOtAixO72tF3VEAE djGgypodLebQafqDpxTA7yUjHUEczV+xC/EqMmaD/doXZmaaMn2Sitm9oOWtsAiR6lCbeaHCvE/ Jja4bBwceDE5yQDkWsAX/fpM8IOgp/RNN6nNcpJJ2ye0= X-Google-Smtp-Source: AGHT+IElJEuVhFGDph6uYrqCcNgauUJTZ9XZAiOexT5cP08OgEuzPmwxoSOTASNG/Fm7AojufZpSqQ== X-Received: by 2002:a05:6a21:e8a:b0:220:eef:e8f0 with SMTP id adf61e73a8af0-222d7e90b1dmr4775419637.23.1751455244156; Wed, 02 Jul 2025 04:20:44 -0700 (PDT) From: William Kosasih To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, William Kosasih Subject: [PATCH v3 11/12] target/arm: Fix VST2 helper store alignment checks Date: Wed, 2 Jul 2025 20:49:53 +0930 Message-ID: <20250702111954.128563-12-kosasihwilliam4@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250702111954.128563-1-kosasihwilliam4@gmail.com> References: <20250702111954.128563-1-kosasihwilliam4@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42b; envelope-from=kosasihwilliam4@gmail.com; helo=mail-pf1-x42b.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1751455348036116600 Content-Type: text/plain; charset="utf-8" This patch adds alignment checks in the store operations in the VST2 instruction. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1154 Signed-off-by: William Kosasih Reviewed-by: Richard Henderson --- target/arm/tcg/mve_helper.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/target/arm/tcg/mve_helper.c b/target/arm/tcg/mve_helper.c index 185f6efeab..5dd2585684 100644 --- a/target/arm/tcg/mve_helper.c +++ b/target/arm/tcg/mve_helper.c @@ -669,6 +669,8 @@ DO_VST4W(vst43w, 6, 7, 8, 9) static const uint8_t off[4] =3D { O1, O2, O3, O4 }; \ uint32_t addr, data; \ uint8_t *qd; \ + int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); \ + MemOpIdx oi =3D make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx); \ for (beat =3D 0; beat < 4; beat++, mask >>=3D 4) { = \ if ((mask & 1) =3D=3D 0) { = \ /* ECI says skip this beat */ \ @@ -680,7 +682,7 @@ DO_VST4W(vst43w, 6, 7, 8, 9) qd =3D (uint8_t *)aa32_vfp_qreg(env, qnidx + (e & 1)); \ data =3D (data << 8) | qd[H1(off[beat] + (e >> 1))]; \ } \ - cpu_stl_le_data_ra(env, addr, data, GETPC()); \ + cpu_stl_mmu(env, addr, data, oi, GETPC()); \ } \ } =20 @@ -694,6 +696,8 @@ DO_VST4W(vst43w, 6, 7, 8, 9) uint32_t addr, data; \ int e; \ uint16_t *qd; \ + int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); \ + MemOpIdx oi =3D make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx); \ for (beat =3D 0; beat < 4; beat++, mask >>=3D 4) { = \ if ((mask & 1) =3D=3D 0) { = \ /* ECI says skip this beat */ \ @@ -705,7 +709,7 @@ DO_VST4W(vst43w, 6, 7, 8, 9) qd =3D (uint16_t *)aa32_vfp_qreg(env, qnidx + e); \ data =3D (data << 16) | qd[H2(off[beat])]; \ } \ - cpu_stl_le_data_ra(env, addr, data, GETPC()); \ + cpu_stl_mmu(env, addr, data, oi, GETPC()); \ } \ } =20 @@ -718,6 +722,8 @@ DO_VST4W(vst43w, 6, 7, 8, 9) static const uint8_t off[4] =3D { O1, O2, O3, O4 }; \ uint32_t addr, data; \ uint32_t *qd; \ + int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); \ + MemOpIdx oi =3D make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx); \ for (beat =3D 0; beat < 4; beat++, mask >>=3D 4) { = \ if ((mask & 1) =3D=3D 0) { = \ /* ECI says skip this beat */ \ @@ -726,7 +732,7 @@ DO_VST4W(vst43w, 6, 7, 8, 9) addr =3D base + off[beat]; \ qd =3D (uint32_t *)aa32_vfp_qreg(env, qnidx + (beat & 1)); \ data =3D qd[H4(off[beat] >> 3)]; \ - cpu_stl_le_data_ra(env, addr, data, GETPC()); \ + cpu_stl_mmu(env, addr, data, oi, GETPC()); \ } \ } =20 --=20 2.48.1 From nobody Sat Nov 15 12:14:52 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1751455341; cv=none; d=zohomail.com; s=zohoarc; b=ioIH3GNu95xz4+CwS+39MiymCgVwy5XDKkiNfiL1kFdW+j0/RYgtyJvUI7GKCc3q0AwnMo2KTUwrUBOLNjPI1AiJ2RbwBOMMoFlaJLjVJMJ9PjzTgbdB0gJqBLsIzUbK7NmJtm04dW2t+yx3qZEtD/fQdEApwl50Hs6TZW0du4o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751455341; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=l8uIRE/J6GXC1if0EgWProS/I1XupoffNSkt1/gwYYQ=; b=bjjrp6ESVSvGOVn1QQlPsQl9cq6od5kA1SpdzFpeHjUDtZ/AMJAWthZME+U+u1OLdbmRhVZ1NX/ti2Ule4I8bDZ8A0WjjvnfMdGMaPFqfdYkZR22DzqRqgvG0UCwsnVGGiGGNQMartJrKDaFpzWHu/RTr4ai89KmEPRBekNiiYo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17514553415071004.5935866781042; Wed, 2 Jul 2025 04:22:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uWvWZ-000883-Fq; Wed, 02 Jul 2025 07:21:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uWvWL-0007nF-1S; Wed, 02 Jul 2025 07:21:00 -0400 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uWvWH-0002UR-JG; Wed, 02 Jul 2025 07:20:56 -0400 Received: by mail-pg1-x52e.google.com with SMTP id 41be03b00d2f7-b34c068faf8so7107475a12.2; Wed, 02 Jul 2025 04:20:50 -0700 (PDT) Received: from localhost (pa49-178-74-199.pa.nsw.optusnet.com.au. [49.178.74.199]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-31a80823837sm1615862a91.1.2025.07.02.04.20.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 04:20:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751455249; x=1752060049; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=l8uIRE/J6GXC1if0EgWProS/I1XupoffNSkt1/gwYYQ=; b=hqpghQZMSbScAukOJBFd4JRmW04sqtTjxrh3KdHbb2zoxajX3xaBpydTv5EjTOi6IB BkDif8wbiebStayDU8g8DRg3ezvxPULz2IkwNBnQ1L0cvJBqpNn2XVQ/1qZkBOUXlK1R ySBf5nemw3EqjJM+f8CK6tzobrUdkUXBMTsDvvL6DSfFkodR4ZLEjvaeZbwHQKCPiywj Yk+kmc4vNJIuS1VUOwpgTnrVsS2YFO0AosxYXM22bxeG+twQANlHn9IHU+fdPxJBV1pg l85nl2ohPD2zVtCwC3yjidgdVv8b/5POc82acOdgKK2WX1NMPJZsatHR/UIiN/WVTxeo c3YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751455249; x=1752060049; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=l8uIRE/J6GXC1if0EgWProS/I1XupoffNSkt1/gwYYQ=; b=QuQXxngh9IvQG+wJyx4IfmlzkH3mBmXn/xaLaLbMAtiyODecA1sHNArRbKKlSqOuzn EJGLo0S29MA8fJMoLCsng/M2tXHf5A2pUmKGUc1RluNIlysCoyEk89WO3XbFVXwJvROm IEtm5eNTv87xzVZGCKLpKH6niZgwYBh/kPideAxlNe4+3GbH7N5C2gerRc7hLme6/fg5 2CRcauRDS6eUibrz/stERKlsPY7oYhPrkTWxfJpXQXI6TWnufNz+OwBlVVvewaVQ74LW R3gd1GLr9u1D28AnfaiztYF82XzSDjNKFhLgAEHVTcXMYW9jcXHuK5ZTE00IBFkn7mL0 gheg== X-Forwarded-Encrypted: i=1; AJvYcCWhwUJtMHnLDMs46ytAcw1HT8rk5RfQl5d5DEQ5ac2zzyxXFDmt1z+EkkJGnbucA/dhG68AcZQgMw==@nongnu.org X-Gm-Message-State: AOJu0YzVCPWiG5wsW+C3tO8q7UYBrHBoWfnTLkNaB2Gbmjr3aZMaVR67 GKyY5J1V90VSA3Vbumo9K8wkDK0c8e6AdgJ1LSmq6P/5hiCBhbsPE2w4X38IbA7jwYM= X-Gm-Gg: ASbGncvKxNztx4KzZZUwkbIFRs0wkFdJyLH01yQh29g2Xx2WOZSx3Zc91R5v/op8Ksj uJ+QtJ60c8MpCFozsbyqgHO00OiVKv19IZ31mGs7x2PGID5IsTfM5BF/OH7s8JxvSnoiLZaqL6R zFRLKqwEuAB0rQguX/n/onkWSPRK0JooCczbjmBudBmAZI73QC059j+L+6llLWpNwkq+0siZV+a eadtG7gE81+BebIf31gft//+RMrkq9d24VrGlxPAFul7h/obHpW1tv1Bq6q3LFbiRIRjw+PJ6BO tDQDPv8SnJXolDNZNC+4yOmtCkX60aff45I8vZDRVy34yAYRdb0/yJBbdPpwmtfumnNlfGcwLYL ZzVbFN7of6nXEI2wRH/vZNx0Ug4XdztLd9Ix1V6D+8fc= X-Google-Smtp-Source: AGHT+IGGQjhlrvbW+iIt6V15W/LueF9c//BvvTDJYFdexNu7sFc6puk+zVcL4FdoqsCgHzBCutZijA== X-Received: by 2002:a17:90b:3e8a:b0:308:7270:d6ea with SMTP id 98e67ed59e1d1-31a90c08754mr3570279a91.30.1751455249006; Wed, 02 Jul 2025 04:20:49 -0700 (PDT) From: William Kosasih To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, William Kosasih Subject: [PATCH v3 12/12] target/arm: Fix helper macros indentation in mve_helper.c Date: Wed, 2 Jul 2025 20:49:54 +0930 Message-ID: <20250702111954.128563-13-kosasihwilliam4@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250702111954.128563-1-kosasihwilliam4@gmail.com> References: <20250702111954.128563-1-kosasihwilliam4@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::52e; envelope-from=kosasihwilliam4@gmail.com; helo=mail-pg1-x52e.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1751455341831116600 Content-Type: text/plain; charset="utf-8" Recent helper function load and store alignment fix caused the continuation backslashes in those macro definitions to shift out of alignment. This patch restores a uniform indentation for those trailing backslashes, making them consistent. Signed-off-by: William Kosasih --- target/arm/tcg/mve_helper.c | 268 ++++++++++++++++++------------------ 1 file changed, 134 insertions(+), 134 deletions(-) diff --git a/target/arm/tcg/mve_helper.c b/target/arm/tcg/mve_helper.c index 5dd2585684..2a7d3e7548 100644 --- a/target/arm/tcg/mve_helper.c +++ b/target/arm/tcg/mve_helper.c @@ -148,45 +148,45 @@ static void mve_advance_vpt(CPUARMState *env) } =20 /* For loads, predicated lanes are zeroed instead of keeping their old val= ues */ -#define DO_VLDR(OP, MFLAG, MSIZE, MTYPE, LDTYPE, ESIZE, TYPE) \ - void HELPER(mve_##OP)(CPUARMState *env, void *vd, uint32_t addr) \ - { \ - TYPE *d =3D vd; \ - uint16_t mask =3D mve_element_mask(env); \ - uint16_t eci_mask =3D mve_eci_mask(env); \ - unsigned b, e; \ - int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); \ - MemOpIdx oi =3D make_memop_idx(MFLAG | MO_ALIGN, mmu_idx); \ - /* \ - * R_SXTM allows the dest reg to become UNKNOWN for abandoned \ - * beats so we don't care if we update part of the dest and \ - * then take an exception. \ - */ \ - for (b =3D 0, e =3D 0; b < 16; b +=3D ESIZE, e++) { = \ - if (eci_mask & (1 << b)) { \ - d[H##ESIZE(e)] =3D (mask & (1 << b)) ? \ - (MTYPE)cpu_##LDTYPE##_mmu(env, addr, oi, GETPC()) : 0;\ - } \ - addr +=3D MSIZE; \ - } \ - mve_advance_vpt(env); \ +#define DO_VLDR(OP, MFLAG, MSIZE, MTYPE, LDTYPE, ESIZE, TYPE) = \ + void HELPER(mve_##OP)(CPUARMState *env, void *vd, uint32_t addr) = \ + { = \ + TYPE *d =3D vd; = \ + uint16_t mask =3D mve_element_mask(env); = \ + uint16_t eci_mask =3D mve_eci_mask(env); = \ + unsigned b, e; = \ + int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); = \ + MemOpIdx oi =3D make_memop_idx(MFLAG | MO_ALIGN, mmu_idx); = \ + /* = \ + * R_SXTM allows the dest reg to become UNKNOWN for abandoned = \ + * beats so we don't care if we update part of the dest and = \ + * then take an exception. = \ + */ = \ + for (b =3D 0, e =3D 0; b < 16; b +=3D ESIZE, e++) { = \ + if (eci_mask & (1 << b)) { = \ + d[H##ESIZE(e)] =3D (mask & (1 << b)) ? = \ + (MTYPE)cpu_##LDTYPE##_mmu(env, addr, oi, GETPC()) : 0;= \ + } = \ + addr +=3D MSIZE; = \ + } = \ + mve_advance_vpt(env); = \ } =20 -#define DO_VSTR(OP, MFLAG, MSIZE, STTYPE, ESIZE, TYPE) \ - void HELPER(mve_##OP)(CPUARMState *env, void *vd, uint32_t addr) \ - { \ - TYPE *d =3D vd; \ - uint16_t mask =3D mve_element_mask(env); \ - unsigned b, e; \ - int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); \ - MemOpIdx oi =3D make_memop_idx(MFLAG | MO_ALIGN, mmu_idx); \ - for (b =3D 0, e =3D 0; b < 16; b +=3D ESIZE, e++) { = \ - if (mask & (1 << b)) { \ +#define DO_VSTR(OP, MFLAG, MSIZE, STTYPE, ESIZE, TYPE) = \ + void HELPER(mve_##OP)(CPUARMState *env, void *vd, uint32_t addr) = \ + { = \ + TYPE *d =3D vd; = \ + uint16_t mask =3D mve_element_mask(env); = \ + unsigned b, e; = \ + int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); = \ + MemOpIdx oi =3D make_memop_idx(MFLAG | MO_ALIGN, mmu_idx); = \ + for (b =3D 0, e =3D 0; b < 16; b +=3D ESIZE, e++) { = \ + if (mask & (1 << b)) { = \ cpu_##STTYPE##_mmu(env, addr, d[H##ESIZE(e)], oi, GETPC())= ; \ - } \ - addr +=3D MSIZE; \ - } \ - mve_advance_vpt(env); \ + } = \ + addr +=3D MSIZE; = \ + } = \ + mve_advance_vpt(env); = \ } =20 DO_VLDR(vldrb, MO_UB, 1, uint8_t, ldb, 1, uint8_t) @@ -219,57 +219,57 @@ DO_VSTR(vstrh_w, MO_TEUW, 2, stw, 4, int32_t) * their previous values. */ #define DO_VLDR_SG(OP, MFLAG, MTYPE, LDTYPE, ESIZE, TYPE, OFFTYPE, ADDRFN,= WB)\ - void HELPER(mve_##OP)(CPUARMState *env, void *vd, void *vm, \ - uint32_t base) \ - { \ - TYPE *d =3D vd; \ - OFFTYPE *m =3D vm; \ - uint16_t mask =3D mve_element_mask(env); \ - uint16_t eci_mask =3D mve_eci_mask(env); \ - unsigned e; \ - uint32_t addr; \ - int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); \ - MemOpIdx oi =3D make_memop_idx(MFLAG | MO_ALIGN, mmu_idx); \ - for (e =3D 0; e < 16 / ESIZE; e++, mask >>=3D ESIZE, eci_mask >>= =3D ESIZE) { \ - if (!(eci_mask & 1)) { \ - continue; \ - } \ - addr =3D ADDRFN(base, m[H##ESIZE(e)]); \ - d[H##ESIZE(e)] =3D (mask & 1) ? \ - (MTYPE)cpu_##LDTYPE##_mmu(env, addr, oi, GETPC()) : 0; \ - if (WB) { \ - m[H##ESIZE(e)] =3D addr; \ - } \ - } \ - mve_advance_vpt(env); \ + void HELPER(mve_##OP)(CPUARMState *env, void *vd, void *vm, = \ + uint32_t base) = \ + { = \ + TYPE *d =3D vd; = \ + OFFTYPE *m =3D vm; = \ + uint16_t mask =3D mve_element_mask(env); = \ + uint16_t eci_mask =3D mve_eci_mask(env); = \ + unsigned e; = \ + uint32_t addr; = \ + int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); = \ + MemOpIdx oi =3D make_memop_idx(MFLAG | MO_ALIGN, mmu_idx); = \ + for (e =3D 0; e < 16 / ESIZE; e++, mask >>=3D ESIZE, eci_mask >>= =3D ESIZE) {\ + if (!(eci_mask & 1)) { = \ + continue; = \ + } = \ + addr =3D ADDRFN(base, m[H##ESIZE(e)]); = \ + d[H##ESIZE(e)] =3D (mask & 1) ? = \ + (MTYPE)cpu_##LDTYPE##_mmu(env, addr, oi, GETPC()) : 0; = \ + if (WB) { = \ + m[H##ESIZE(e)] =3D addr; = \ + } = \ + } = \ + mve_advance_vpt(env); = \ } =20 /* We know here TYPE is unsigned so always the same as the offset type */ -#define DO_VSTR_SG(OP, MFLAG, STTYPE, ESIZE, TYPE, ADDRFN, WB) \ - void HELPER(mve_##OP)(CPUARMState *env, void *vd, void *vm, \ - uint32_t base) \ - { \ - TYPE *d =3D vd; \ - TYPE *m =3D vm; \ - uint16_t mask =3D mve_element_mask(env); \ - uint16_t eci_mask =3D mve_eci_mask(env); \ - unsigned e; \ - uint32_t addr; \ - int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); \ - MemOpIdx oi =3D make_memop_idx(MFLAG | MO_ALIGN, mmu_idx); \ - for (e =3D 0; e < 16 / ESIZE; e++, mask >>=3D ESIZE, eci_mask >>= =3D ESIZE) { \ - if (!(eci_mask & 1)) { \ - continue; \ - } \ - addr =3D ADDRFN(base, m[H##ESIZE(e)]); \ - if (mask & 1) { \ - cpu_##STTYPE##_mmu(env, addr, d[H##ESIZE(e)], oi, GETPC())= ; \ - } \ - if (WB) { \ - m[H##ESIZE(e)] =3D addr; \ - } \ - } \ - mve_advance_vpt(env); \ +#define DO_VSTR_SG(OP, MFLAG, STTYPE, ESIZE, TYPE, ADDRFN, WB) = \ + void HELPER(mve_##OP)(CPUARMState *env, void *vd, void *vm, = \ + uint32_t base) = \ + { = \ + TYPE *d =3D vd; = \ + TYPE *m =3D vm; = \ + uint16_t mask =3D mve_element_mask(env); = \ + uint16_t eci_mask =3D mve_eci_mask(env); = \ + unsigned e; = \ + uint32_t addr; = \ + int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); = \ + MemOpIdx oi =3D make_memop_idx(MFLAG | MO_ALIGN, mmu_idx); = \ + for (e =3D 0; e < 16 / ESIZE; e++, mask >>=3D ESIZE, eci_mask >>= =3D ESIZE) {\ + if (!(eci_mask & 1)) { = \ + continue; = \ + } = \ + addr =3D ADDRFN(base, m[H##ESIZE(e)]); = \ + if (mask & 1) { = \ + cpu_##STTYPE##_mmu(env, addr, d[H##ESIZE(e)], oi, GETPC())= ; \ + } = \ + if (WB) { = \ + m[H##ESIZE(e)] =3D addr; = \ + } = \ + } = \ + mve_advance_vpt(env); = \ } =20 /* @@ -280,58 +280,58 @@ DO_VSTR(vstrh_w, MO_TEUW, 2, stw, 4, int32_t) * Address writeback happens on the odd beats and updates the address * stored in the even-beat element. */ -#define DO_VLDR64_SG(OP, ADDRFN, WB) \ - void HELPER(mve_##OP)(CPUARMState *env, void *vd, void *vm, \ - uint32_t base) \ - { \ - uint32_t *d =3D vd; \ - uint32_t *m =3D vm; \ - uint16_t mask =3D mve_element_mask(env); \ - uint16_t eci_mask =3D mve_eci_mask(env); \ - unsigned e; \ - uint32_t addr; \ - int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); \ - MemOpIdx oi =3D make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx); \ - for (e =3D 0; e < 16 / 4; e++, mask >>=3D 4, eci_mask >>=3D 4) { = \ - if (!(eci_mask & 1)) { \ - continue; \ - } \ - addr =3D ADDRFN(base, m[H4(e & ~1)]); \ - addr +=3D 4 * (e & 1); \ - d[H4(e)] =3D (mask & 1) ? cpu_ldl_mmu(env, addr, oi, GETPC()) = : 0; \ - if (WB && (e & 1)) { \ - m[H4(e & ~1)] =3D addr - 4; \ - } \ - } \ - mve_advance_vpt(env); \ +#define DO_VLDR64_SG(OP, ADDRFN, WB) = \ + void HELPER(mve_##OP)(CPUARMState *env, void *vd, void *vm, = \ + uint32_t base) = \ + { = \ + uint32_t *d =3D vd; = \ + uint32_t *m =3D vm; = \ + uint16_t mask =3D mve_element_mask(env); = \ + uint16_t eci_mask =3D mve_eci_mask(env); = \ + unsigned e; = \ + uint32_t addr; = \ + int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); = \ + MemOpIdx oi =3D make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx); = \ + for (e =3D 0; e < 16 / 4; e++, mask >>=3D 4, eci_mask >>=3D 4) { = \ + if (!(eci_mask & 1)) { = \ + continue; = \ + } = \ + addr =3D ADDRFN(base, m[H4(e & ~1)]); = \ + addr +=3D 4 * (e & 1); = \ + d[H4(e)] =3D (mask & 1) ? cpu_ldl_mmu(env, addr, oi, GETPC()) = : 0; \ + if (WB && (e & 1)) { = \ + m[H4(e & ~1)] =3D addr - 4; = \ + } = \ + } = \ + mve_advance_vpt(env); = \ } =20 -#define DO_VSTR64_SG(OP, ADDRFN, WB) \ - void HELPER(mve_##OP)(CPUARMState *env, void *vd, void *vm, \ - uint32_t base) \ - { \ - uint32_t *d =3D vd; \ - uint32_t *m =3D vm; \ - uint16_t mask =3D mve_element_mask(env); \ - uint16_t eci_mask =3D mve_eci_mask(env); \ - unsigned e; \ - uint32_t addr; \ - int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); \ - MemOpIdx oi =3D make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx); \ - for (e =3D 0; e < 16 / 4; e++, mask >>=3D 4, eci_mask >>=3D 4) { = \ - if (!(eci_mask & 1)) { \ - continue; \ - } \ - addr =3D ADDRFN(base, m[H4(e & ~1)]); \ - addr +=3D 4 * (e & 1); \ - if (mask & 1) { \ - cpu_stl_mmu(env, addr, d[H4(e)], oi, GETPC()); \ - } \ - if (WB && (e & 1)) { \ - m[H4(e & ~1)] =3D addr - 4; \ - } \ - } \ - mve_advance_vpt(env); \ +#define DO_VSTR64_SG(OP, ADDRFN, WB) = \ + void HELPER(mve_##OP)(CPUARMState *env, void *vd, void *vm, = \ + uint32_t base) = \ + { = \ + uint32_t *d =3D vd; = \ + uint32_t *m =3D vm; = \ + uint16_t mask =3D mve_element_mask(env); = \ + uint16_t eci_mask =3D mve_eci_mask(env); = \ + unsigned e; = \ + uint32_t addr; = \ + int mmu_idx =3D arm_to_core_mmu_idx(arm_mmu_idx(env)); = \ + MemOpIdx oi =3D make_memop_idx(MO_TEUL | MO_ALIGN, mmu_idx); = \ + for (e =3D 0; e < 16 / 4; e++, mask >>=3D 4, eci_mask >>=3D 4) { = \ + if (!(eci_mask & 1)) { = \ + continue; = \ + } = \ + addr =3D ADDRFN(base, m[H4(e & ~1)]); = \ + addr +=3D 4 * (e & 1); = \ + if (mask & 1) { = \ + cpu_stl_mmu(env, addr, d[H4(e)], oi, GETPC()); = \ + } = \ + if (WB && (e & 1)) { = \ + m[H4(e & ~1)] =3D addr - 4; = \ + } = \ + } = \ + mve_advance_vpt(env); = \ } =20 #define ADDR_ADD(BASE, OFFSET) ((BASE) + (OFFSET)) --=20 2.48.1