From nobody Sat Sep 21 07:21:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1705125518; cv=none; d=zohomail.com; s=zohoarc; b=jCMTH7LXJniYHx/3QsTxCxFkS7JBdCiC0V8qLqno2890z1Xq3gKNT2QsgyxuTJtWD2oe0imaIUWU65S3DoaS8f3odwodw/5MBf9S0RPmmW1jNPr3j1GXt/dg1NH9TsmDp/7O4znvk5D0yP12NLbSHGyVepnSo26Yw5JxrMgF5VI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705125518; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=drEcd0qHVhuPqv5DmF5jbju/espFmT4TyGxckhZ6kmU=; b=Gx53CrsifacZ3AIKuUYqyBJXCBnYoFWX3jOs3fT9Djgq2ANUce6URIc0WIxPr3+ihC6/JGjz6HMijWu9twSkymraDTOn1ZyjiZkr7vELQhhFEABjXiOydbXeUfL2TaUJcYjfIqnYDDF04W88LccQUjHg0D2GdEiqQlFtE0nejso= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1705125518391853.9549371909934; Fri, 12 Jan 2024 21:58:38 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rOX1i-0007R7-Q0; Sat, 13 Jan 2024 00:57:50 -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 1rOX1g-0007Qd-UU for qemu-devel@nongnu.org; Sat, 13 Jan 2024 00:57:48 -0500 Received: from sin.source.kernel.org ([145.40.73.55]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rOX1f-00084p-6F for qemu-devel@nongnu.org; Sat, 13 Jan 2024 00:57:48 -0500 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id F0DFACE1DBF; Sat, 13 Jan 2024 05:57:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 42421C433C7; Sat, 13 Jan 2024 05:57:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705125463; bh=yzm3CMifRY3radrXwAH5GaBfEDdVB95MfErfKwEwvpM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fTpaQoKDj6pnxL8+gdeV22tGc/ROuaimsWvYqKWh/F/eq9WJEwwdpJ1KYWbyieeAB mCQLUcrr/cR1hC7pSDPxHH9LnSXGG/YIWm9WSZhxa/79qYLW8zGu8q+kQ5wTnrc+nR 0Qp0T0lOLvxzlrPpHmnFe0437CYawFAltJ8IUWKRPFrDVjMIgYwc0WL5cRgCwsbNbL LaHONkQcLpfkhRBojop3TMxxn+BHlexKy5gM7DDOw7Dn0QYRIXDIb8vN1aPDeYkviz 9FWGzYpfMbyIQ+4ziPiabYaDoED6eY3wZ8Xk8pA3H1Jke6AFvxAtrdIYnwKJfE/amk Y+jwMaC5ySNyw== From: deller@kernel.org To: qemu-devel@nongnu.org Cc: Helge Deller , Richard Henderson Subject: [PULL 07/10] target/hppa: Export function hppa_set_ior_and_isr() Date: Sat, 13 Jan 2024 06:57:25 +0100 Message-ID: <20240113055729.4480-8-deller@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240113055729.4480-1-deller@kernel.org> References: <20240113055729.4480-1-deller@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=145.40.73.55; envelope-from=deller@kernel.org; helo=sin.source.kernel.org X-Spam_score_int: -64 X-Spam_score: -6.5 X-Spam_bar: ------ X-Spam_report: (-6.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.09, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1705125520324100003 Content-Type: text/plain; charset="utf-8" From: Helge Deller Move functionality to set IOR and ISR on fault into own function. This will be used by follow-up patches. Signed-off-by: Helge Deller Reviewed-by: Richard Henderson --- target/hppa/cpu.h | 1 + target/hppa/mem_helper.c | 23 ++++++++++++----------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index 8be45c69c9..9556e95fab 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -385,6 +385,7 @@ void hppa_cpu_dump_state(CPUState *cs, FILE *f, int); #ifndef CONFIG_USER_ONLY void hppa_ptlbe(CPUHPPAState *env); hwaddr hppa_cpu_get_phys_page_debug(CPUState *cs, vaddr addr); +void hppa_set_ior_and_isr(CPUHPPAState *env, vaddr addr, bool mmu_disabled= ); bool hppa_cpu_tlb_fill(CPUState *cs, vaddr address, int size, MMUAccessType access_type, int mmu_idx, bool probe, uintptr_t retaddr); diff --git a/target/hppa/mem_helper.c b/target/hppa/mem_helper.c index 1387f4a64b..4fcc612754 100644 --- a/target/hppa/mem_helper.c +++ b/target/hppa/mem_helper.c @@ -305,14 +305,8 @@ hwaddr hppa_cpu_get_phys_page_debug(CPUState *cs, vadd= r addr) return excp =3D=3D EXCP_DTLB_MISS ? -1 : phys; } =20 -G_NORETURN static void -raise_exception_with_ior(CPUHPPAState *env, int excp, uintptr_t retaddr, - vaddr addr, bool mmu_disabled) +void hppa_set_ior_and_isr(CPUHPPAState *env, vaddr addr, bool mmu_disabled) { - CPUState *cs =3D env_cpu(env); - - cs->exception_index =3D excp; - if (env->psw & PSW_Q) { /* * For pa1.x, the offset and space never overlap, and so we @@ -339,16 +333,23 @@ raise_exception_with_ior(CPUHPPAState *env, int excp,= uintptr_t retaddr, */ uint64_t b; =20 - cpu_restore_state(cs, retaddr); - b =3D env->unwind_breg ? env->gr[env->unwind_breg] : 0; b >>=3D (env->psw & PSW_W ? 62 : 30); env->cr[CR_IOR] |=3D b << 62; - - cpu_loop_exit(cs); } } } +} + +G_NORETURN static void +raise_exception_with_ior(CPUHPPAState *env, int excp, uintptr_t retaddr, + vaddr addr, bool mmu_disabled) +{ + CPUState *cs =3D env_cpu(env); + + cs->exception_index =3D excp; + hppa_set_ior_and_isr(env, addr, mmu_disabled); + cpu_loop_exit_restore(cs, retaddr); } =20 --=20 2.43.0