From patchwork Sun Jan 7 13:22:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helge Deller X-Patchwork-Id: 13512885 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 B6C5AC47073 for ; Sun, 7 Jan 2024 13:23:54 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMT7E-0006Ji-Fb; Sun, 07 Jan 2024 08:23:00 -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 1rMT78-0006G7-6Z for qemu-devel@nongnu.org; Sun, 07 Jan 2024 08:22:54 -0500 Received: from dfw.source.kernel.org ([139.178.84.217]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rMT76-0003KT-Pl for qemu-devel@nongnu.org; Sun, 07 Jan 2024 08:22:53 -0500 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id D8A8460B62; Sun, 7 Jan 2024 13:22:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 06557C433C9; Sun, 7 Jan 2024 13:22:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1704633771; bh=LY0zkxpueP44pcToUrKPByeb2NHmWUmMfllbYguP8jw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bW7iOgiHonoAI6KBvlwS/LfoyNSK7CzWUsjUMiuOJAiqubG35vUKSsvLzw3nKxvaT ZYF6kNI83nKCbM9jlx6DSsDMXlCXvhsn1I1YilkNVfhYiCAtECTsiyElzm4ztLl1WD 7hx9dwb9YV6SccTDjatrIzoH31kMxyMqcMox+s1IhnBXnSMiLt1AtaXJtVKD20pMtS S2KQM2sDokyIhddyiHX2PEm4jHXVu6qvSZZ4MImna/LT855honAlSIFQuWjSVKtqFf tvZ9nABDeDjf9jmCzDFgDXVBhY4OIc3+5VEiWoaSRqKQw+cpGj1Ia/17lMpn62Uu1q Aj4+TfbSlR+HA== From: deller@kernel.org To: qemu-devel@nongnu.org Cc: Richard Henderson , Michael Tokarev , Bruno Haible , "Nelson H . F . Beebe" , Helge Deller Subject: [PATCH v2 5/9] target/hppa: Strip upper 32-bits of IOR on error in probe Date: Sun, 7 Jan 2024 14:22:33 +0100 Message-ID: <20240107132237.50553-6-deller@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240107132237.50553-1-deller@kernel.org> References: <20240107132237.50553-1-deller@kernel.org> MIME-Version: 1.0 Received-SPF: pass client-ip=139.178.84.217; envelope-from=deller@kernel.org; helo=dfw.source.kernel.org X-Spam_score_int: -91 X-Spam_score: -9.2 X-Spam_bar: --------- X-Spam_report: (-9.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.098, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_HI=-5, 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/op_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/hppa/op_helper.c b/target/hppa/op_helper.c index 7f607c3afd..60c9014242 100644 --- a/target/hppa/op_helper.c +++ b/target/hppa/op_helper.c @@ -353,7 +353,7 @@ target_ulong HELPER(probe)(CPUHPPAState *env, target_ulong addr, if (excp >= 0) { 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; } if (excp == EXCP_DTLB_MISS) {