From patchwork Fri Oct 27 16:58:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 831424 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="ijubiLC7"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yNqpV41f8z9t4B for ; Sat, 28 Oct 2017 03:58:58 +1100 (AEDT) Received: from localhost ([::1]:58312 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e87yC-0007mW-M5 for incoming@patchwork.ozlabs.org; Fri, 27 Oct 2017 12:58:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33717) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e87xn-0007ly-A3 for qemu-devel@nongnu.org; Fri, 27 Oct 2017 12:58:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e87xj-0001hY-5w for qemu-devel@nongnu.org; Fri, 27 Oct 2017 12:58:31 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:53722) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e87xi-0001W5-Td for qemu-devel@nongnu.org; Fri, 27 Oct 2017 12:58:27 -0400 Received: by mail-wm0-x244.google.com with SMTP id r196so5028858wmf.2 for ; Fri, 27 Oct 2017 09:58:26 -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; bh=HgQha+/GYr/f3hAw8yVD3Vd8qJUJjgCb4ON+gN2+k5Q=; b=ijubiLC7d75eF6Bgn0MuGI9F//Uy32Ps3gNqBidno27EtSYdwLJ9csMAcSnrhTkwNk 84jaUPqQEwtXUUOs5Jd5MhzCndoEXPMgOW1HMsDnzaRSMvFJDMLgyvjkbqZMET9IuaRs pBUR7gFm028KlGky2qR9U43eK2L9W1kgidSt4= 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; bh=HgQha+/GYr/f3hAw8yVD3Vd8qJUJjgCb4ON+gN2+k5Q=; b=eRe1wGXQNoAXP9qX2aMkcxvTQeVKEA5d2ZLYqqDuyeV883fvPr+y/JnDYCcTPbU0cV VRoeHLlSafWdIvkDC9kg5bu3wgLUQim/80jOVDwh70/SAaUqlHZqenuLZB9sVnOCHDrY 4QeLsg/WI7J2uLxnmlVDKeXA+qXnbdtX1hKc/pIkJmvUz7IiFq3FjD762KZcIp9fOtcp W8B57PY522/aoUzFta4m2QZiJXDvwfakklrYokCqDXXeZSNC0QFX88sRM5nEZrS2xdRE VPnxu4SoLTN4KQNX/fbEEzARwSJDW1RvCUw6qsIBlOxczVZLeRCGbjvqBmHh9njdRIjG E8fw== X-Gm-Message-State: AMCzsaXA1wtOOKQB4J1IVQ26U9xs2M0eWPct6x53g7PY3jxxXFXlUnGF WP9tb+StOItjiCrwGBujs5kDhyAI/7o= X-Google-Smtp-Source: ABhQp+RkvGAY55DT4fb/gSXgKbi9QaIEFt4C7Vwx9JBboUZ5Aa8dWjwpohXKKTLGPjVQmhuzoasWdw== X-Received: by 10.28.214.134 with SMTP id n128mr1042042wmg.59.1509123505098; Fri, 27 Oct 2017 09:58:25 -0700 (PDT) Received: from cloudburst.twiddle.net ([88.208.109.142]) by smtp.gmail.com with ESMTPSA id v35sm5588510wrc.13.2017.10.27.09.58.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Oct 2017 09:58:24 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 27 Oct 2017 18:58:14 +0200 Message-Id: <20171027165814.29122-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.6 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [PATCH v2] target/ppc: Use tcg_gen_lookup_and_goto_ptr X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , qemu-ppc@nongnu.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Signed-off-by: Richard Henderson Reviewed-by: Daniel Henrique Barboza --- Rebased and updated for changes to tcg_gen_lookup_and_goto_ptr. --- target/ppc/translate.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 998fbed848..4075fc8589 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -3419,7 +3419,7 @@ static inline bool use_goto_tb(DisasContext *ctx, target_ulong dest) } /*** Branch ***/ -static inline void gen_goto_tb(DisasContext *ctx, int n, target_ulong dest) +static void gen_goto_tb(DisasContext *ctx, int n, target_ulong dest) { if (NARROW_MODE(ctx)) { dest = (uint32_t) dest; @@ -3441,7 +3441,7 @@ static inline void gen_goto_tb(DisasContext *ctx, int n, target_ulong dest) gen_debug_exception(ctx); } } - tcg_gen_exit_tb(0); + tcg_gen_lookup_and_goto_ptr(); } } @@ -3479,7 +3479,7 @@ static void gen_b(DisasContext *ctx) #define BCOND_CTR 2 #define BCOND_TAR 3 -static inline void gen_bcond(DisasContext *ctx, int type) +static void gen_bcond(DisasContext *ctx, int type) { uint32_t bo = BO(ctx->opcode); TCGLabel *l1; @@ -3543,26 +3543,19 @@ static inline void gen_bcond(DisasContext *ctx, int type) } else { gen_goto_tb(ctx, 0, li); } - if ((bo & 0x14) != 0x14) { - gen_set_label(l1); - gen_goto_tb(ctx, 1, ctx->nip); - } } else { if (NARROW_MODE(ctx)) { tcg_gen_andi_tl(cpu_nip, target, (uint32_t)~3); } else { tcg_gen_andi_tl(cpu_nip, target, ~3); } - tcg_gen_exit_tb(0); - if ((bo & 0x14) != 0x14) { - gen_set_label(l1); - gen_update_nip(ctx, ctx->nip); - tcg_gen_exit_tb(0); - } - } - if (type == BCOND_LR || type == BCOND_CTR || type == BCOND_TAR) { + tcg_gen_lookup_and_goto_ptr(); tcg_temp_free(target); } + if ((bo & 0x14) != 0x14) { + gen_set_label(l1); + gen_goto_tb(ctx, 1, ctx->nip); + } } static void gen_bc(DisasContext *ctx)