From patchwork Wed May 19 12:51:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 442400 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp1302478jac; Wed, 19 May 2021 06:06:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyY2hoSa4ZZfq50DSPiiyEfQ3PB2Vfh2LCCO9a34iQVIGSfjHyd150gVCfqMwYZJ1FGeXKC X-Received: by 2002:a05:6e02:caf:: with SMTP id 15mr7981465ilg.3.1621429573064; Wed, 19 May 2021 06:06:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621429573; cv=none; d=google.com; s=arc-20160816; b=0xSyG+TI7p0jzyng5n7T2JSUnzTCweKV/goWaUrEFKH3vzd3c0ikdaxVS5SNiK/QMi tcbRl0cB65ehVgcFoU1dE6uTwGBbEt0yE70BQvxGRMoCv59bMTFAv7Dd3/ByOLWCeiIS UQWe1zJmI0REk5/6Uh6Sfa9dcb0+6oesdnmOoq+hwGPaQK4YNwVaDeMfHvdxlZvPGgyq VvfsybV6mU/LA2qBB5fHZFL+paX729aPw45bmavxCtetZyTg3YGIlDdz75bq02+YWCp/ NvBrOFKRAy/b1fz9q9+IE56Rt0JgrmdfEKnrhkU33QW4wisO1umkNI8E4QoGPAGqDLgy pEwg== 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=CMnPHZUSfTswOX4WBY2MEwWsP5aNeKJMKkwoyOKiI8U=; b=sZVb1884XgevSq0tS4NQyGVITkMQoewTJDrgRyefSwtFU9nfm6AjOYuGY7eKI6LHCS o9PZLwQl19ACNCmeDgaq1XpHIp5t3nGDM8yDLHaEg+F5mPDytHUQ8/WbA4INlCaJvwld wLBZa8Lf9BI/aI505hDqUZZ8GB1jk8CzgjUNJ94QCSym0t72Qk/5r8K7UQENyCsEr4QD V0ErVL8WmLVYbLvClzFTtZfH0vkLgmTgmLepm4HJLUpMKRT9a87uJY2nF46GjUQF5QQy 6gzDnZWa3TRj8qNrF0vEHKc4eahmUxzlabZ5bYpR333xY4fYAuzBAH8sXM/M1lrcQjQ1 zCgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gibson.dropbear.id.au header.s=201602 header.b=KOB2BU41; 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 t15si27348569jal.57.2021.05.19.06.06.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 May 2021 06:06:13 -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=KOB2BU41; 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]:35558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljLts-0001Lf-HV for patch@linaro.org; Wed, 19 May 2021 09:06:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33278) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljLgt-0000tU-FN; Wed, 19 May 2021 08:52:47 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:58767 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 1ljLgl-0001FQ-QH; Wed, 19 May 2021 08:52:42 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 4FlXnf5xcbz9t0k; Wed, 19 May 2021 22:52:06 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1621428726; bh=NBMnjqZ/xpl6gB1P2IE3gJJo99S1X1o/Lz1YdkFZp+A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KOB2BU414rTSgKs191tewlUzz9ZzGVgojwc5LloQYtwT9NpqxUAVL3dAXsW3M1Ik2 u6BLGdKZY+mcIK2fJBtCF0kKyMqDy4RmKajY8EeJit5YNj9LnVR4Zu2JbRIjZXkrLd gZiBq1aGn248dWH5uxkDoUhEOd2vphnuQP5nPGRw= From: David Gibson To: peter.maydell@linaro.org, groug@kaod.org Subject: [PULL 20/48] target/ppc: Remove special case for POWERPC_EXCP_TRAP Date: Wed, 19 May 2021 22:51:20 +1000 Message-Id: <20210519125148.27720-21-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: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, TVD_SUBJ_WIPE_DEBT=1.004 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, qemu-devel@nongnu.org, Luis Pires , qemu-ppc@nongnu.org, Matheus Ferst , David Gibson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Since POWERPC_EXCP_TRAP is raised by gen_exception_err, we will have also set DISAS_NORETURN. Signed-off-by: Richard Henderson Reviewed-by: Luis Pires Signed-off-by: Matheus Ferst Message-Id: <20210512185441.3619828-6-matheus.ferst@eldorado.org.br> Signed-off-by: David Gibson --- target/ppc/translate.c | 1 - 1 file changed, 1 deletion(-) -- 2.31.1 diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 18f581e495..9626bea9d5 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -9225,7 +9225,6 @@ static void ppc_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs) /* Check trace mode exceptions */ if (unlikely(ctx->singlestep_enabled & CPU_SINGLE_STEP && (ctx->base.pc_next <= 0x100 || ctx->base.pc_next > 0xF00) && - ctx->exception != POWERPC_EXCP_TRAP && ctx->exception != POWERPC_EXCP_BRANCH && ctx->base.is_jmp != DISAS_NORETURN)) { uint32_t excp = gen_prep_dbgex(ctx);