From patchwork Wed May 12 18:54:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matheus K. Ferst" X-Patchwork-Id: 435640 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp5108424jao; Wed, 12 May 2021 12:11:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyqaMQNnO3yYoyvBXsBT1jnfE8Zr97oG22wN+DEyQ+qf5N03Cz/hMlEEnnCofc81MOj3VmS X-Received: by 2002:aca:380a:: with SMTP id f10mr8767136oia.157.1620846693247; Wed, 12 May 2021 12:11:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620846693; cv=none; d=google.com; s=arc-20160816; b=o2ZSXKDEQurldddbWq2+wdVx3F3mo/0Xc9CHP6eiieNXw6x3koiARBUR9F4OGKpWr6 qDLOYZ96crGAjBDY8xI/DfSwfyiyUIf9gFX2s9b2xDODv+yB0ZKwU+ZqHx2lnEMTXt+5 kOTd3gVNpP28scP4toGOhiED11bMPGuv/XcwdwXLwYE30hDga3O3IKW7tI/pRLH+pUPk BnAkY/9ax40wDA46DR3onyfxSvcsHAaDq7Ih17LSnF4ShoQUUANfKHIPOkfMCIE1TjdW DNIkS8K+uo9T85O5jTMsLINQG1ZVBJ6XWj3H1gwuIk9/r28+5CcfsrIUxTKDzPjiiCXe uYyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from; bh=JbzXbo/OXrvV6r2qLgfR2laTBNclks3+hgNyPTRUki8=; b=ZfKJdwzBtGe8RjUorDWio9f1nM+FC4U0a+Kihri2NDhYP0UC2SpHOub89p2bfC5yXS tbe332sEo7H8OGFjaiSZpzhYodbWDCsGhlJJezotlg26WGwB4jCv3APPXwJ5Y0xDk6cR SWgU6SPYrh+ymtlNyXRpNOlCmFyRg6lFmJVvyJ77KdSrCViGWySmjcfe0gF9qXmjleJ9 84tIgN0zjzNlJbhVAKG+S2qOWe0zwtU7pJhAyEub4gYQKiIsyrK5WD36Tw9us5Gwp7Ub +ykdaEnN86cskOTxSZNdQhMgFGmY1JWyF73XMQIYVa4Y0UVK3SicqFrfOQ7LNy4b/v+s acZQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r20si739101otq.189.2021.05.12.12.11.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 12 May 2021 12:11:33 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:55532 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lguGa-0003tD-Iw for patch@linaro.org; Wed, 12 May 2021 15:11:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53316) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgu1v-0005iu-Sk; Wed, 12 May 2021 14:56:23 -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 1lgu1u-0007uU-Dc; Wed, 12 May 2021 14:56:23 -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:01 -0300 Received: from eldorado.org.br (unknown [10.10.70.45]) by power9a (Postfix) with ESMTP id D7D468000C2; Wed, 12 May 2021 15:56:00 -0300 (-03) From: matheus.ferst@eldorado.org.br To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Subject: [PATCH v4 06/31] target/ppc: Simplify gen_debug_exception Date: Wed, 12 May 2021 15:54:16 -0300 Message-Id: <20210512185441.3619828-7-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 X-OriginalArrivalTime: 12 May 2021 18:56:01.0234 (UTC) FILETIME=[7395AB20:01D74760] X-Host-Lookup-Failed: Reverse DNS lookup failed for 201.28.113.2 (failed) 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Two of the call sites that use gen_debug_exception have already updated NIP. Only ppc_tr_breakpoint_check requires the update. Signed-off-by: Richard Henderson Signed-off-by: Matheus Ferst --- target/ppc/translate.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) -- 2.25.1 diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 23de04a08e..7b23f85c11 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -326,19 +326,7 @@ static uint32_t gen_prep_dbgex(DisasContext *ctx) static void gen_debug_exception(DisasContext *ctx) { - TCGv_i32 t0; - - /* - * These are all synchronous exceptions, we set the PC back to the - * faulting instruction - */ - if ((ctx->exception != POWERPC_EXCP_BRANCH) && - (ctx->exception != POWERPC_EXCP_SYNC)) { - gen_update_nip(ctx, ctx->base.pc_next); - } - t0 = tcg_const_i32(EXCP_DEBUG); - gen_helper_raise_exception(cpu_env, t0); - tcg_temp_free_i32(t0); + gen_helper_raise_exception(cpu_env, tcg_constant_i32(EXCP_DEBUG)); ctx->base.is_jmp = DISAS_NORETURN; } @@ -9377,6 +9365,7 @@ static bool ppc_tr_breakpoint_check(DisasContextBase *dcbase, CPUState *cs, { DisasContext *ctx = container_of(dcbase, DisasContext, base); + gen_update_nip(ctx, ctx->base.pc_next); gen_debug_exception(ctx); /* * The address covered by the breakpoint must be included in