From patchwork Tue Mar 7 23:46:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 659896 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp38082wrb; Tue, 7 Mar 2023 15:50:40 -0800 (PST) X-Google-Smtp-Source: AK7set8Fu9me38e9pbtq/Fw+OCUqPpaw+OvrA0bZNAuMzmhwgpOKFjqw4N1AkqpgnXcpa/l1HPzh X-Received: by 2002:a05:622a:58e:b0:3b9:bf7f:66ff with SMTP id c14-20020a05622a058e00b003b9bf7f66ffmr26336607qtb.67.1678233040679; Tue, 07 Mar 2023 15:50:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678233040; cv=none; d=google.com; s=arc-20160816; b=VAHL9jXPCOFPoWHZeWWp2pTMjY2eh4KH0Uta7WdRF0KaI25/UbAvDf+LWK7pvjHWQS WnoREmboemFMahplxnUsexBZknhXJECg7HZXrKOBN0XILIKmoG/J2KaedlZ5jKFmRDtz PY7SFBNzwfRXBfifwecxrSqDg+OzAPfuiyQt3JyVKoH+5RnWptnEh4SRn2iiI7BCkPYf 3IFvSicAZlz1TPXaQaU/wCTwzrPtGicj7F5UeMEgISnu8LGGWgnUJmrXLjusap23jQd1 iv2H7684ZEfrUhONivywKPgpEfdqAv3l5Tt6gyijXzu5yDjJeOdFDYqC9l7Fp8ybRSqa +7JA== 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=OWLKTAiO22eOFIqE0r2ZKSlIhbJwHJ6ob/hpxtZPjvo=; b=q4Uh21qHIjWrTVEk+blOIb138Ue5kf4UTmKlElIGutEaiucAbvcJ/+TzPbQ/vPY8bI Eozc6bq13i0NB4UpCL0KE3ImAyFmfQoFaJsxYUUZ1GfdL7mRiWjKpzzlACfrjyU2keyt 5kGtlHFolhHHjOw9u5WGvJ67/XkLwCV5BRcuGwAiYNV7pw77NxV7oFNN3Ih+u5uWmsOK Fn/gTMOUHfHVS2JR4G1+xaAg7/tqHfM6TbH5ZdChXWMYniYliipoYJEfiSzt85SC9v2Q taHP6XEKasHnemQgW+r3UQJFJZE8joopMf0oAr1FYm9+a59biTj4pO0eUnT/+6QclgPA K+Gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=B7M5uKYX; 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 e10-20020ac85dca000000b003ba11617afdsi11087737qtx.267.2023.03.07.15.50.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 07 Mar 2023 15:50:40 -0800 (PST) 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=B7M5uKYX; 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 1pZh1y-0000Ly-G7; Tue, 07 Mar 2023 18:47:42 -0500 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 1pZh1w-0000E3-2Y for qemu-devel@nongnu.org; Tue, 07 Mar 2023 18:47:40 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450: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 1pZh1u-0002go-Fi for qemu-devel@nongnu.org; Tue, 07 Mar 2023 18:47:39 -0500 Received: by mail-wr1-x432.google.com with SMTP id h11so13781051wrm.5 for ; Tue, 07 Mar 2023 15:47:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678232857; 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=OWLKTAiO22eOFIqE0r2ZKSlIhbJwHJ6ob/hpxtZPjvo=; b=B7M5uKYXYg1CUYNAgJgEcmrNPwzxV4Sh0R3tpe/+9j5HhW7o2FOb5FVWj4iyUE8pcc YKNUJzng8Og6kzvDYAG8nmBWoLRR/VGFGSbh0AfXp1VwwaMLXmeAhEkgPWMxNjWFvh9F tCcc6v5eOhAPmu50MfONL8j51Ip044hoOjWlII7qEs2KoGBqWbA4ZCBlUv899oU9hlvc ZcYi734tm2OUZmAsAHQFyDecalVee7LiUp7SEeE8oEp9axlzsrh7MxbdxymUn+xlEfsY r5GoD2MQtojxpQlmpIDQA32m3U0hcPtyzz8xswQpSqHH+lmIHGO0dyiGKpezJ/hSUyB5 CY+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678232857; 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=OWLKTAiO22eOFIqE0r2ZKSlIhbJwHJ6ob/hpxtZPjvo=; b=ER1t8vg/WQkwgLZwDEJdERVYk4WEt007PdkvHvMMn5k+qw3ded1Ek9fSTuDXhp2A3E m0LbBIp09jhVaZDjR8O3FSpvJN2nkPMm8+jWMInFZA4Sb0NpYZsbQofQhkv1jbX/8Zp5 OixGTbjc5LJ4TEzKH7Aj/Q95buE/bmG3Vt8rSLEUgMhcorKeN6+M8vd6Re8vZrfAG4KO /LjydFgx/XorawfXDiGpMcA+YhPFVuWzCwYG4YJIp6JPygMFyTpft20FXkfIxAPi3ZrS 3nLiM/6i3nZSrRw+I3kqpkF3mAaLPuxUiza5loQT5VCMvpnNWWYj6YG7UDyhE41wW24C DU+g== X-Gm-Message-State: AO0yUKV9plEaUXWKdKc9KUapOX2yKqjFIyjjyaPkA/qCQTlk0mOyHLLK CoOzYUB3L09FW0r0RQRD8dXIMf2vN8OUttpZCBk= X-Received: by 2002:adf:dd4a:0:b0:2c8:14ba:459f with SMTP id u10-20020adfdd4a000000b002c814ba459fmr11256694wrm.20.1678232856935; Tue, 07 Mar 2023 15:47:36 -0800 (PST) Received: from localhost.localdomain (57.red-88-29-179.dynamicip.rima-tde.net. [88.29.179.57]) by smtp.gmail.com with ESMTPSA id n16-20020a5d67d0000000b002c758fe9689sm13634387wrw.52.2023.03.07.15.47.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 07 Mar 2023 15:47:36 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Marcin Nowakowski , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno , Jiaxun Yang , Aleksandar Rikalo Subject: [PULL 04/20] target/mips: Fix SWM32 handling for microMIPS Date: Wed, 8 Mar 2023 00:46:55 +0100 Message-Id: <20230307234711.55375-5-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230307234711.55375-1-philmd@linaro.org> References: <20230307234711.55375-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=philmd@linaro.org; helo=mail-wr1-x432.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=unavailable 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: Marcin Nowakowski SWM32 should store a sequence of 32-bit words from the GPRs, but it was incorrectly coded to store 16-bit words only. As a result, an LWM32 that usually follows would restore invalid register values. Fixes: 7dd547e5ab ("target/mips: Use cpu_*_mmuidx_ra instead of MMU_MODE*_SUFFIX") Signed-off-by: Marcin Nowakowski Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230216051717.3911212-3-marcin.nowakowski@fungible.com> Signed-off-by: Philippe Mathieu-Daudé --- target/mips/tcg/ldst_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/mips/tcg/ldst_helper.c b/target/mips/tcg/ldst_helper.c index d0bd0267b2..c1a8380e34 100644 --- a/target/mips/tcg/ldst_helper.c +++ b/target/mips/tcg/ldst_helper.c @@ -248,14 +248,14 @@ void helper_swm(CPUMIPSState *env, target_ulong addr, target_ulong reglist, target_ulong i; for (i = 0; i < base_reglist; i++) { - cpu_stw_mmuidx_ra(env, addr, env->active_tc.gpr[multiple_regs[i]], + cpu_stl_mmuidx_ra(env, addr, env->active_tc.gpr[multiple_regs[i]], mem_idx, GETPC()); addr += 4; } } if (do_r31) { - cpu_stw_mmuidx_ra(env, addr, env->active_tc.gpr[31], mem_idx, GETPC()); + cpu_stl_mmuidx_ra(env, addr, env->active_tc.gpr[31], mem_idx, GETPC()); } }