From patchwork Wed May 19 12:51:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 442405 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp1307018jac; Wed, 19 May 2021 06:11:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJximCjZbe5wWKKglL/SCidM8nTXpQaZaUNsoJaS4WVnlHly9nl4ZrsIACgmmAwSvn/Olvs8 X-Received: by 2002:a05:6e02:2188:: with SMTP id j8mr10946382ila.194.1621429864640; Wed, 19 May 2021 06:11:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621429864; cv=none; d=google.com; s=arc-20160816; b=kFABddL4BLD+vJKz9z4VS+q4IzTe5LAQVS9ZI2Jyuf9xDpVEFNxMoNDvjCWGJdJKfL 3Ur+vRMzr44KvPhxuyFxkVVSauayWLjyCGgPFVh4waq9cZapJlJypTt04zg1SW0OL6rK BibyFAQKnyXE8QQfF6xwali1fdwaBlOwn0kLZy4qw4k4tgQmQwOpFmv6agTCj3EidXrd DTtDhDh+MpwHzVHSPS/iISM+aDvoMSI16GcZVkw0etnyHha6SyCNG6QpDo2qrRr2EBq8 3hYojPqbo0zZLE3objeAUEWMl4BDVxtzUVVZrnol1Et3IR6t0CVCTUfZ+DgBrH/xpNhR +D+A== 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 :dkim-signature; bh=FhD9xH+eaSb1eTiC/gEyyq2TNL7/3+S16TaU8thVlmU=; b=qrI6vbjY7EJsnc1u9JAA1jOXvNn5LOr+cSGnbHY6wOVSDbhvQjBCZiPZwON35NDJvk 3fzQsJDCW4uPDH1X8IinhFaWrdBsryqmpnu6THHSmUwfONm8FoN0N24ANXNcE8M4SW/q fLpjERH4QLyajK1S+GrLM5NGSauv73SPMYyItNhxlWFWuzKPtEMzxsjE1yBz5cAsxFdL 8z8df8eKIuWMXIvEEQNFMO27NH0GTxqdKCpw3fNEljCq8/0USc9WJaXueNgVZ3YdeYnC N9JSjSFYXTP4pQmzDSG28ewE4iiAX42A1AZdgpq7fPLJoz357ZVTgrVRxzSgx4EUU0pu c4vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gibson.dropbear.id.au header.s=201602 header.b=FBXDgAb5; 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 t1si24956008jap.32.2021.05.19.06.11.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 May 2021 06:11:04 -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; dkim=fail header.i=@gibson.dropbear.id.au header.s=201602 header.b=FBXDgAb5; 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]:51250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljLya-0003Sw-04 for patch@linaro.org; Wed, 19 May 2021 09:11:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33298) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljLgu-0000yr-R9; Wed, 19 May 2021 08:52:48 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:58367 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljLgn-0001GV-Qr; Wed, 19 May 2021 08:52:48 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 4FlXng1mDBz9t0p; Wed, 19 May 2021 22:52:07 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1621428727; bh=Xdw8XgkaWEWnfimzMa+ytAFrW3h36v/oUVgJ6xgTHHs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FBXDgAb5mt+BhlLZdDVYfjZ23aEvbiyFgkUmcXN2FwagZZI/J6v27Tu6zIKuo/E3l dO9QzhCMujJAq9I+icQlF7ZfyH7joDshZWDMqQbcjGopslEcgQlrEVLFraTKTjBHx/ DdpqgQSQfRp668q8sCA2Lg2LBVne2uzG/arNyRqw= From: David Gibson To: peter.maydell@linaro.org, groug@kaod.org Subject: [PULL 21/48] target/ppc: Simplify gen_debug_exception Date: Wed, 19 May 2021 22:51:21 +1000 Message-Id: <20210519125148.27720-22-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 Received-SPF: pass client-ip=203.11.71.1; 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+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 Message-Id: <20210512185441.3619828-7-matheus.ferst@eldorado.org.br> Signed-off-by: David Gibson --- target/ppc/translate.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) -- 2.31.1 diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 9626bea9d5..5590a93ad5 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -329,19 +329,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; } @@ -9186,6 +9174,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