From patchwork Tue Jun 29 18:54:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 468373 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5270991jao; Tue, 29 Jun 2021 12:59:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyK0/TQ7rAPW9o2fNWj6IAoRDsNsorUCkDLfCh9CTQ0m1iZHb33m6VUR8VyRl3R/equ530e X-Received: by 2002:a25:ad4c:: with SMTP id l12mr3318849ybe.421.1624996779219; Tue, 29 Jun 2021 12:59:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624996779; cv=none; d=google.com; s=arc-20160816; b=Hbl4ifEdPkWTKFMJcxbXO/9UguzMpBbWZUDfqlStzB+c0aoKE8HrouxuPWGm1UMAig 2fWrhv9YrUkrN8GSyukIUUbVh1dHHfa5OcJmG97j6Quu7A8zIAtZlaGakPEt5dFOTqgh gOgamSHMWdBKS6Z1gjYbxYFsYGM3Oaeg83fW1nvKXd5gz+LP71PE4RVB+9pRpF+giECm plTcOCR12obkgdTJSVmjJuYxwNTC89Hp7nmTTDozbumbhl5O7+nMLoOLpb3Aji+7oygY FSfO4hsuMDHXwBYtu95pmktT5Dlk4NUNBVxTHxAXGoSFHg0lge2vJ2fMx8ycZQvqUrpi E5Rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=JvueqUJG6jJaFwqgDWte995LKM+oGyntlGLt3se6n5Y=; b=wdPIsVpw9Uot3ZiIuA5oEGkOs6icIYkYYHg5NgCmiBtvf34pXmKxiGWdp6B65TZnlM 7Dt+iErtEf9K1s0/JSHRVCpA1qeVhJQmLfYJs66GxyWhr1N5DXOqSbkthRvjulDH96lR D5Z5/CcZFyNYbjGNujXdGqOKUAl1L3DCEX1INvPDpe20iWSFtX6VNPA88pgsJ/z0mNVL uS6nJh0ZLeR2NQKsXB0BrNXRM9gOgyJe+H8BVP2qnYDbicIbZTb72udhXvGWTP43C7k5 IreGACpfHYxpNyf/BwH854oFTpI9+jH8VEVRhl9TaAYjN1QHii5saklQEXEux+k/C44g mNUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rYaUnwty; 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 u14si17416526ybc.422.2021.06.29.12.59.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Jun 2021 12:59:39 -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=rYaUnwty; 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]:34654 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lyJtS-0000Y3-LH for patch@linaro.org; Tue, 29 Jun 2021 15:59:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39826) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyIwi-0004DU-7a for qemu-devel@nongnu.org; Tue, 29 Jun 2021 14:58:56 -0400 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]:40457) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lyIwR-00032I-P5 for qemu-devel@nongnu.org; Tue, 29 Jun 2021 14:58:55 -0400 Received: by mail-pf1-x434.google.com with SMTP id q192so102053pfc.7 for ; Tue, 29 Jun 2021 11:58:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JvueqUJG6jJaFwqgDWte995LKM+oGyntlGLt3se6n5Y=; b=rYaUnwtyPhjBw/WnaNQLr2lpm+2OApP8V1RWh5qX8Ch3guQ5scFt3Qqog7Ka/55+Yq jphZJr2cdrtED6KoInGUxhzghefWKBQA1CsxLpBCninv1g82wJ3YzGjNz3RcJPypHJIQ ocJecs2S7DZEYT7qTBj8L1NqppDDrcGpqXizDb6Z2S32eyu4Q1JOtctGzirLmnrrsLgz MoqbRAcKlW6kcZgTCL9y/ehKC0xCYOTjYwXkC2pFZIUW/97T7nOIKXfDAliYbfd5I0v2 97U3VkRwh6pMC8/qAPffyX6WS1hevFAxTvDqjCvjgetGJzJHt+flniD8TBABVHaIfMRR Ozfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JvueqUJG6jJaFwqgDWte995LKM+oGyntlGLt3se6n5Y=; b=XV9Wa80us8CS7tCqxEoPgLEf9PQM/kowpmyYKzp7y7who8gEK79way/ABc/pWWafvI BN255Hc171JyVQh+Vev3/BqYzlJbjrNkU1Q4AZgwNsu3ro0mRFIdELa5q5CWKPVJDLgC HkOLOflrTvnFN5bklBSFnZc4rSO6WzlIAWDrxAPx/BBCli0sb/75w4T6t3OnKDhB3IQx qjXj2xm3VIMCav9GO8iTGQgBfFLG1iC9n42xnpMkRP9gQ0FcUYkX42NtQczzSNu89OCL sq+t1IkIaCBrlmg/oioohvMO6F/wos1JGIjPiza2aY4McOm+7/uU6FGMEtiFEr63JH+5 EjpA== X-Gm-Message-State: AOAM530rDP6ligQlOoeEY9FX4LrN+Y17wkkd/9WDsFj0t96LYHZSIIky 0JroGn7I7ksY4Nrb8CwYZVpDYJhd8tImxQ== X-Received: by 2002:a05:6a00:2145:b029:30b:127:e0a3 with SMTP id o5-20020a056a002145b029030b0127e0a3mr16845437pfk.34.1624993117771; Tue, 29 Jun 2021 11:58:37 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id 21sm18002849pfh.103.2021.06.29.11.58.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Jun 2021 11:58:37 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 60/63] target/mips: Fix gen_mxu_s32ldd_s32lddr Date: Tue, 29 Jun 2021 11:54:52 -0700 Message-Id: <20210629185455.3131172-61-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210629185455.3131172-1-richard.henderson@linaro.org> References: <20210629185455.3131172-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::434; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x434.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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" There were two bugs here: (1) the required endianness was not present in the MemOp, and (2) we were not providing a zero-extended input to the bswap as semantics required. The best fix is to fold the bswap into the memory operation, producing the desired result directly. Acked-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/mips/tcg/mxu_translate.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) -- 2.25.1 diff --git a/target/mips/tcg/mxu_translate.c b/target/mips/tcg/mxu_translate.c index 3f35e46399..f52244e1b2 100644 --- a/target/mips/tcg/mxu_translate.c +++ b/target/mips/tcg/mxu_translate.c @@ -857,12 +857,8 @@ static void gen_mxu_s32ldd_s32lddr(DisasContext *ctx) tcg_gen_ori_tl(t1, t1, 0xFFFFF000); } tcg_gen_add_tl(t1, t0, t1); - tcg_gen_qemu_ld_tl(t1, t1, ctx->mem_idx, MO_SL); + tcg_gen_qemu_ld_tl(t1, t1, ctx->mem_idx, MO_TESL ^ (sel * MO_BSWAP)); - if (sel == 1) { - /* S32LDDR */ - tcg_gen_bswap32_tl(t1, t1, TCG_BSWAP_IZ | TCG_BSWAP_OZ); - } gen_store_mxu_gpr(t1, XRa); tcg_temp_free(t0);