From patchwork Wed May 3 07:22:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 678767 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a41:0:0:0:0:0 with SMTP id v1csp915392wrs; Wed, 3 May 2023 00:45:11 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ64/13AbdahLL8nmKGT6vzYg25+PvymsndUwaDz6/SyJgdBkiDenDaqm/OlpQFoSX5P+APM X-Received: by 2002:a05:6214:230e:b0:5e8:3496:e641 with SMTP id gc14-20020a056214230e00b005e83496e641mr8778705qvb.13.1683099911302; Wed, 03 May 2023 00:45:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683099911; cv=none; d=google.com; s=arc-20160816; b=qH1VsU9Rwc5sndHLAGW3yrRDmxd4qw/vvv9kwwkyKjuqd+rEBQO9fcnch37pnoh+P6 ddoovWYozvrSr0F6xpCl8jVPaluyxT+8o+IBQgih4kOdKPtFivMZM9V+rVYDbYcemhsf nB3MIqNc8OTWLVfkKryyG3qoyzgMPdHa9Vwms2rMMnGYRBnkv6Oc8NhZaDqeiXHliNVb 7RmHApSjUNYJl4gRvC6xtADTs8CxjZsCvSeWWvfQIPz8aPJU5qf+Yv6bpL5P8/JjplHT 3d4ZO56DoA115oC2FmiIEk1jX2oRp++p/wQDZ/F8lyTMwnhdeuPw/XXtqkcYhtCVFmkS jQBQ== 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=BwjJKRWUw9nEGQx3sCz5f8VYPsSDuPiBiG7E3lZCbFg=; b=hugXv0D+PAm1gqfzMCwdOBMh+/YGRsrUY9xaut7YKJ2EwvdnYQ56/b9T6sp/pUBhSD qVho5UexnLwlmP7izUsB1aIYEQu0cfFyQPLRfbRNB1WKxfa0+vZZXpNICDCrIUV1tw8K GuecT5NnU/U7t9Rn0XPIB7LpSjHlx7afKnmBYPNAOQJJ3wCFK6S3Ltk8WK3Iv+qAldj6 dYyTAA8M6+Ds7lysxOJnmA5inf1OlJKHajKmyViJXsS12fJjZLT0moySwMOlzvZJejKG 9rtvGO1jK3xDsrPAtholIrEo9r/VrG/lgLa4vD9ETOl2rqnwzXzSSlIFmhNn2fk4wR/6 9zbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YQbsgfhd; 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 3-20020a05621420a300b005f1683e9be7si18147466qvd.515.2023.05.03.00.45.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 May 2023 00:45:11 -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=YQbsgfhd; 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 1pu6qJ-0002VX-FK; Wed, 03 May 2023 03:24:03 -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 1pu6qF-0002CP-3G for qemu-devel@nongnu.org; Wed, 03 May 2023 03:23:59 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pu6qD-0001ki-22 for qemu-devel@nongnu.org; Wed, 03 May 2023 03:23:58 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3062c1e7df8so2315055f8f.1 for ; Wed, 03 May 2023 00:23:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683098634; x=1685690634; 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=BwjJKRWUw9nEGQx3sCz5f8VYPsSDuPiBiG7E3lZCbFg=; b=YQbsgfhdQXzs6UDhTOK3CrOXp5+8a95qsQ6dEfuWiioXxxAz69HACgGFiShDRaDwcg BjY3l0Yqiqn43Vt7ELFlRSP0ZB/vJotNZ6ogQypyZrnJ427bhI17DvYwHFPEG0PTNjLB h8o/vOFRkW2JBwZ/KlrZufCgFq6mwWF471QPbTRZX2Nf2zl+dYp6w3FECza4CEbP1C5U ZSEGdS79ZfGj2Dnnv8Bo1W6j5S0ksJlD3HhGgssNvK/cnJovRuX/KSoWzfQXnbCDg771 riKCUCJgSxRnN4tP7zXXEbCem2BRyIZ5KuNv3DJQUBrVBmvuW8/ioEtd1g30dkRtjZft Q72w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683098634; x=1685690634; 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=BwjJKRWUw9nEGQx3sCz5f8VYPsSDuPiBiG7E3lZCbFg=; b=O/qwl1dmaGp6qGqwSrQrYC4kCb9uzrdCbJ2Jz8CnC/OeUg1cGTAs9DAQbOWvKNJu8J TAu35VNpSduAsmdSwFGqMlj6NpalqpDljF0qlfoehmX6swQab+8BKqRqhfYad5eF9YuC 6mIzbjEoAMyjtnJUV439zeKPfg+DsqQWlEVQGYEUbpaug3QpZzTF58gBSLEJkUxE4rab 3kDlIEVyAMdE2i1ZXFkFZrHDIpGG0bd1MLJ/N2OLkzk02Qs2JyE0CgiTGpu1auFHT6hc jTrtWpfSkynrvw8Nb46SXRLCQt4uBqk4Hq21WHxxEtZ/aMneFAj5x6Ye942MP36bPSmw eTtA== X-Gm-Message-State: AC+VfDxcTPFE5e7kVK/A06r2U1lg0cioPdZloYzD4xH5qFwVqpJhllM2 gTx6TjpCFgzQW2V6NtlUrvhgg2PlSrWutW+HrOT5og== X-Received: by 2002:adf:edc6:0:b0:2fa:2e64:7d10 with SMTP id v6-20020adfedc6000000b002fa2e647d10mr14002119wro.28.1683098634393; Wed, 03 May 2023 00:23:54 -0700 (PDT) Received: from stoup.Home ([2a02:c7c:74db:8d00:c01d:9d74:b630:9087]) by smtp.gmail.com with ESMTPSA id b14-20020a05600010ce00b0030627f58325sm9586745wrx.25.2023.05.03.00.23.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 May 2023 00:23:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: ale@rev.ng, philmd@linaro.org, marcel.apfelbaum@gmail.com, wangyanan55@huawei.com, anjo@rev.ng Subject: [PATCH 27/84] tcg/s390x: Remove TARGET_LONG_BITS, TCG_TYPE_TL Date: Wed, 3 May 2023 08:22:34 +0100 Message-Id: <20230503072331.1747057-28-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230503072331.1747057-1-richard.henderson@linaro.org> References: <20230503072331.1747057-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=richard.henderson@linaro.org; helo=mail-wr1-x429.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. Signed-off-by: Richard Henderson --- tcg/s390x/tcg-target.c.inc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tcg/s390x/tcg-target.c.inc b/tcg/s390x/tcg-target.c.inc index 000c2f66db..77f7919880 100644 --- a/tcg/s390x/tcg-target.c.inc +++ b/tcg/s390x/tcg-target.c.inc @@ -1747,6 +1747,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 atom_u; @@ -1790,7 +1791,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext *s, HostAddress *h, tgen_andi_risbg(s, TCG_REG_R0, addr_reg, tlb_mask); } else { tcg_out_insn(s, RX, LA, TCG_REG_R0, addr_reg, TCG_REG_NONE, a_off); - tgen_andi(s, TCG_TYPE_TL, TCG_REG_R0, tlb_mask); + tgen_andi(s, addr_type, TCG_REG_R0, tlb_mask); } if (is_ld) { @@ -1798,7 +1799,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext *s, HostAddress *h, } else { ofs = offsetof(CPUTLBEntry, addr_write); } - if (TARGET_LONG_BITS == 32) { + if (addr_type == TCG_TYPE_I32) { tcg_out_insn(s, RX, C, TCG_REG_R0, TCG_TMP0, TCG_REG_NONE, ofs); } else { tcg_out_insn(s, RXY, CG, TCG_REG_R0, TCG_TMP0, TCG_REG_NONE, ofs); @@ -1811,7 +1812,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext *s, HostAddress *h, tcg_out_insn(s, RXY, LG, h->index, TCG_TMP0, TCG_REG_NONE, offsetof(CPUTLBEntry, addend)); - if (TARGET_LONG_BITS == 32) { + if (addr_type == TCG_TYPE_I32) { tcg_out_insn(s, RRE, ALGFR, h->index, addr_reg); h->base = TCG_REG_NONE; } else { @@ -1834,7 +1835,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext *s, HostAddress *h, } h->base = addr_reg; - if (TARGET_LONG_BITS == 32) { + if (addr_type == TCG_TYPE_I32) { tcg_out_ext32u(s, TCG_TMP0, addr_reg); h->base = TCG_TMP0; }