From nobody Tue Feb 10 07:23:10 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=1620847157; cv=none; d=zohomail.com; s=zohoarc; b=P+xbVhUBs5JgFhu07FjpDQ940IvlZy/+aOLQWoG8icmTWH8V49CETJq/uGsckG/VmFAQeBFcEm2xTuCMKodA7CWRvAVWWoKyynMEghYP1S9kNX7AQQmf788Xb+QR894+KqpRDyCvcM9ipNHEozXJzGVPBBgC375kjel13Nh/Se8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620847157; 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=SZb+Xk1qPVPJprQExRYcdC9MxsG2PaUsTs0OynM8KwY=; b=WmH1ogeNUYFW4FxO+/Mx1PNzubEFMdNnJpg6qQDeSD+osW7BnHVtr1Obpxe25vNF0xr27ZOLqThtAFqvmqo5puucdee1yiL8L4W4DUdkvzIbgj7PFmri7uwIJr3DEcCxLIO+wKgjCR4roYlxK+6Igt2vACgQ8T7V2tlnJ2SJarg= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 1620847157630968.8874816464897; Wed, 12 May 2021 12:19:17 -0700 (PDT) Received: from localhost ([::1]:43822 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lguO1-0006qh-I8 for importer@patchew.org; Wed, 12 May 2021 15:19:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53542) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgu2a-0006Vq-ML; Wed, 12 May 2021 14:57:04 -0400 Received: from [201.28.113.2] (port=20812 helo=outlook.eldorado.org.br) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgu2Z-0007uU-4q; Wed, 12 May 2021 14:57:04 -0400 Received: from power9a ([10.10.71.235]) by outlook.eldorado.org.br with Microsoft SMTPSVC(8.5.9600.16384); Wed, 12 May 2021 15:56:03 -0300 Received: from eldorado.org.br (unknown [10.10.70.45]) by power9a (Postfix) with ESMTP id 35F7F80139F; Wed, 12 May 2021 15:56:03 -0300 (-03) From: matheus.ferst@eldorado.org.br To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Subject: [PATCH v4 13/31] target/ppc: Remove DisasContext.exception Date: Wed, 12 May 2021 15:54:23 -0300 Message-Id: <20210512185441.3619828-14-matheus.ferst@eldorado.org.br> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210512185441.3619828-1-matheus.ferst@eldorado.org.br> References: <20210512185441.3619828-1-matheus.ferst@eldorado.org.br> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-OriginalArrivalTime: 12 May 2021 18:56:03.0562 (UTC) FILETIME=[74F8E4A0:01D74760] X-Host-Lookup-Failed: Reverse DNS lookup failed for 201.28.113.2 (failed) 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=201.28.113.2; envelope-from=matheus.ferst@eldorado.org.br; helo=outlook.eldorado.org.br X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, RDNS_NONE=0.793, SPF_HELO_NONE=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, f4bug@amsat.org, luis.pires@eldorado.org.br, lagarcia@br.ibm.com, bruno.larsen@eldorado.org.br, matheus.ferst@eldorado.org.br, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" 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 --- v4: - Remove the field. - Changes applied to gen_scv on rebase. --- 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 43320d2b8b..606897fa75 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -156,7 +156,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; @@ -258,15 +257,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 @@ -278,13 +274,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 @@ -297,7 +290,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 @@ -4996,13 +4988,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 @@ -9196,7 +9185,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; @@ -9303,16 +9291,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.25.1