From nobody Sun Nov 9 16:21:51 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551156954394782.1636153423345; Mon, 25 Feb 2019 20:55:54 -0800 (PST) Received: from localhost ([127.0.0.1]:48765 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyUmU-0005zL-GQ for importer@patchew.org; Mon, 25 Feb 2019 23:55:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57406) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyUkE-0004So-4s for qemu-devel@nongnu.org; Mon, 25 Feb 2019 23:53:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyUk0-0000h8-83 for qemu-devel@nongnu.org; Mon, 25 Feb 2019 23:53:19 -0500 Received: from ozlabs.org ([203.11.71.1]:36551) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gyUjx-0000aA-UK; Mon, 25 Feb 2019 23:53:15 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 447mfF1Bm0z9s4V; Tue, 26 Feb 2019 15:53:08 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1551156789; bh=PAEWUibGny+uK5KPMLUF95eSyVKpxDlzUy3xdbbQQpM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ggcHGdDMw0MSkqUt6ZKHyr2RvonhUwzEsJYGLU4ySx0iLotigS+g96Lm8FdbjGO9u PfXk4nfL8OgQy1gT66gyN5oMTOr04umRSNYFGtd7YcmdWQzCV+KWLYU8C3ieeaVT+c aNrIAUAGt2YGNoeGZp/r+bSWrK7JsonpcZVO3O94= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 26 Feb 2019 15:52:15 +1100 Message-Id: <20190226045304.25618-2-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190226045304.25618-1-david@gibson.dropbear.id.au> References: <20190226045304.25618-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 203.11.71.1 Subject: [Qemu-devel] [PULL 01/50] target/ppc: Fix nip on power management instructions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, gkurz@kaod.org, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, clg@kaod.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Benjamin Herrenschmidt Those instructions currently raise an exception from within the helper. This tends to result in a bogus nip value in the env context (typically the beginning of the TB). Such a helper needs a gen_update_nip() first. This fixes it with a different approach which is to throw the exception from translate.c instead of the helper using gen_exception_nip() which does the right thing. Exception EXCP_HLT is also used instead of POWERPC_EXCP_STOP to effectively exit from the CPU execution loop. Signed-off-by: Benjamin Herrenschmidt [clg : modified the commit log to comment the use of EXCP_HLT instead of POWERPC_EXCP_STOP] Signed-off-by: C=C3=A9dric Le Goater Message-Id: <20190215161648.9600-2-clg@kaod.org> Signed-off-by: David Gibson --- target/ppc/excp_helper.c | 1 - target/ppc/translate.c | 12 ++++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index 751d759fcc..8407e0ade9 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -958,7 +958,6 @@ void helper_pminsn(CPUPPCState *env, powerpc_pm_insn_t = insn) * but this doesn't seem to be a problem. */ env->msr |=3D (1ull << MSR_EE); - raise_exception(env, EXCP_HLT); } #endif /* defined(TARGET_PPC64) */ =20 diff --git a/target/ppc/translate.c b/target/ppc/translate.c index f4d70e725a..bffdbd9687 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -3566,7 +3566,8 @@ static void gen_doze(DisasContext *ctx) t =3D tcg_const_i32(PPC_PM_DOZE); gen_helper_pminsn(cpu_env, t); tcg_temp_free_i32(t); - gen_stop_exception(ctx); + /* Stop translation, as the CPU is supposed to sleep from now */ + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); #endif /* defined(CONFIG_USER_ONLY) */ } =20 @@ -3581,7 +3582,8 @@ static void gen_nap(DisasContext *ctx) t =3D tcg_const_i32(PPC_PM_NAP); gen_helper_pminsn(cpu_env, t); tcg_temp_free_i32(t); - gen_stop_exception(ctx); + /* Stop translation, as the CPU is supposed to sleep from now */ + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); #endif /* defined(CONFIG_USER_ONLY) */ } =20 @@ -3601,7 +3603,8 @@ static void gen_sleep(DisasContext *ctx) t =3D tcg_const_i32(PPC_PM_SLEEP); gen_helper_pminsn(cpu_env, t); tcg_temp_free_i32(t); - gen_stop_exception(ctx); + /* Stop translation, as the CPU is supposed to sleep from now */ + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); #endif /* defined(CONFIG_USER_ONLY) */ } =20 @@ -3616,7 +3619,8 @@ static void gen_rvwinkle(DisasContext *ctx) t =3D tcg_const_i32(PPC_PM_RVWINKLE); gen_helper_pminsn(cpu_env, t); tcg_temp_free_i32(t); - gen_stop_exception(ctx); + /* Stop translation, as the CPU is supposed to sleep from now */ + gen_exception_nip(ctx, EXCP_HLT, ctx->base.pc_next); #endif /* defined(CONFIG_USER_ONLY) */ } #endif /* #if defined(TARGET_PPC64) */ --=20 2.20.1