From nobody Mon Feb 9 20:12:35 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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 ARC-Seal: i=1; a=rsa-sha256; t=1621430139; cv=none; d=zohomail.com; s=zohoarc; b=YDE0aAls0HRYp3h9Ke/V7ri2gKOILJm2UIt4zsMlFG9jbECGISDH0RJLvDAtmT626Fd6eqMkI9TBn1Mg3y+FQQrEX7+WZKWeV3BKhEOQSLIhLVdUYBBQE4ml4D8AaUJgry3SilNWjq77Eb3fnZHYfFeCyGHXhoR+imaYM2GoqYY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621430139; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1FujlOZS4EJO1qV1ycs/X+5gnn9os9bROuqqLEQllhQ=; b=ViK4tBmxKnZOkM0v5PiE5yQSU/RcNiMSiKcrjeDCBpv9pYGgDZk+boLy467fE961PTXX3Jts478yfiJlngE6+t3n1vHsrCmza8lhDUXPt9EkgaNMUKJRYZeuujqCrONKtydFoxMVCpQ33KUTk47O59KcHtGe00Tp2cf6P/Edug4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1621430139140219.95767792263848; Wed, 19 May 2021 06:15:39 -0700 (PDT) Received: from localhost ([::1]:37544 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljM30-0004jY-Ao for importer@patchew.org; Wed, 19 May 2021 09:15:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33370) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljLgz-0001JP-NI; Wed, 19 May 2021 08:52:56 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:36237) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljLgx-0001KJ-1N; Wed, 19 May 2021 08:52:53 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 4FlXnk0b1fz9t25; Wed, 19 May 2021 22:52:09 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1621428730; bh=X+Y5b5/xIZsPnjiDvYYY3iKVgaD26GtrNAB6EytgFyA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PdpcuvMozvJFSzwLTsDLc17b8kAi9ydiQ9uLCyMgELRyx0mhKTXUNJ5LXWq7IFWAt r7rDRdpD40MmeIhlXlLimmow2r5zK6SLimtDsCAZVzbZuwtzKmBZ0zCcIHHUGZrQaC FURCEO7MFHkYsptdtZOMxnjkG+vWKjadsmPCOn+c= From: David Gibson To: peter.maydell@linaro.org, groug@kaod.org Subject: [PULL 28/48] target/ppc: Remove DisasContext.exception Date: Wed, 19 May 2021 22:51:28 +1000 Message-Id: <20210519125148.27720-29-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210519125148.27720-1-david@gibson.dropbear.id.au> References: <20210519125148.27720-1-david@gibson.dropbear.id.au> 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=2401:3900:2:1::2; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.25, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: richard.henderson@linaro.org, David Gibson , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, Matheus Ferst 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: Richard Henderson Now that we have removed all of the fake exceptions, and all real exceptions exit via DISAS_NORETURN, we can remove this field. Signed-off-by: Richard Henderson Signed-off-by: Matheus Ferst Message-Id: <20210517205025.3777947-5-matheus.ferst@eldorado.org.br> Signed-off-by: David Gibson --- target/ppc/translate.c | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/target/ppc/translate.c b/target/ppc/translate.c index d019454550..80cd11b3f8 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -159,7 +159,6 @@ struct DisasContext { DisasContextBase base; target_ulong cia; /* current instruction address */ uint32_t opcode; - uint32_t exception; /* Routine used to access memory */ bool pr, hv, dr, le_mode; bool lazy_tlb_flush; @@ -261,15 +260,12 @@ static void gen_exception_err(DisasContext *ctx, uint= 32_t excp, uint32_t error) * These are all synchronous exceptions, we set the PC back to the * faulting instruction */ - if (ctx->exception =3D=3D POWERPC_EXCP_NONE) { - gen_update_nip(ctx, ctx->cia); - } + gen_update_nip(ctx, ctx->cia); t0 =3D tcg_const_i32(excp); t1 =3D tcg_const_i32(error); gen_helper_raise_exception_err(cpu_env, t0, t1); tcg_temp_free_i32(t0); tcg_temp_free_i32(t1); - ctx->exception =3D excp; ctx->base.is_jmp =3D DISAS_NORETURN; } =20 @@ -281,13 +277,10 @@ static void gen_exception(DisasContext *ctx, uint32_t= excp) * These are all synchronous exceptions, we set the PC back to the * faulting instruction */ - if (ctx->exception =3D=3D POWERPC_EXCP_NONE) { - gen_update_nip(ctx, ctx->cia); - } + gen_update_nip(ctx, ctx->cia); t0 =3D tcg_const_i32(excp); gen_helper_raise_exception(cpu_env, t0); tcg_temp_free_i32(t0); - ctx->exception =3D excp; ctx->base.is_jmp =3D DISAS_NORETURN; } =20 @@ -300,7 +293,6 @@ static void gen_exception_nip(DisasContext *ctx, uint32= _t excp, t0 =3D tcg_const_i32(excp); gen_helper_raise_exception(cpu_env, t0); tcg_temp_free_i32(t0); - ctx->exception =3D excp; ctx->base.is_jmp =3D DISAS_NORETURN; } =20 @@ -4993,13 +4985,10 @@ static void gen_scv(DisasContext *ctx) uint32_t lev =3D (ctx->opcode >> 5) & 0x7F; =20 /* Set the PC back to the faulting instruction. */ - if (ctx->exception =3D=3D POWERPC_EXCP_NONE) { - gen_update_nip(ctx, ctx->cia); - } + gen_update_nip(ctx, ctx->cia); gen_helper_scv(cpu_env, tcg_constant_i32(lev)); =20 - /* This need not be exact, just not POWERPC_EXCP_NONE */ - ctx->exception =3D POWERPC_SYSCALL_VECTORED; + ctx->base.is_jmp =3D DISAS_NORETURN; } #endif #endif @@ -9005,7 +8994,6 @@ static void ppc_tr_init_disas_context(DisasContextBas= e *dcbase, CPUState *cs) uint32_t hflags =3D ctx->base.tb->flags; int bound; =20 - ctx->exception =3D POWERPC_EXCP_NONE; ctx->spr_cb =3D env->spr_cb; ctx->pr =3D (hflags >> HFLAGS_PR) & 1; ctx->mem_idx =3D (hflags >> HFLAGS_DMMU_IDX) & 7; @@ -9112,16 +9100,6 @@ static void ppc_tr_translate_insn(DisasContextBase *= dcbase, CPUState *cs) "temporaries\n", opc1(ctx->opcode), opc2(ctx->opcode), opc3(ctx->opcode), opc4(ctx->opcode), ctx->opcode); } - - if (ctx->base.is_jmp =3D=3D DISAS_NEXT) { - switch (ctx->exception) { - case POWERPC_EXCP_NONE: - break; - default: - /* Every other ctx->exception should have set NORETURN. */ - g_assert_not_reached(); - } - } } =20 static void ppc_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs) --=20 2.31.1