From patchwork Sat Apr 6 05:37:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 786477 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1101:b0:343:f27d:c44e with SMTP id z1csp489397wrw; Fri, 5 Apr 2024 22:39:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV0xqQJIQ9+biEwtmJnK1avsrpIY80SUOZ2PPBRWXEGAsdADAz2kgAzGg24tzk049GJefnMspjhK++9e3T277f4 X-Google-Smtp-Source: AGHT+IEXA2aT5wdk8u0oJ+8LdXcJeMPb66RkEyEMfeTcZivAB3pMHSSXjerjR33Sz56iO6BWPj2p X-Received: by 2002:a05:6214:d87:b0:699:2f69:ac87 with SMTP id e7-20020a0562140d8700b006992f69ac87mr3592376qve.45.1712381953838; Fri, 05 Apr 2024 22:39:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712381953; cv=none; d=google.com; s=arc-20160816; b=GHYDetss8n/qXgckjWnv+GpFeLj93vu9kNsRSUcqO9fCLVaPTJwYXWhUq2fpbjfExz eVg/Y69MPiXTZJ6pLdXN/WAn6LJJjseYCabaoji4Y4m6BAn1wH7gF1WtbvhIP07/ybmV O4pEipWyFX6LcwO1j9s4VoVJgvW0R89h2+gObjQahdmQ8yVN+l+7F4CLf5YCEwc6W5Bi QZp3EnXyqAZgdtZNztib9zQIgzsnYQKKZYRJMpTqDTRnmToY7ag1T3tlt8s3e/MGikdX Z+UkM9ZGqqpbqie9J+4BLP29aLSBaupmzq1uzOLkR2Vp5D5pmaUBW9rs9157hjLdSXUn cbDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=RcrZGxEnfZgrLqlhciK4hABUGUNHIg16hIoNjeHOda0=; fh=84/uo61yBhOat7tWTwgBWiREzrxU2uSS3JBQDi1oXBY=; b=foE045vLPu7/hvpae4DADT9Vhv0AcRU2/kn/uwfN+bF72eOohBFyX98/dKFDSvWq7v +yWOHtIEg+36S3RxHmF7fQ/Q07IOtSKT9A1QS3UMjdt6p1/G3KEu5pcFhZFnUnhhzlzC b2WjJAs4H9K2eqjB1pdxo/xT9Q1uSv4NP3EUaKdQOgiOlQE/YDszautGd4Xm7o1pXNNz qV7z8X1wngh464uEG+TdEDcjKVHZbqUaorn4OGPR2bQyUJWfQ1MlcW5C9mt9Dt65G16C vsZ7sz4zKus25FKJ/ntDMEa9W6iN9e9sW2YkTyo1iuvmt0+DplsYKfDKcWLAxKc6WTwa hHeA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=U3EGEHfv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id df17-20020a056214081100b006992047c104si3453844qvb.122.2024.04.05.22.39.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Apr 2024 22:39:13 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=U3EGEHfv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rsykI-0002q6-OA; Sat, 06 Apr 2024 01:37:42 -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 1rsykG-0002pY-Rz for qemu-devel@nongnu.org; Sat, 06 Apr 2024 01:37:40 -0400 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rsykF-0006I4-A5 for qemu-devel@nongnu.org; Sat, 06 Apr 2024 01:37:40 -0400 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-6ecd957f949so2683446b3a.0 for ; Fri, 05 Apr 2024 22:37:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712381857; x=1712986657; 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=RcrZGxEnfZgrLqlhciK4hABUGUNHIg16hIoNjeHOda0=; b=U3EGEHfvNDT7eFspbsn90ONUSk29KRfcTAPYh5jfE/v1k6mgFSNqiKoCR2AsOOeZid 5LjaBlQsPOrgfFUfAEzJcIVa+g8OKPJyE0yWH1Nf30WUBR3oIOvRhIMz+gnrMrr186Gn uBKXQxLKnPn57rQYu9y71v7TsNc4KPtnv9GFZ4K+B/m08W6eJhKdodGu7G/kdFZV1pqV PEXWuAXzh2L7ZynaJmgSTzQsiAlnDyf4hr82QC4KrdEioTUUuSrp763BryTK373VMlmM 9sLQ7tYKqALWmtBtGjAgQp0XoDv9dGod3XaLHFyZf4UDOhEwBiU91pItA2yqSzMsLC0M acog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712381857; x=1712986657; 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=RcrZGxEnfZgrLqlhciK4hABUGUNHIg16hIoNjeHOda0=; b=GlYg46P1zjYAUx4QxjsX/dtSIaSkXduPqgd8UV1t1YG9cOT/Mfjzxy83aNSeoRlPP0 vg/T+9pEWTc6j6HYiEKZiR17jbCyFsYnQ/JdrL/Uuv7DJ4gTrNvlUPibiOTtO7xquLsd Z9M97HaZdkEa17xrdQjmsPnXplMgZIYWR1d4X179Cb2VpjaDH8vZ9EWXvNGxEb4FlBNG ql0B2WyHNOBgR8KISH3j0dZR38chft+edmbovYjRwkXkcULjDTsFunHd2knN/kckF+i6 5Mr6Bj0tfBy6kIRWq0UXSJLHicZ0ZLcm1ANgX2jn33dMouhHL8uy91xgwr4ZVL8CV3u6 fEtQ== X-Gm-Message-State: AOJu0YzClfgOmb8K8qoqtbTl/4CQg2wtu36CkKBnkmvTyOAm28h+kqxd /Jr5AtrD7k0X7pSINZA1pS+PxS9V+p5qedjeo1P8BGdGPtD7k1F3+WYJRr28SmjEKyfkHWKSzGJ M X-Received: by 2002:a05:6a20:6d94:b0:1a3:d60c:4889 with SMTP id gl20-20020a056a206d9400b001a3d60c4889mr2909796pzb.56.1712381857428; Fri, 05 Apr 2024 22:37:37 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id u12-20020a170903124c00b001dc05535632sm2589378plh.170.2024.04.05.22.37.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Apr 2024 22:37:37 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: zack@buhman.org, peter.maydell@linaro.org, ysato@users.sourceforge.jp, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 1/4] target/sh4: mac.w: memory accesses are 16-bit words Date: Fri, 5 Apr 2024 19:37:29 -1000 Message-Id: <20240406053732.191398-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240406053732.191398-1-richard.henderson@linaro.org> References: <20240406053732.191398-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::431; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Zack Buhman Before this change, executing a code sequence such as: mova tblm,r0 mov r0,r1 mova tbln,r0 clrs clrmac mac.w @r0+,@r1+ mac.w @r0+,@r1+ .align 4 tblm: .word 0x1234 .word 0x5678 tbln: .word 0x9abc .word 0xdefg Does not result in correct behavior: Expected behavior: first macw : macl = 0x1234 * 0x9abc + 0x0 mach = 0x0 second macw: macl = 0x5678 * 0xdefg + 0xb00a630 mach = 0x0 Observed behavior (qemu-sh4eb, prior to this commit): first macw : macl = 0x5678 * 0xdefg + 0x0 mach = 0x0 second macw: (unaligned longword memory access, SIGBUS) Various SH-4 ISA manuals also confirm that `mac.w` is a 16-bit word memory access, not a 32-bit longword memory access. Signed-off-by: Zack Buhman Reviewed-by: Yoshinori Sato Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20240402093756.27466-1-zack@buhman.org> Signed-off-by: Richard Henderson --- target/sh4/translate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/sh4/translate.c b/target/sh4/translate.c index a9b1bc7524..6643c14dde 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -816,10 +816,10 @@ static void _decode_opc(DisasContext * ctx) TCGv arg0, arg1; arg0 = tcg_temp_new(); tcg_gen_qemu_ld_i32(arg0, REG(B7_4), ctx->memidx, - MO_TESL | MO_ALIGN); + MO_TESW | MO_ALIGN); arg1 = tcg_temp_new(); tcg_gen_qemu_ld_i32(arg1, REG(B11_8), ctx->memidx, - MO_TESL | MO_ALIGN); + MO_TESW | MO_ALIGN); gen_helper_macw(tcg_env, arg0, arg1); tcg_gen_addi_i32(REG(B11_8), REG(B11_8), 2); tcg_gen_addi_i32(REG(B7_4), REG(B7_4), 2);