From patchwork Mon Apr 10 15:34:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 672037 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:184:0:0:0:0 with SMTP id p4csp316314wrx; Mon, 10 Apr 2023 08:35:38 -0700 (PDT) X-Google-Smtp-Source: AKy350ZoRdLv2+xsIXGB0DD25wj71kDuyKSnyEQKeXik5ardwR2MgJ3ppCZ+KvSSLQDeB4w3chGu X-Received: by 2002:ac8:5c43:0:b0:3e1:59e8:7451 with SMTP id j3-20020ac85c43000000b003e159e87451mr12543819qtj.14.1681140938221; Mon, 10 Apr 2023 08:35:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681140938; cv=none; d=google.com; s=arc-20160816; b=SZe6DWwhIJmWPJOkeHcFTBvNKfBWg/tSd6Rxd3LKOXXCmiy4njW+CyBYVoVw1PoTEJ Pn2zIN3x3c2c7yQbqNfisrT1qdBktNr4xUa3DlAGFuQJK5oqsr6vFEffdEZ2BiIijg/W 6Ls1BBO0zl5z1cInEfY3CP0peYpcvQkTs/hiaaQubdT02pQRs8aVWe8LD+CFE0hWBmHa 7d/qY3qT2OhHDGvmboPrpuxKJN8HDT+vBLwPIvKSt73qFMeJsP712BKtu3KCKi+LzB2B flpYdvtXGm97eKxzOnY+dtUApmwnIpfAdPKGnbMU8uliLii8YHAPNN96o3Q7BVXfgkPf U2EQ== 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=rcNEhGFLchqZMB3huLw45XXaPWISEFJfrSvpuPV2BPc=; b=IvQDoviB1yeS2EDd6J8mhph/9gfv9lfJYYTmCJ1iwx3FDZ3CEaLxxA2y1xbMQ6a5jz 1pz5s+L0AX2fW+8ammLiUSrnPjYfxYUuuz3OSIMykUaM1VZjDAVfkIz32M5tboN2jvYx Q3y6yco3zuctq1v3g/6sSBu/5Z3xaFyNmknZQN5wpbSVYFFHcRc3QexPdk1Hvx+NH4UL V33Y0jcLu6LiCswkfa+EQtdmR2MhLh2XtlyhNyax1xuoUtmCdBtUex/sYCUiDcsu3xzL C6eEaQmF60Rb+BMNhBm6fshf/F6Bk9pWxVR6x49EF7QGftDcl6lT3b2LUUedbp+ul/aT n6+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AyjpoMXi; 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 u16-20020a05620a455000b007468b3dbd63si8106448qkp.729.2023.04.10.08.35.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Apr 2023 08:35:38 -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=AyjpoMXi; 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 1pltXl-0000bW-K8; Mon, 10 Apr 2023 11:34:57 -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 1pltXi-0000UX-Gr for qemu-devel@nongnu.org; Mon, 10 Apr 2023 11:34:54 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pltXg-0000nP-5i for qemu-devel@nongnu.org; Mon, 10 Apr 2023 11:34:54 -0400 Received: by mail-pl1-x62a.google.com with SMTP id ke16so4885857plb.6 for ; Mon, 10 Apr 2023 08:34:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681140890; 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=rcNEhGFLchqZMB3huLw45XXaPWISEFJfrSvpuPV2BPc=; b=AyjpoMXiXPIjRc41wrEmqxI6orJkcCMvzAJEB3j5RxJw1PpqKF5YCb86SHu8dZBsIA mDwPbmSt14OJ7CdRb3AXyyuRRA0m1Q6BRonkP3QS6M6MljZ+IogZu70PDhXgMOjcgTZp +sP+WSBUACNkHx3+XDFi02UOBdJzQsw7fxNOKXNcvFdc7HRE1GiZbNYIikb7aLZw/PuZ 8x4KurMCj1uvQ/9Dl3Um5fjO1IwhXtz27bVjU4RoXmwbW4sXOdo7ypoQqslC29MRlv4t hfjLwr9fYJaDrRZUlq2dZbybzHqNt6lm9yy2Ao4orHuEhrDkwpHf+k8gnndIM0ch6oO/ 5ofg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681140890; 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=rcNEhGFLchqZMB3huLw45XXaPWISEFJfrSvpuPV2BPc=; b=GZXBoe7IQselhmGvgk3iH5l8OAupIaIJMSqjokbz+DMPzHPtHOyJX8PFacakjURrXT cGpv0PsgfJfsc5ISRDRifG9+LELUaVoY3zBrnMhN7lIFvWvgyO404L+/X+19rbmBMkK8 Hu+cwyyLlRlOAxC7glGl3PhXCX3iDXke5pX+eD2RjwI/haRQpeCJS0eMoeqPeimT5qWA MwQLxiu8zHac/uCeyc7LmxUCgHYk/P0VpVOen6BG9LOF3Xv7F9qrWsxNgkikGZdgqcmJ 3FhThB2jgYAm79iIrFAcuTVAgQsD9jLEjLnhx+h7YQvHB/fZwm9MFYNLLGev1j2uFcqe fYcw== X-Gm-Message-State: AAQBX9ehr6OBRCrknMARm16c85+2mZc7pS/Yq+kq1P2oeVa0hWV0jA+C Lm46tg2gfr45v23/ngimurXWSIKMzrXW1suPuAQ= X-Received: by 2002:a17:903:4101:b0:1a5:19bc:d70d with SMTP id r1-20020a170903410100b001a519bcd70dmr8196103pld.38.1681140890674; Mon, 10 Apr 2023 08:34:50 -0700 (PDT) Received: from stoup.. ([2602:ae:1541:f901:2e6b:e4d3:9526:71d6]) by smtp.gmail.com with ESMTPSA id jj6-20020a170903048600b001a64e854553sm534402plb.159.2023.04.10.08.34.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Apr 2023 08:34:50 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org Subject: [PULL 1/3] tcg/i386: Adjust assert in tcg_out_addi_ptr Date: Mon, 10 Apr 2023 08:34:46 -0700 Message-Id: <20230410153448.787498-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230410153448.787498-1-richard.henderson@linaro.org> References: <20230410153448.787498-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62a; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62a.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 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 We can arrive here on _WIN64 because Int128 is passed by reference. Change the assert to check that the immediate is in range, instead of attempting to check the host ABI. Fixes: 6a6d772e30d ("tcg: Introduce tcg_out_addi_ptr") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1581 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 4444eb9234..5a151fe64a 100644 --- a/tcg/i386/tcg-target.c.inc +++ b/tcg/i386/tcg-target.c.inc @@ -1082,7 +1082,7 @@ static void tcg_out_addi_ptr(TCGContext *s, TCGReg rd, TCGReg rs, tcg_target_long imm) { /* This function is only used for passing structs by reference. */ - tcg_debug_assert(TCG_TARGET_REG_BITS == 32); + tcg_debug_assert(imm == (int32_t)imm); tcg_out_modrm_offset(s, OPC_LEA, rd, rs, imm); }