From patchwork Tue May 16 19:40:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 682355 Delivered-To: patch@linaro.org Received: by 2002:a05:6504:558:b0:22d:db33:bb6d with SMTP id w24csp638614ltp; Tue, 16 May 2023 12:42:31 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7gObtqV0wugbrsQ1ybpCEER3BHYrRbShWTSZQRoOr89eQYmq5f2OJDAGkPwYyoo94cvzHZ X-Received: by 2002:ad4:5f4a:0:b0:5ef:8c79:fe98 with SMTP id p10-20020ad45f4a000000b005ef8c79fe98mr65604776qvg.8.1684266151196; Tue, 16 May 2023 12:42:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684266151; cv=none; d=google.com; s=arc-20160816; b=SYsUh9z6/wqAQbIpOy+SIhO0EDN3S3EQo8dEKDmnoSeKhcGFjRav+ZOegfQ4Uh/5sl p12n1odteaxKlYYhjalCrWGTqdIfTSbBXqW93fUc4/fAbZzYBEoqLHy5wOX4fC8eAwTk EcZ7xsIsMVCwHpm3NM5QwVAgC25ijJHoap9Lhv+sjSEjnt67RmN+tnJpiPkJttksvxXk Mbo7pH1stLY2JLFEQjJw64bTvhGszpKLwvXic0IZwVSszzBeGCuKn9APxi7uk7FmYjLK xcLT8r1B9DeaBDXHqUPwy4Qgu8YHvPEJmWg2haQjwRaqzicUCd1UuZOmi8N1+C4x5gSN 2HAw== 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:to:from :dkim-signature; bh=miBGGjW/ZQfOCs7U5dTa3vNRbLi2IQsdXFfT88TdwaM=; b=xAzONs/66r0FNenqkmknJ99uhU9jUzO8jPtPE0OAgNInYYcwjCEjFREvCDOG6SY3Ff CW8tnN7SY5a60V+5ZfgIHT9Yu9xcHd7hzi/kvQgec5kvT+nRkY0g8R2k2M9bdfYuso0F yo4oMwSxanZTxh6okAcwxepiV5x5X0dbnXoTu3FxnazVSeYN/Mn68Pe2/Du0FoHvmVIY GwlTjGTniT4olJ6XzPZMHTnMpkqTytktN8kcB/mz4b+N2qEf/7pJvHR2T70cHMkHXfTa W6cIfVtn+ZrGMGcU7GvOKhACaWk+t9SN0ZzOMzoVhGBW4vHic79i0EYnO5k/o3JvNBqS G2LQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=o2I0qmSJ; 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 j26-20020a05620a147a00b006fcaae20037si177502qkl.741.2023.05.16.12.42.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 May 2023 12:42:31 -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=o2I0qmSJ; 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 1pz0YU-0006YV-TV; Tue, 16 May 2023 15:41:54 -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 1pz0YT-0006Y7-91 for qemu-devel@nongnu.org; Tue, 16 May 2023 15:41:53 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0: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 1pz0YQ-0002j7-Go for qemu-devel@nongnu.org; Tue, 16 May 2023 15:41:53 -0400 Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-64389a44895so11562438b3a.1 for ; Tue, 16 May 2023 12:41:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684266108; x=1686858108; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=miBGGjW/ZQfOCs7U5dTa3vNRbLi2IQsdXFfT88TdwaM=; b=o2I0qmSJlPWgILo6l5yrAlzCq+d2joADAau5WLC/Rgn1+koI9CjC8aPrI9WtiuQMOR 8oJ477/L6DY4oHU9V/5IVsKDIcDMa4heQWQLNodlHouoYFSI+jmHor8DHpwm8Gf+wuAy C/kDW/5EgMa/d0xq5LwwxBOfBgCHPJmaP8DYUuuD6Bp2M0j2ZE/zowbsMT+DeqOnZrnr ovdtJZ8G7F4zIoDGM9Nnj8Xi573xB8d7IhwTqaY8ZTXs9qtyBrCEyjP05eHjCQV1KfV8 mr3ui3QE9uWfmsdSI7P22tkcktdOVMYkGEYIEcgsV430kOg1Fa+4Kkz0NILqLmkI3/AS LH1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684266108; x=1686858108; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=miBGGjW/ZQfOCs7U5dTa3vNRbLi2IQsdXFfT88TdwaM=; b=AvDN9oKwJs2Hq0citO3zJIN1/jZ/2THLcaP7idlk6ReJPXD37gdBq0SRidP0kMQytc i5Veo3uXbtFOxJmT25bogFDNu4rHJYHXXUU+ugFJ7CZRr2UF1xG3A8x0IFwN5ahPQGBU jDJ1U+eEFBnT/adNW8SmkndsRuf9dE3v6+wNMqV0q3dotwdCIt+nn4TB4QbWiOIy3fhp ouCLGTAb1ZqnngQ5iSYMTbUjtE20V5cIw37t4b4LKvxXFf39hOXfSnwloWDwyXuh3ntL s0MzxXYeewC1oHr5CrIC4slHs/z//8WTMysH3spHwRLBIyQfpbVRY/jPRiLgY1Kdjmtl eLvw== X-Gm-Message-State: AC+VfDzmXTyDKS5wda12lBFOs9uKNYzryyyKgiqXFXFWkifqvsFtaDbI mPS+2IQOiuEJhPMVzAEOnkiRoBNCNcm8DNHvL1o= X-Received: by 2002:a05:6a00:2303:b0:64c:ae1c:337f with SMTP id h3-20020a056a00230300b0064cae1c337fmr8508034pfh.12.1684266107833; Tue, 16 May 2023 12:41:47 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:ec81:440e:33a4:40b9]) by smtp.gmail.com with ESMTPSA id z21-20020aa791d5000000b006260526cf0csm13771165pfa.116.2023.05.16.12.41.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 12:41:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 01/80] tcg/i386: Set P_REXW in tcg_out_addi_ptr Date: Tue, 16 May 2023 12:40:26 -0700 Message-Id: <20230516194145.1749305-2-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::429; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-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 The REXW bit must be set to produce a 64-bit pointer result; the bit is disabled in 32-bit mode, so we can do this unconditionally. Fixes: 7d9e1ee424b0 ("tcg/i386: Adjust assert in tcg_out_addi_ptr") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1592 Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1642 Signed-off-by: Richard Henderson --- tcg/i386/tcg-target.c.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcg/i386/tcg-target.c.inc b/tcg/i386/tcg-target.c.inc index a01bfad773..9fc5592f5d 100644 --- a/tcg/i386/tcg-target.c.inc +++ b/tcg/i386/tcg-target.c.inc @@ -1091,7 +1091,7 @@ static void tcg_out_addi_ptr(TCGContext *s, TCGReg rd, TCGReg rs, { /* This function is only used for passing structs by reference. */ tcg_debug_assert(imm == (int32_t)imm); - tcg_out_modrm_offset(s, OPC_LEA, rd, rs, imm); + tcg_out_modrm_offset(s, OPC_LEA | P_REXW, rd, rs, imm); } static inline void tcg_out_pushi(TCGContext *s, tcg_target_long val)