From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6A5A1C47422 for ; Sun, 21 Jan 2024 21:34:39 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rRfRx-0005vz-04; Sun, 21 Jan 2024 16:33:53 -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 1rRfAM-0003nP-89; Sun, 21 Jan 2024 16:15:42 -0500 Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rRfAK-0001lp-Jy; Sun, 21 Jan 2024 16:15:42 -0500 Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-55783b7b47aso2963152a12.0; Sun, 21 Jan 2024 13:15:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705871737; x=1706476537; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=DclWoef/Xxy5MXxfzCbZwQWBvJ+vWC+KibsxSNkJcvs=; b=LGndrbPOT0XUFHIMJExAbJ/c3yxtzrpU5Ft0aOjk5yHkbPIsETkW/Dg+V9VpRHUFPA zimduB0Z0P73D3MDsspFKgh8MiIbkgad6CvhPvu0xpgqLcdjRJjpN6jl0ohLynjLqAJK BkC1614xS1Xm3J6PufKbDwY6ORx7siTNd4eaAYLKlE8Q7fi5i3CshncUMAy+MQBYzrZi 9ZYcF82lBQ11OQSjVhcNyotbTsbHohQSBLpOgZzC8YZVIscLj8iJXGh+ciD/5QJEEUGH 3oiPZanuRM+08ObNBoQm+he6lfLpnJNOYqNN6qvqzdq2EvTZ9UoTL/aHwENJ2VXmerhz uoAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705871737; x=1706476537; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=DclWoef/Xxy5MXxfzCbZwQWBvJ+vWC+KibsxSNkJcvs=; b=XBk54Gz/lZuo03cU6qEe0JdcAcDuuN5V7x/kz2camKfjagwLRnPfOBudaKQ0P092oD sGUcMxmiBS6MOfHN8R+M3SwBOKTUoo39fsFZQm6lSyHqomc0RlNJEKkkE+DLCQm1QE2B eiTwshbkPMKVjbyus66QM57oP+4/r7lB0ERjIGZn1KB7TK/jaFNvehh8Kth//slxPmbF TTcb4jSmtKc3cr1S+gkVsA4Cc4zoIJ/UU5kTwDX2CuyiRXGSMBiE7svdiX3th1xwLewZ WmFg2WJssBDzOZzvqVg+Mk/r1dsSPDpCDISBNwXXU1IagpplGMJIxWi6GA3E9J+d/q6C k04Q== X-Gm-Message-State: AOJu0YzCf9HObjczb7gNTAlwEfLPD2hx4GDwJDVewKbfZHAN25d+o7gk gprDXJXisIwC92y+rLL0IbNeS2bvfa+71ZsPb85YIH/j+GXpNHb4l3W6hJNY X-Google-Smtp-Source: AGHT+IE3hq9ofqvZl0hVq5EIoGwSvX8fPly1C2lhLBi5h3wLMhVTFRKsmexsVaDllMQFOYpOiNe20Q== X-Received: by 2002:a17:907:3203:b0:a2c:96a1:ba05 with SMTP id xg3-20020a170907320300b00a2c96a1ba05mr2412806ejb.103.1705871737170; Sun, 21 Jan 2024 13:15:37 -0800 (PST) Received: from localhost.. ([77.22.20.148]) by smtp.gmail.com with ESMTPSA id tb21-20020a1709078b9500b00a2f24da8baasm4310351ejc.39.2024.01.21.13.15.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 13:15:36 -0800 (PST) From: Joseph Burt To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , qemu-arm@nongnu.org (open list:ARM TCG target) Subject: [PATCH] tcg/arm: Fix SIGILL in tcg_out_qemu_st_direct Date: Sun, 21 Jan 2024 21:14:39 +0000 Message-ID: <20240121211439.100829-1-caseorum@gmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::52f; envelope-from=caseorum@gmail.com; helo=mail-ed1-x52f.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, FREEMAIL_FROM=0.001, 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-Mailman-Approved-At: Sun, 21 Jan 2024 16:33:51 -0500 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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 --- 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); -- 2.42.0