From patchwork Tue May 16 19:41:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 682392 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp19059wrt; Tue, 16 May 2023 12:52:18 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6lzA6JSxzuPyXMtrPeTp7Sk2zTbYMvbEYR2QtUbufkVMkaeX/3nVT2emO8sbpDo/Zx1grU X-Received: by 2002:ac8:598f:0:b0:3ef:31c4:c8da with SMTP id e15-20020ac8598f000000b003ef31c4c8damr63941860qte.50.1684266737771; Tue, 16 May 2023 12:52:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684266737; cv=none; d=google.com; s=arc-20160816; b=HerHHlmsG1uIn66bNm7qo+094vTNx7voW/LK3oh6BIbBvrbT/Rc7WW/RBGCazzcT4P V8Dq04H4bsCKCuHXkt82tc/d21J8w0G0oYTg/OBUTAjBRXZpHDzi6Fz3OhEYA3LfNxUj arbgRr8S0NFpwlOpG3GcTXgvjaCJbpAyvP0O2WmG60Lfa8TmuxCvY43mLFSwaQSqSXp9 nqjpRbTVvVbKSGH+Tpfc30oGBuX0db+aTzrXs/lzXs3f7Jg+Nn0IO/nRXJ2U92gtc8Sh pHuzL1yRH978aecCVRlHDDhdhLkiNRtcQNNQBarjoXiFKpbA71lcRYn9g5a2dJ7ptHWm KBfA== 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=x0m1o00zlToFNXbMeHftTRJjM9JUo6XAGwMqXPxpsNk=; b=ZzVtMjlJhJ/CX7VvQJgTPcuwrrttJDAPdQFCl29SGuZnqaXRhufE4Mpt3CaLXtXk+E +ac8RSYHAjTqbzqh9uR9276Hfq6cXuzCcnfCyIOnswoNjNx1+05HLhrHKIxUxuKFhc0P 8P+iWxJkiunkwCwBhZ2O3fCYlQPFoBymRVAuOrBJsYURbQgh7lHI53jORf+X1a2sICx3 FtDxtMe4eI6co0xoRXG/hd0Ty8l1JlOD4+ZVvztlzzv+0ANOtE/Jid9BMjGv+uFCDBwA DwN10wVYA2T8u0x+hyovcINoq6Pm7jY3oXFRofoFCmjz39B273DcToVdvuXqu0W5VdwX QDlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xh8JkQ8s; 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 v8-20020ac85788000000b003b644e69427si9809240qta.504.2023.05.16.12.52.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 May 2023 12:52:17 -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=xh8JkQ8s; 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 1pz0el-00032r-5W; Tue, 16 May 2023 15:48: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 1pz0cN-0000Vz-Oc for qemu-devel@nongnu.org; Tue, 16 May 2023 15:45:56 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pz0cK-0003iw-6z for qemu-devel@nongnu.org; Tue, 16 May 2023 15:45:55 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-1ae4be0b1f3so545275ad.0 for ; Tue, 16 May 2023 12:45:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684266350; x=1686858350; 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=x0m1o00zlToFNXbMeHftTRJjM9JUo6XAGwMqXPxpsNk=; b=xh8JkQ8sexYe60SmPHI76wR/QADRDBQ3fs8bCoV4k/6wa6Za0Vy/RaSLjbI16MyRqQ 4FmF89yy1ad2yD/G9B+iOkQeLr65AwOYDXVwfKisxX3JOvGrwUWpOKHRw/9NJc00lf7T dbIZzYSiXgbxRES4ahV7bpHVgO/uV3osIpmQ3ma/G2q1IPDkP1sY2pW60dmD+Hfo2itO u+oKJRsYpGyTo7lZ6e/zNl71mM2DZYKyOS/lNP7V198S7NWTj9rgN4MRYLsxuk9BxZGj AocXAhVcl71uN3n9n5RdxbSW0zd0jB1gnnIczOHCpGu4yVJHuj/0GaE45E/ct+WMmAC+ hWGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684266350; x=1686858350; 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=x0m1o00zlToFNXbMeHftTRJjM9JUo6XAGwMqXPxpsNk=; b=cmTazjfkDVBAuCmAyGcLWssFuFeT9xMRSftXaMJeSlzZ5z7l5VsqlIIdexlHvOdLar uTvz/w7ipEPFnJ2o5+8RcyGzlJdK/XUwbQvYivHno7+ZOWEqofXGDq0YArV72wAgrYfT CQR5jNsbIGK7HZYGQkPg7zMidcTW3eJ39iKdMEcO9F6qYXKuAyG4D+ddvrzYs4/Ewghs W1HxqV5dIImDtq/63nfMiT7RkCv61EWQDZLM12/2VFC6cbqoMcq+EWZ2/n/SVt7bDi2M tbnyNH/D9Ctqtld8tq2KsrvAGRph9nvg1rWXAS9w3ASXcWhrIupYpIWvQWNakN7nFcYg ZAsQ== X-Gm-Message-State: AC+VfDzw6N6CG3e0XgiYsny5FBGe6YvD4DGaRzcgD+AYb6PMwsuBkb8y wGFxwonNLCn35rwVAoJJ4J2tTA8LAyj+bbncMtY= X-Received: by 2002:a17:90a:7388:b0:253:3d7c:949a with SMTP id j8-20020a17090a738800b002533d7c949amr520361pjg.33.1684266350191; Tue, 16 May 2023 12:45:50 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:ec81:440e:33a4:40b9]) by smtp.gmail.com with ESMTPSA id y12-20020a17090abd0c00b002508d73f4e8sm25555pjr.57.2023.05.16.12.45.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 12:45:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PULL 72/80] tcg/arm: Remove TARGET_LONG_BITS Date: Tue, 16 May 2023 12:41:37 -0700 Message-Id: <20230516194145.1749305-73-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230516194145.1749305-1-richard.henderson@linaro.org> References: <20230516194145.1749305-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62d.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, T_SCC_BODY_TEXT_LINE=-0.01 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 All uses can be infered from the INDEX_op_qemu_*_a{32,64}_* opcode being used. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- tcg/arm/tcg-target.c.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tcg/arm/tcg-target.c.inc b/tcg/arm/tcg-target.c.inc index 47f3ff18fa..3c38e868e2 100644 --- a/tcg/arm/tcg-target.c.inc +++ b/tcg/arm/tcg-target.c.inc @@ -1431,18 +1431,18 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext *s, HostAddress *h, * Load the tlb comparator into R2/R3 and the fast path addend into R1. */ if (cmp_off == 0) { - if (TARGET_LONG_BITS == 64) { - tcg_out_ldrd_rwb(s, COND_AL, TCG_REG_R2, TCG_REG_R1, TCG_REG_R0); - } else { + if (s->addr_type == TCG_TYPE_I32) { tcg_out_ld32_rwb(s, COND_AL, TCG_REG_R2, TCG_REG_R1, TCG_REG_R0); + } else { + tcg_out_ldrd_rwb(s, COND_AL, TCG_REG_R2, TCG_REG_R1, TCG_REG_R0); } } else { tcg_out_dat_reg(s, COND_AL, ARITH_ADD, TCG_REG_R1, TCG_REG_R1, TCG_REG_R0, 0); - if (TARGET_LONG_BITS == 64) { - tcg_out_ldrd_8(s, COND_AL, TCG_REG_R2, TCG_REG_R1, cmp_off); - } else { + if (s->addr_type == TCG_TYPE_I32) { tcg_out_ld32_12(s, COND_AL, TCG_REG_R2, TCG_REG_R1, cmp_off); + } else { + tcg_out_ldrd_8(s, COND_AL, TCG_REG_R2, TCG_REG_R1, cmp_off); } } @@ -1485,7 +1485,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext *s, HostAddress *h, SHIFT_IMM_LSL(TARGET_PAGE_BITS)); } - if (TARGET_LONG_BITS == 64) { + if (s->addr_type != TCG_TYPE_I32) { tcg_out_dat_reg(s, COND_EQ, ARITH_CMP, 0, TCG_REG_R3, addrhi, 0); } #else