From patchwork Mon Jan 8 14:37:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helge Deller X-Patchwork-Id: 13513563 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 DA71DC3DA6E for ; Mon, 8 Jan 2024 14:39:35 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMqlr-0006Xc-Hy; Mon, 08 Jan 2024 09:38:31 -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 1rMqle-0006Sl-3t for qemu-devel@nongnu.org; Mon, 08 Jan 2024 09:38:20 -0500 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rMqlb-0007in-TQ for qemu-devel@nongnu.org; Mon, 08 Jan 2024 09:38:17 -0500 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 96DB961057; Mon, 8 Jan 2024 14:38:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A4857C433C8; Mon, 8 Jan 2024 14:38:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1704724692; bh=HlpONBE5xmYT5SPvJFAtSC7CZESRyr5y7DVv3L+OrJw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bL11xnrPFGsCw4ywRr5OkLq5EISebjuvWJyGZ8uMfgxTio5TILvtWuj55P/46e3cv /DRoFMfyBFgEaFMmmawcQ+m1N80c5okBC6JZ+TIwIa8mOciqjeEFiOoZGF093dudQB ZbOMORwYR55rgQb70jU3HsH4u6DkYQdG/UVV/KG5sbZvGx7nxQwt3VEDg/Nkb5M9Xb 9aDVESTLo4YXhxz856uDBpT+jlhO62hVWXbnlGWuxHnFEdw0NfYZS1gk5qjN+85Oyp GzYBXvkeUsiyYuoCRRZBykyp6kWJMM4KTCF0jMl1lV5R97tRZ2behgPMtEIzLjwOLi 9csYLEiDJaX+Q== From: deller@kernel.org To: qemu-devel@nongnu.org Cc: Helge Deller Subject: [PULL 6/9] target/hppa: Strip upper 32-bits of IOR on unaligned access error Date: Mon, 8 Jan 2024 15:37:59 +0100 Message-ID: <20240108143802.50256-7-deller@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240108143802.50256-1-deller@kernel.org> References: <20240108143802.50256-1-deller@kernel.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2604:1380:4641:c500::1; envelope-from=deller@kernel.org; helo=dfw.source.kernel.org X-Spam_score_int: -66 X-Spam_score: -6.7 X-Spam_bar: ------ X-Spam_report: (-6.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.243, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Helge Deller Limit IOR to the lower 32-bits on failure. Keep patch short for easier backporting. Signed-off-by: Helge Deller --- target/hppa/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c index 04de1689d7..3c384d5855 100644 --- a/target/hppa/cpu.c +++ b/target/hppa/cpu.c @@ -112,7 +112,7 @@ void hppa_cpu_do_unaligned_access(CPUState *cs, vaddr addr, cs->exception_index = EXCP_UNALIGN; if (env->psw & PSW_Q) { /* ??? Needs tweaking for hppa64. */ - env->cr[CR_IOR] = addr; + env->cr[CR_IOR] = (uint32_t)addr; env->cr[CR_ISR] = addr >> 32; }