From patchwork Mon Jun 5 20:15:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 689275 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp2289208wru; Mon, 5 Jun 2023 13:28:52 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5hNdmZE2yN+ALc8URoaWKqh9YcgsF5V5oMIHxOVSEpw4YUglygJxuhN/TrvhapGKLW1I9K X-Received: by 2002:a05:6214:c68:b0:626:2047:c845 with SMTP id t8-20020a0562140c6800b006262047c845mr8630332qvj.55.1685996932449; Mon, 05 Jun 2023 13:28:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685996932; cv=none; d=google.com; s=arc-20160816; b=Dfadq4EJHQ7BRpfc+ae6FB/AZYtpxmJ3m0ECbt9uaJCZZ6T8csTJr8C1fbMn0f7Dvz niCdt9+WY9qkjPQiNV+QYUQ/5WEI1PXfogQ6i+g5Qc3/jWjJ/5YHWjhBwKLQQ5Hw+XeY CEOnc6DozlwaWt5whHfrqrR8K4xt334oC+8wR0QH4Aolj9662gPWjKdZqqZ8NrWFs5JE +aPT+NtGtd95epWFaupBKTK40O2om1S+wH9vBipahkThvzXLM10v7HxuJocJrU1Ilxzh AirNu1PR0wKdIZepTxNfKUHqgzu1lf7llu1rDWsCka2xTFp2CsfvcuSWt7drgvXpJTp0 XOjQ== 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=HIYhvEBe+5na9q7sHii4+3BzV/97aBHrhxLYvL4RaKA=; b=fNI3FdMjUgnsJvRETfTHGBp8KMTRB8KzLCtcGDJHQN9YCgKVxwMVQ2jV7LBIwn+ezy FYdOrItsv5lFCp44tFbAvVwJD+S1AxchqvxiDn9KOlqjIk2PG7k/ArRmlFLUlk40snX3 oC7joVnTSo/ST6SYzpizbIlqya/KYKh8o/nh7h32kZhcxY2XaOSdEiTcJcyxxPZDEOud ifw5gMWLEGX2c4IWgnBSzuoIqf0jgf0PpmiRX2ssKnozPodzwsuBqEfO9uOPs7yS6ITc Uoly/t7fh11wt1K8WJwG77gENmw4BIOAvQMFLgLFbPEyDQIbTDNBC5cZiZTxDCA5bCKU NsgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=x1m7aCsS; 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 if7-20020a0562141c4700b006258f40e7fbsi5324529qvb.454.2023.06.05.13.28.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 05 Jun 2023 13:28:52 -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=x1m7aCsS; 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 1q6GcR-0001lO-CO; Mon, 05 Jun 2023 16:15:59 -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 1q6GcP-0001kj-8i for qemu-devel@nongnu.org; Mon, 05 Jun 2023 16:15:57 -0400 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q6GcN-0003ju-Nb for qemu-devel@nongnu.org; Mon, 05 Jun 2023 16:15:57 -0400 Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-6537d2a8c20so2336828b3a.2 for ; Mon, 05 Jun 2023 13:15:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685996154; x=1688588154; 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=HIYhvEBe+5na9q7sHii4+3BzV/97aBHrhxLYvL4RaKA=; b=x1m7aCsS/nkatNWFv0ZemDFOeRejzgwuKIgZCpTSmAvJ62iHyt5wyQ0I6Kt10AlinX 9IAhctQCgDVboP183ZT5mRDi8roef29FD4BAPMeFOBiELFoaiiOCNjpkJkg05EwP4bRK x9+kDVH0fteulBwDVOPEo3rvzQyf+eMkgmrtmypNHPngVkhM7myay2ghQZZOJPlBlV3/ Nw8swO/2zABK1jJItOct+uj7Ld1vB9ivsVTAM8MJaCC4v17g2jAFGKT/74lWm4ttI2H+ mjAZXQe1GGN4+sPTf6GNLElvhX+kx3SeOlO1HaRzr8mvN2MyDEZU6WmMHLPzBtxSofK8 GWRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685996154; x=1688588154; 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=HIYhvEBe+5na9q7sHii4+3BzV/97aBHrhxLYvL4RaKA=; b=HIMfdN9lQZ+BZg+JzkzXjOJgiWsWBbz2G0dLZerLNCzGQ2XeVB2Gs3htr7hAySS8Kx jvITByKKErS+e1VMZ/5ZI+wicJcDfEldaAvCLeu9YHJaGanAhPSgWOhj0lfx7NXjwpOM W6uvJ/r/IWaahl5+3QD0j3TrWGJXIg3HCnR46JvpoY6Q0iB+TMgyaRh0DWlr5e4DpZ/J CFOd45IaTb/dB3aI0H+h7le/Rf2aAia93ksn/np9fBZhdeXnVg1A1058FWD8b4BER3gP 6Eit8ILwANNITo0YaPohbv22G5QWyRtxfd36iKxy41hFitLrl+jUAhYIbujlimrFAfYN ILvg== X-Gm-Message-State: AC+VfDwmil4a7v/bTRqkjraDzrDZ/qeZ2HhdMcXEoxxMAIWPKT97XLs+ 6z8jbJ75V1wYxH62HAEDOM/npKPj3uhV4mMWwus= X-Received: by 2002:a05:6a00:1a12:b0:64f:aea5:7b49 with SMTP id g18-20020a056a001a1200b0064faea57b49mr776628pfv.17.1685996154261; Mon, 05 Jun 2023 13:15:54 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:3f85:a600:6a3e:e465]) by smtp.gmail.com with ESMTPSA id f18-20020aa78b12000000b0064d32771fa8sm5552924pfd.134.2023.06.05.13.15.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jun 2023 13:15:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 04/52] tcg/sparc64: Remove TARGET_LONG_BITS, TCG_TYPE_TL Date: Mon, 5 Jun 2023 13:15:00 -0700 Message-Id: <20230605201548.1596865-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230605201548.1596865-1-richard.henderson@linaro.org> References: <20230605201548.1596865-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::435; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x435.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 replaced with TCGContext.addr_type. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- tcg/sparc64/tcg-target.c.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tcg/sparc64/tcg-target.c.inc b/tcg/sparc64/tcg-target.c.inc index d2d0f604c2..48efd83817 100644 --- a/tcg/sparc64/tcg-target.c.inc +++ b/tcg/sparc64/tcg-target.c.inc @@ -1027,6 +1027,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext *s, HostAddress *h, TCGReg addr_reg, MemOpIdx oi, bool is_ld) { + TCGType addr_type = s->addr_type; TCGLabelQemuLdst *ldst = NULL; MemOp opc = get_memop(oi); MemOp s_bits = opc & MO_SIZE; @@ -1063,7 +1064,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext *s, HostAddress *h, tcg_out_arith(s, TCG_REG_T1, TCG_REG_T1, TCG_REG_T3, ARITH_ADD); /* Load the tlb comparator and the addend. */ - tcg_out_ld(s, TCG_TYPE_TL, TCG_REG_T2, TCG_REG_T1, cmp_off); + tcg_out_ld(s, addr_type, TCG_REG_T2, TCG_REG_T1, cmp_off); tcg_out_ld(s, TCG_TYPE_PTR, TCG_REG_T1, TCG_REG_T1, add_off); h->base = TCG_REG_T1; @@ -1084,7 +1085,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext *s, HostAddress *h, ldst->label_ptr[0] = s->code_ptr; /* bne,pn %[xi]cc, label0 */ - cc = TARGET_LONG_BITS == 64 ? BPCC_XCC : BPCC_ICC; + cc = addr_type == TCG_TYPE_I32 ? BPCC_ICC : BPCC_XCC; tcg_out_bpcc0(s, COND_NE, BPCC_PN | cc, 0); #else /* @@ -1110,7 +1111,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext *s, HostAddress *h, #endif /* If the guest address must be zero-extended, do in the delay slot. */ - if (TARGET_LONG_BITS == 32) { + if (addr_type == TCG_TYPE_I32) { tcg_out_ext32u(s, TCG_REG_T2, addr_reg); h->index = TCG_REG_T2; } else {