From patchwork Tue Jan 23 10:24:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 765195 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:10c4:b0:337:62d3:c6d5 with SMTP id b4csp1528814wrx; Tue, 23 Jan 2024 02:25:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IFQM0nlHcUwH9fVXuECar9muKCc7ZWS8nnPVMD3ZCZn3gOKHyFK77BiglC/9/FYei4pbVrH X-Received: by 2002:a05:622a:1793:b0:42a:4a09:7d06 with SMTP id s19-20020a05622a179300b0042a4a097d06mr557179qtk.49.1706005556753; Tue, 23 Jan 2024 02:25:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706005556; cv=none; d=google.com; s=arc-20160816; b=Y98jBDeYG6Hf3j894ku0XnObGMPFscC8Wl51i9RlB7fXljBsbuP/+8pCR0TK7t9ike C2I2jVABQcV/ot3TAdrOlf0FBDELeBxq9mtdViA9ySeQbCcM9ZmSHfBKFXtYOJDTH81f qkzQIpKewkXnRsx8gNryuj9tsoH6+Fx5YAPjOTlyzGA7Iu1K1iMCb7NtF+0QMJ8w+zKG BOR9SfU7g3Ippz5vuZogtzRQy0KK2wpFLmBh0EqbbBLkCz3CDE0Cy1cNfvC8O58iXM03 KVpHmH4uYgwVKiVfZGKwvn7Zzs6fP6w56a5v3YuhTJjMA2ra2fziUFmwbfOLre6vaW9N 6+WQ== 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=oG4pU7qednB+jbhj9CwzPfU2NfzR3Eb/S1PuscRboM8=; fh=x5cujyMlswmEiiRyw3vKxb5h2JmORJET6hWLdk8ya5M=; b=ptHEezgftj/gmnEp6DlQzeED1yojXtmLgxNwjDTXZGkwqhIlDZeiW1RNXst/ycNA7m 7QNyGFYBCzgILfA2DdkdRoQJ3dfeWNmgUc/YcEJlE6odPVn1AlCJXn2ynQWMBwqTbZD5 Yxz7PEUCM5oHzDoZzOaUbpYSNspEot67FYQn693AEMWCBlJr6SJWRSx7IJ/A6rGfXPKI gKUTI/+m1BhfsNSsuIu3bFBdUOmSvaDNAZY3oIgf1isASyYpxNOL36PoqiU3WB2asyfI VmUmbekc2lDkksJqMYV4Ly5lcUVvXazNuqdSXoQ2WuTFyG029gcCQdiNV4bC7wlDyKaN SB8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sw6mEeSY; 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 k5-20020ac85fc5000000b00429d470ea36si7600008qta.592.2024.01.23.02.25.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jan 2024 02:25:56 -0800 (PST) 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=sw6mEeSY; 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 1rSDxT-0000RB-Tj; Tue, 23 Jan 2024 05:24:43 -0500 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 1rSDxS-0000Qh-Hu for qemu-devel@nongnu.org; Tue, 23 Jan 2024 05:24:42 -0500 Received: from mail-oo1-xc2d.google.com ([2607:f8b0:4864:20::c2d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rSDxQ-0004e0-VV for qemu-devel@nongnu.org; Tue, 23 Jan 2024 05:24:42 -0500 Received: by mail-oo1-xc2d.google.com with SMTP id 006d021491bc7-599a95e3fceso114238eaf.1 for ; Tue, 23 Jan 2024 02:24:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706005480; x=1706610280; darn=nongnu.org; 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=oG4pU7qednB+jbhj9CwzPfU2NfzR3Eb/S1PuscRboM8=; b=sw6mEeSYC48IuXb4k4Iz2grHSEw+Qg0n+eNpF1ZaQ6FBVRuC4XiuPhWjHjILiYyvOd k8L8Fxauht/wJb088Y2YRyn55u/qd/ESFRzwb60Pxzo0fxrtxud8p/NySgdiJSIjoZQG bsp9A40LWdemoeagXg2zKqMvEugkOCDxRg9aKDNqoaZPEcHb8MJAH65Mx6CYT5p/+hlG sMZWu+ch0UU5wQXZsH/Ccwe5gVSytqUm18XN/x9Onx9XP9DyH5+n4OHDdiWiVGp85lc3 Bf94IcdKFxHBn3d2hbEH80ryd1rf/kJi6A5x6ks8/cJmm2Jlb/FRJMe/rifotlvO/ojR AGwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706005480; x=1706610280; 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=oG4pU7qednB+jbhj9CwzPfU2NfzR3Eb/S1PuscRboM8=; b=BzewXAK2j2PjnMyzH32/rzvnVIkKM/EkBGpkhPQqjMPCSRfxVH3KFK0Gee0gvbbYID x4bY3S3IlXWsz1Ul3LcXpl4jIc6MosqmRfb0c5bAUB3pVyKSUelSsSMGO7xtTv8OTG2L t7MxNaWdj40ahMn2bLBdUjSVBnXFF5OJRhHfdykx7AgXe/7wWfa4XJE88Sq6DXzXnota Shg7OpFrxazfLESm7705lQME9ODm4e/v/CF/fX3OihHjiDhNzHJniF+JfBCje3ZVA8vV eYBdSXCzkDbF3ZsBqfFdCwjKP12/ddM7aYt2yVc3gM/CS89i1Gl8+3wxg+jOyzOvXPXA IVzw== X-Gm-Message-State: AOJu0YwgPppI3EzDVJklOX7QV8DDXua3pL+U3D2nPIp99boTgUcsGBmT HiiKIln9ZVHvHkOJ+H+yJmhnawijK4QqYlvEOLaANnpqkRFFOYWgf5IYX/mnNStA9ii+M3AkrwI idUw= X-Received: by 2002:a05:6358:d044:b0:175:b71f:6178 with SMTP id jb4-20020a056358d04400b00175b71f6178mr4543150rwb.32.1706005479827; Tue, 23 Jan 2024 02:24:39 -0800 (PST) Received: from stoup.lan (2001-44b8-2176-c800-b8a0-0408-58be-7d2e.static.ipv6.internode.on.net. [2001:44b8:2176:c800:b8a0:408:58be:7d2e]) by smtp.gmail.com with ESMTPSA id d8-20020a62f808000000b006d9ce7d3258sm11072408pfh.204.2024.01.23.02.24.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jan 2024 02:24:39 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Joseph Burt Subject: [PULL v2 8/8] tcg/arm: Fix SIGILL in tcg_out_qemu_st_direct Date: Tue, 23 Jan 2024 20:24:12 +1000 Message-Id: <20240123102412.4569-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240123102412.4569-1-richard.henderson@linaro.org> References: <20240123102412.4569-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::c2d; envelope-from=richard.henderson@linaro.org; helo=mail-oo1-xc2d.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 From: Joseph Burt When tcg_out_qemu_st_{index,direct} were merged, the direct case for MO_64 was omitted, causing qemu_st_i64 to be encoded as 0xffffffff due to underflow when adding h.base and h.index. Fixes: 1df6d611bdc2 ("tcg/arm: Introduce HostAddress") Signed-off-by: Joseph Burt Message-Id: <20240121211439.100829-1-caseorum@gmail.com> Reviewed-by: Richard Henderson Signed-off-by: Richard Henderson --- tcg/arm/tcg-target.c.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tcg/arm/tcg-target.c.inc b/tcg/arm/tcg-target.c.inc index fc78566494..a9aa8aa91c 100644 --- a/tcg/arm/tcg-target.c.inc +++ b/tcg/arm/tcg-target.c.inc @@ -1662,6 +1662,9 @@ static void tcg_out_qemu_st_direct(TCGContext *s, MemOp opc, TCGReg datalo, } else { tcg_out_strd_r(s, h.cond, datalo, h.base, h.index); } + } else if (h.index < 0) { + tcg_out_st32_12(s, h.cond, datalo, h.base, 0); + tcg_out_st32_12(s, h.cond, datahi, h.base, 4); } else if (h.index_scratch) { tcg_out_st32_rwb(s, h.cond, datalo, h.index, h.base); tcg_out_st32_12(s, h.cond, datahi, h.index, 4);