From patchwork Mon Jul 2 15:10:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stafford Horne X-Patchwork-Id: 140795 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp67080ljj; Mon, 2 Jul 2018 08:11:27 -0700 (PDT) X-Google-Smtp-Source: AAOMgpflpt+Up1zpyQl4WdGXXmxiOblOyp4EsEoxWmlkZfF4LYrbrfad4VGOoYb2ER4diueiIR7w X-Received: by 2002:a37:99c3:: with SMTP id b186-v6mr22211136qke.261.1530544287295; Mon, 02 Jul 2018 08:11:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530544287; cv=none; d=google.com; s=arc-20160816; b=jTeMajNcKfv/zqI+MUIwIAa8J9DN9Y9kGxLQaKa9eJ96gDM55vab5kVI7W8ZhA/MUu 1DncTa/KCxogz//1pi7kHwI4COpVsKxoJIWOVx9nypl6TLgBWv/sEP+oo6i1I/wP8pdH YCdpv6GntQRy6RG69YXGE7tAXZlITlpqv0OSjF4ke7m4/N2R3xzL/KKi4yN4GdiJ+btY 69f30jRol6NmdQmt31oJ4UiLqcMJXe+tNrh1yo7QaDitIJP2KySiERqwtwnd/xu7e0IL waL4JHKLiIAaaRTek0VgmdTFYIO2VQoGSsXuFnJz/gxoLD687rj/au9puVlyTzzgBwga bnUw== 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:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=0AwTJ+88ZGHtSYhFlyrIVloh3Xf4GpNuS/w+tenewKg=; b=RlwjQEqQJzoGB0L3fR8NtRJEEq0HWCRztcA3+tfPcDNqTc6cJY5B2bgo8OVGT//67P V9WeU5xET+pxpp90L6ZbqTP0GWDKIyh8ZKaj70/AXZlVNjamVB0SLXRcbECFlQJAVzrT YGK/QSxQCM7Ope0Fp2bdi9HlkYF6jpLXWaiC/dZEwWT3Xr+MO+gokq/ikEpP5rL7+ZQZ uJPtEhk7xO9rbSnxIrNYUe3z7VjPDcWH25c92NgId+bFS7X3J73NeSEb7E30U/gfEjgA F+57Z58htgxaBlNUfIqys433bAzCVJAWHIBkNad6w6fv7O+0ssM/JsqTqfMpS755Q7mp 1NnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=rwhCa7IM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id p84-v6si4071473qkp.268.2018.07.02.08.11.27 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 08:11:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=rwhCa7IM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from localhost ([::1]:33436 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa0UA-00042R-J5 for patch@linaro.org; Mon, 02 Jul 2018 11:11:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48669) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa0Tj-0003zD-2S for qemu-devel@nongnu.org; Mon, 02 Jul 2018 11:11:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fa0Th-0007rC-P3 for qemu-devel@nongnu.org; Mon, 02 Jul 2018 11:10:59 -0400 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]:38682) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fa0Th-0007qh-Hf for qemu-devel@nongnu.org; Mon, 02 Jul 2018 11:10:57 -0400 Received: by mail-pg0-x241.google.com with SMTP id c9-v6so7282794pgf.5 for ; Mon, 02 Jul 2018 08:10:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0AwTJ+88ZGHtSYhFlyrIVloh3Xf4GpNuS/w+tenewKg=; b=rwhCa7IMCP7NCLTb3vb4upyPyhr6HwejkLvltYsEargOiiJmOYiHIhQI1Y4wpIe8Dd 1KHFFud5wSD0t2KXkYXM75aGmJox9WG+qvdqcG+UDtBXhAGfKaYP25sxvYDrUF5Tvwhv uFJdiPKCmjeYqfp1VTuojsnB9LM8IGrfk0pxwMzubTIo2D95R9OIc5aSSslsj8AYiI/q CK8VNidupFyh+SZAxuB/U9IvIxzItPnHoB4iL3r5TfqBKQDuYqUs+sD4L4yQb+Cqx+oC jNDM7GbO8YUsmnMfMshSxDv/2KK0p+9cmcPNcvPs5PoY7X+aUKgmt4hWjsmGcSv4Q721 QOsQ== 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; bh=0AwTJ+88ZGHtSYhFlyrIVloh3Xf4GpNuS/w+tenewKg=; b=oKAs9GjR/YC21HxZXrrFt1vWrQOKW1pXQQSzL/dba+UpYBX25r48Eqf/iSKAWAL9J1 w+R8iG7hGKmI0Q3kDYzr2pke4qH8XKZAw9CVADDcz69zXj0E7+lc6B8YotSNXKv/BN7h PIRqkg2KNHropPijYNafh2svAiL07Kx6OxjcdqGar26dXnEsaYrJDpcB15vIrtbdXcS8 mgdGJY5TaNpcPUnDQcFaQukra6Zb/yl4t8Nrkthoq0JVtKgMvdBOOKBwka8KHmqm9ZbM UmKaLUdAbLrAJv1/jNHbhCqAwSzOZmXmkyu72XvmH5ILkguesxXzCrRcqQntYieM/3kj Iq4w== X-Gm-Message-State: APt69E1w0MVbxkbCwh914uKOqz4mUweRFD/vp064Set8kBG6nGNInxXi /t0qZVVTvt1yLrY8gcRkTMs= X-Received: by 2002:a63:2c94:: with SMTP id s142-v6mr21598450pgs.39.1530544256683; Mon, 02 Jul 2018 08:10:56 -0700 (PDT) Received: from localhost (g90.124-44-6.ppp.wakwak.ne.jp. [124.44.6.90]) by smtp.gmail.com with ESMTPSA id a11-v6sm22187754pgq.32.2018.07.02.08.10.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 08:10:56 -0700 (PDT) From: Stafford Horne To: Peter Maydell Date: Tue, 3 Jul 2018 00:10:05 +0900 Message-Id: <20180702151023.24532-8-shorne@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180702151023.24532-1-shorne@gmail.com> References: <20180702151023.24532-1-shorne@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::241 Subject: [Qemu-devel] [PULL v2 07/25] target/openrisc: Link more translation blocks 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: Stafford Horne , Richard Henderson , QEMU Development Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Track direct jumps via dc->jmp_pc_imm. Use that in preference to jmp_pc when possible. Emit goto_tb in that case, and lookup_and_goto_tb otherwise. Reviewed-by: Stafford Horne Signed-off-by: Richard Henderson Signed-off-by: Stafford Horne --- target/openrisc/translate.c | 96 +++++++++++++++++++++---------------- 1 file changed, 55 insertions(+), 41 deletions(-) -- 2.17.0 diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index 22848b17ad..a618d39242 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -38,13 +38,16 @@ /* is_jmp field values */ #define DISAS_EXIT DISAS_TARGET_0 /* force exit to main loop */ -#define DISAS_UPDATE DISAS_TARGET_1 /* cpu state was modified dynamically */ +#define DISAS_JUMP DISAS_TARGET_1 /* exit via jmp_pc/jmp_pc_imm */ typedef struct DisasContext { DisasContextBase base; uint32_t mem_idx; uint32_t tb_flags; uint32_t delayed_branch; + + /* If not -1, jmp_pc contains this value and so is a direct jump. */ + target_ulong jmp_pc_imm; } DisasContext; /* Include the auto-generated decoder. */ @@ -160,34 +163,6 @@ static void check_ov64s(DisasContext *dc) } \ } while (0) -static inline bool use_goto_tb(DisasContext *dc, target_ulong dest) -{ - if (unlikely(dc->base.singlestep_enabled)) { - return false; - } - -#ifndef CONFIG_USER_ONLY - return (dc->base.tb->pc & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK); -#else - return true; -#endif -} - -static void gen_goto_tb(DisasContext *dc, int n, target_ulong dest) -{ - if (use_goto_tb(dc, dest)) { - tcg_gen_movi_tl(cpu_pc, dest); - tcg_gen_goto_tb(n); - tcg_gen_exit_tb(dc->base.tb, n); - } else { - tcg_gen_movi_tl(cpu_pc, dest); - if (dc->base.singlestep_enabled) { - gen_exception(dc, EXCP_DEBUG); - } - tcg_gen_exit_tb(NULL, 0); - } -} - static void gen_ove_cy(DisasContext *dc) { if (dc->tb_flags & SR_OVE) { @@ -621,6 +596,7 @@ static bool trans_l_j(DisasContext *dc, arg_l_j *a, uint32_t insn) target_ulong tmp_pc = dc->base.pc_next + a->n * 4; tcg_gen_movi_tl(jmp_pc, tmp_pc); + dc->jmp_pc_imm = tmp_pc; dc->delayed_branch = 2; return true; } @@ -634,6 +610,7 @@ static bool trans_l_jal(DisasContext *dc, arg_l_jal *a, uint32_t insn) /* Optimize jal being used to load the PC for PIC. */ if (tmp_pc != ret_pc) { tcg_gen_movi_tl(jmp_pc, tmp_pc); + dc->jmp_pc_imm = tmp_pc; dc->delayed_branch = 2; } return true; @@ -1267,6 +1244,8 @@ static void openrisc_tr_init_disas_context(DisasContextBase *dcb, CPUState *cs) dc->mem_idx = cpu_mmu_index(env, false); dc->tb_flags = dc->base.tb->flags; dc->delayed_branch = (dc->tb_flags & TB_FLAGS_DFLAG) != 0; + dc->jmp_pc_imm = -1; + bound = -(dc->base.pc_first | TARGET_PAGE_MASK) / 4; dc->base.max_insns = MIN(dc->base.max_insns, bound); } @@ -1319,37 +1298,72 @@ static void openrisc_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs) } dc->base.pc_next += 4; - /* delay slot */ - if (dc->delayed_branch) { - dc->delayed_branch--; - if (!dc->delayed_branch) { - tcg_gen_mov_tl(cpu_pc, jmp_pc); - tcg_gen_discard_tl(jmp_pc); - dc->base.is_jmp = DISAS_UPDATE; - return; - } + /* When exiting the delay slot normally, exit via jmp_pc. + * For DISAS_NORETURN, we have raised an exception and already exited. + * For DISAS_EXIT, we found l.rfe in a delay slot. There's nothing + * in the manual saying this is illegal, but it surely it should. + * At least or1ksim overrides pcnext and ignores the branch. + */ + if (dc->delayed_branch + && --dc->delayed_branch == 0 + && dc->base.is_jmp == DISAS_NEXT) { + dc->base.is_jmp = DISAS_JUMP; } } static void openrisc_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs) { DisasContext *dc = container_of(dcbase, DisasContext, base); + target_ulong jmp_dest; /* If we have already exited the TB, nothing following has effect. */ if (dc->base.is_jmp == DISAS_NORETURN) { return; } + /* Adjust the delayed branch state for the next TB. */ if ((dc->tb_flags & TB_FLAGS_DFLAG ? 1 : 0) != (dc->delayed_branch != 0)) { tcg_gen_movi_i32(cpu_dflag, dc->delayed_branch != 0); } - tcg_gen_movi_tl(cpu_ppc, dc->base.pc_next - 4); + /* For DISAS_TOO_MANY, jump to the next insn. */ + jmp_dest = dc->base.pc_next; + tcg_gen_movi_tl(cpu_ppc, jmp_dest - 4); + switch (dc->base.is_jmp) { + case DISAS_JUMP: + jmp_dest = dc->jmp_pc_imm; + if (jmp_dest == -1) { + /* The jump destination is indirect/computed; use jmp_pc. */ + tcg_gen_mov_tl(cpu_pc, jmp_pc); + tcg_gen_discard_tl(jmp_pc); + if (unlikely(dc->base.singlestep_enabled)) { + gen_exception(dc, EXCP_DEBUG); + } else { + tcg_gen_lookup_and_goto_ptr(); + } + break; + } + /* The jump destination is direct; use jmp_pc_imm. + However, we will have stored into jmp_pc as well; + we know now that it wasn't needed. */ + tcg_gen_discard_tl(jmp_pc); + /* fallthru */ + case DISAS_TOO_MANY: - gen_goto_tb(dc, 0, dc->base.pc_next); + 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 { + tcg_gen_goto_tb(0); + tcg_gen_movi_tl(cpu_pc, jmp_dest); + tcg_gen_exit_tb(dc->base.tb, 0); + } break; - case DISAS_UPDATE: + case DISAS_EXIT: if (unlikely(dc->base.singlestep_enabled)) { gen_exception(dc, EXCP_DEBUG);