From patchwork Mon Jun 21 01:34:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 464485 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2118256jao; Sun, 20 Jun 2021 18:48:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzlYFQht9r1iPchRAVZaUzLGliu/gLDDZQrW3A5zvbgWjsY/VsgmqDBK60QAu/R8e6uDaBa X-Received: by 2002:a02:9f12:: with SMTP id z18mr15230678jal.54.1624240133751; Sun, 20 Jun 2021 18:48:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624240133; cv=none; d=google.com; s=arc-20160816; b=vsF3WfUyEtRc4c00+TMUwykvsgF0QnPPtT4+DPzN+Giag2kq+71y/4e++4z/y34+Fs mhqn83Gike/HQ7uIQCqJlQS2FeuSW14S7xfeIzqFzx6FDH4MZ+4AU15bCRRvHsTZq7/L 05VzkGtWvRjiBR7Y18RD3QWsgIqYwcqRN4jMhAOZunubjxKmBqqdfxcuUkvk9M0QnxTf WfkAoqdkG4ILpSLc/UzVZzzSw76f+u2szSHBdLUhJkfmsWR03uNEDeIAu08/xbnAWLDV d6j4gXgB2ZX3WR0+aizpGbf2eneAJePONQTyr8zWKgTpTubOU7qfTFlaeUqzaw2P35OX 6BdA== 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=zAnCrHtff6jPTMINAA/XQ8amtOalFE7ZmPKzxH7D+ug=; b=KbjK1P5/SdvcO/UBp9Bk9R0oLK75uhQedZZe5z65XhvpAyykczk7+SaoPqxdlSj1Z5 pq+KaMxnDr5YoodfL/lpsNmXUQBVNciy0O9KT/0DRVE+IV29X9ZajyyXQgUyuYb0GvjK ISWCKkNWW3RSeqNAoxHN2ntvTDZIR7JmU/t0u1j4keQJTNaVWFM86F6jV7TEFRvc8/N7 pxVAVss4r1UoGm12JUgkPZYeZvOu+Lmq3Y6w3Td1hKcqj2TxyFg16NMB7R8LATJ/lkXo m2FUyLIvrXaVXirh7R4efV4B9a6z+udmUMes+9Jlbl2oRWOAvs7mDwxrpE4WYlbewGvi LNNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DQX6H5NH; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b6si9502777ile.24.2021.06.20.18.48.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Jun 2021 18:48:53 -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=pass header.i=@linaro.org header.s=google header.b=DQX6H5NH; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lv93V-00009w-7l for patch@linaro.org; Sun, 20 Jun 2021 21:48:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40064) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lv8qC-00041R-Ch for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:08 -0400 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]:42580) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lv8pw-0005Cz-5G for qemu-devel@nongnu.org; Sun, 20 Jun 2021 21:35:07 -0400 Received: by mail-pf1-x42c.google.com with SMTP id y4so5415847pfi.9 for ; Sun, 20 Jun 2021 18:34:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zAnCrHtff6jPTMINAA/XQ8amtOalFE7ZmPKzxH7D+ug=; b=DQX6H5NH4cdN8kyse3Yo0cyN0dcwF7TEuK4vsiLjL46JHZkD6OuwtGEq1qnMQDeZGW SFvRGpZdgc44acLwZMrkVlUBQG4+nA8dFo76b/GmPqcm16xqbf2ihM+m8ZUqEuaQURGP 0FPCme85EE6jeq9gpndi990EUydGqkK+ZXGu6WIfbGfAi/XQeaNQbo5isBDCGqFSzanL l9K8fxV+35mGlTfuU3FQDDmpidSDFyEc6KBUY8KL6db3v/MbsEaSmoMyITJp6lGIKUKR 6xIJFW4Jf30+b+Y9HdVGpmuYtEmTnwq4l9kT7h9oe/WjPb0jsMDhfhrq+f+856dYEsL2 wXdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zAnCrHtff6jPTMINAA/XQ8amtOalFE7ZmPKzxH7D+ug=; b=mTxznlGGOyLCCPpPhr5Wzb+YJs8TVeZwFW0x2+FQgznj+GyY0WQB/OLat6a+LDXTBF cxs2ToehLPP6a6HcP/YbTyvI2QVy6NnBy959ZZ9mJFRJOtf7onPyTqQKt9gNHMBQIIzU rDtNeoDqnuj6zB9JC1LRNJKlx9DsivsMQHSmgGLQDmyeHBcb4CHJSQXNpkJJRbZAHqco b47mg84lf48B7+wjHUsBCrW0MC40SgCREMgW7GrZGndVHiVH4DpHac9FoS2rV2oQgGVk qXaIc5BB93okEIgRb144hVlzmu/j+L5C7Pfb5VY/KL6TsDcxOAqcJNGsqs6skexZRkSc /fTQ== X-Gm-Message-State: AOAM531uG9wLeT1nvSFszdDfYm3jTetlub/19AhtZY06XYVU5AuwTITO Eg41CvN47P1YwpRW0/c4PUm2KYqNW8BkqA== X-Received: by 2002:a62:9203:0:b029:2f1:e21a:c545 with SMTP id o3-20020a6292030000b02902f1e21ac545mr16815929pfd.60.1624239290347; Sun, 20 Jun 2021 18:34:50 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id s27sm1495628pfg.169.2021.06.20.18.34.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Jun 2021 18:34:50 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 16/26] target/openrisc: Use translator_use_goto_tb Date: Sun, 20 Jun 2021 18:34:29 -0700 Message-Id: <20210621013439.1791385-17-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210621013439.1791385-1-richard.henderson@linaro.org> References: <20210621013439.1791385-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42c; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: Stafford Horne Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Reorder the cases in openrisc_tr_tb_stop to make this easier to read. Cc: Stafford Horne Signed-off-by: Richard Henderson --- target/openrisc/translate.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) -- 2.25.1 diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index a9c81f8bd5..2d142d8577 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -1720,16 +1720,17 @@ static void openrisc_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs) /* fallthru */ case DISAS_TOO_MANY: - if (unlikely(dc->base.singlestep_enabled)) { - tcg_gen_movi_tl(cpu_pc, jmp_dest); - gen_exception(dc, EXCP_DEBUG); - } else if ((dc->base.pc_first ^ jmp_dest) & TARGET_PAGE_MASK) { - tcg_gen_movi_tl(cpu_pc, jmp_dest); - tcg_gen_lookup_and_goto_ptr(); - } else { + if (translator_use_goto_tb(&dc->base, jmp_dest)) { tcg_gen_goto_tb(0); tcg_gen_movi_tl(cpu_pc, jmp_dest); tcg_gen_exit_tb(dc->base.tb, 0); + break; + } + tcg_gen_movi_tl(cpu_pc, jmp_dest); + if (unlikely(dc->base.singlestep_enabled)) { + gen_exception(dc, EXCP_DEBUG); + } else { + tcg_gen_lookup_and_goto_ptr(); } break;