From patchwork Tue May 16 19:41:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 682430 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp21483wrt; Tue, 16 May 2023 13:00:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7IEuU75D4KUSyGQLhv0TkMEVkjesDvlnDqncKzcOSi+iYy/gx3j0n8eUZKGsG9aiB+ebvI X-Received: by 2002:a5d:674f:0:b0:309:3698:8011 with SMTP id l15-20020a5d674f000000b0030936988011mr2065806wrw.57.1684267233241; Tue, 16 May 2023 13:00:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684267233; cv=none; d=google.com; s=arc-20160816; b=tj2Oy4vkT2SkBwxA1TBIreAYhXILU6ZIrwGA7xQyQduEE3ZMMVtznjJlXPsKSLMJtM 9e3rt75+/4LnsVq/KTUxFKQh5GzP6U+4UlNHv1IGMxA/pMyms62WVgQC7ylIYnhV1Qyn 4LatewgjMdAahFLppG/r0f4zKHPcG29BrOeqvOeKWqLyvIj2UFBxZza+lGqEAjBZUItd wUvaVIyAT9hWFzYlo8g2gU/fmwmFyuBY/UTd1wD2wgbUFoQD4VSSS3K15mQ7W1GwM27l n5fbXqQmtAG2oVE4+afZRNEWCTAgBcUiW84O2BlMGTXIfKa7YiLk2rLME+7DE/lyR0N0 Xsqg== 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=8gd23/Zs47HSFuLNvqC9U/DMCSd+WEyq0LmTxbksagg=; b=gG/uW3tCDOMZCKPvhyRW6RSzWY+okiz+/n7kbI+UyJ3M6cfVACDtUeUkRz4kgcULvf 5627fh6u/JZ/xo2Gwp08ym25eCkXYmtJosov3RXsrAkFoTyaxBpkK12o4fpibyOKGgS9 j95OusoGnd9j7dU3Z07M3YU1iLOqItd/8AYmhQO9exu5x7FZ5WwYWXRt9bwvZmAOF7IC ohPpap3e4rgrDN+mjYe7oW+VUikCYg125/ztgPzmmR7549EB3hRqWM4scSrkIVcMYjRq 6JUC96hAgHKahOlmkqkomf9sSjmgzK7xIyuzLi51/NiQTzwdHwQVggh0rgBwnpWAKjJK vkKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=F2Wlvsb1; 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 y1-20020adffa41000000b00306443884ccsi259504wrr.438.2023.05.16.13.00.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 May 2023 13:00:33 -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=F2Wlvsb1; 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 1pz0eP-0002nh-97; Tue, 16 May 2023 15:48:01 -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 1pz0cM-0000SW-9V for qemu-devel@nongnu.org; Tue, 16 May 2023 15:45:54 -0400 Received: from mail-pg1-x529.google.com ([2607:f8b0:4864:20::529]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pz0cJ-0003n5-GM for qemu-devel@nongnu.org; Tue, 16 May 2023 15:45:53 -0400 Received: by mail-pg1-x529.google.com with SMTP id 41be03b00d2f7-53033a0b473so7584050a12.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=1684266349; x=1686858349; 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=8gd23/Zs47HSFuLNvqC9U/DMCSd+WEyq0LmTxbksagg=; b=F2Wlvsb1w8oRpkyCeogTBk4vdxj7xiWr/UpmWDUOLe5PIKSF/VWeeQHt7bmafQgbeC zJtRCcX2abZnSzVYYOT16QP6pi4LMbRl9l87OEa+4XB9rAnpkkZlsYWnKArw1BcaL9dz J3tVdKBCHdr3Axhin4D8uRomoHIXNIRVL/PuhHVDRVNkGMXVynve5oj8oNJj8BA5V0nD 0mB33nWRpTE/DmCeKZtbUZ/MZDmslH5lttat5b0k/ETwhDr0xWiFyM7v9JawrYl8HFmt P+nDtqAaPkQeTd5XYl7kxngetUe2a4xBuZV6YwRhmYJyWhhV/4feJ2QBF9RcGQL4hCvv SMGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684266349; x=1686858349; 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=8gd23/Zs47HSFuLNvqC9U/DMCSd+WEyq0LmTxbksagg=; b=Cxagq7eh938SdvAwgUXBVj9j8m/KIn4SuoWfBKZ45lvsAjWvae16noXOXrissONZge IxuQc4tHuXxZ969XWO21E6QvND83i3naacSsCRoLIQ5xF7DpLwerRhDpqclfFrXOopFC OVL8WQZAdTlNjnJHFhfZgszQulNVlh5BUIYB5Sjcy9voRGavl+estiYQnkupUIY34P7f VFU7uvQ24dVCQtEgUdaiBtWf+sxbkqfKBM/+EWMLgxZT9FkAMdeHeh8pqPAwd41I9wpa SDgbzPS2motvj5jjp6kfpI4FQlEsmG0YmD8N5wrpYDv2Pk7+fMFWw3R/Ic5+OhyJ3WMU l3Gg== X-Gm-Message-State: AC+VfDygBSQp83BHmwn/J/x8WAvkJnKjotr7oh0JMU/s7gCFA76kK1Au /JqcNwmfsgV2kT06+XLAh7X8zU5r0k9UxN/sxyg= X-Received: by 2002:a17:90a:8d16:b0:250:faff:e201 with SMTP id c22-20020a17090a8d1600b00250faffe201mr22140072pjo.36.1684266349357; Tue, 16 May 2023 12:45:49 -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.48 (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 71/80] tcg/i386: Remove TARGET_LONG_BITS, TCG_TYPE_TL Date: Tue, 16 May 2023 12:41:36 -0700 Message-Id: <20230516194145.1749305-72-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::529; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x529.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. Add a field into TCGLabelQemuLdst to record the usage. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- tcg/i386/tcg-target.c.inc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tcg/i386/tcg-target.c.inc b/tcg/i386/tcg-target.c.inc index 653e3e10a8..e173853dc4 100644 --- a/tcg/i386/tcg-target.c.inc +++ b/tcg/i386/tcg-target.c.inc @@ -1975,10 +1975,8 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext *s, HostAddress *h, ldst->addrhi_reg = addrhi; if (TCG_TARGET_REG_BITS == 64) { - if (TARGET_LONG_BITS == 64) { - ttype = TCG_TYPE_I64; - trexw = P_REXW; - } + ttype = s->addr_type; + trexw = (ttype == TCG_TYPE_I32 ? 0 : P_REXW); if (TCG_TYPE_PTR == TCG_TYPE_I64) { hrexw = P_REXW; if (TARGET_PAGE_BITS + CPU_TLB_DYN_MAX_BITS > 32) { @@ -2023,7 +2021,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext *s, HostAddress *h, ldst->label_ptr[0] = s->code_ptr; s->code_ptr += 4; - if (TARGET_LONG_BITS > TCG_TARGET_REG_BITS) { + if (TCG_TARGET_REG_BITS == 32 && s->addr_type == TCG_TYPE_I64) { /* cmp 4(TCG_REG_L0), addrhi */ tcg_out_modrm_offset(s, OPC_CMP_GvEv, addrhi, TCG_REG_L0, cmp_ofs + 4);