From patchwork Mon Jul 24 20:27:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9860397 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BC2D560385 for ; Mon, 24 Jul 2017 20:40:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF32F285AE for ; Mon, 24 Jul 2017 20:40:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A420B285BF; Mon, 24 Jul 2017 20:40:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CEC03285BD for ; Mon, 24 Jul 2017 20:40:34 +0000 (UTC) Received: from localhost ([::1]:56868 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZk9Y-0003aH-1z for patchwork-qemu-devel@patchwork.kernel.org; Mon, 24 Jul 2017 16:40:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48000) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZjxx-0003L2-5V for qemu-devel@nongnu.org; Mon, 24 Jul 2017 16:28:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dZjxw-0001NK-08 for qemu-devel@nongnu.org; Mon, 24 Jul 2017 16:28:33 -0400 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:36522) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dZjxv-0001Mi-Qi for qemu-devel@nongnu.org; Mon, 24 Jul 2017 16:28:31 -0400 Received: by mail-qt0-x242.google.com with SMTP id l55so13168932qtl.3 for ; Mon, 24 Jul 2017 13:28:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XT7QH0TKEQOH/i8oG44EVb5JyVYV+iGYYxCmT1ZQkiQ=; b=LDpx73J7Ud89bxChZWpnRHp3K+7nLUJ9ucBnUq3bvJjfMN3clF82k5lcxlVs+EwAj6 Owo3PQZkN+QyzBjAsVd8OWsjtNyUZGKqmmYsR98Z6P43X3uKbE3D0avxjpodisVFxMzM ZpYc05dgi3rCf4TfeZXQO5Gw+1G7B138skqRQ/T7syhwcvWD4gxO0Om+l8aAzu8YcTGg ktEJGgrO0G0DI7xGCub4bAaBt9hKERc6EbAMhA2W/8h66Nz+n46gBGkKuOpxd/ViaHxB 8Ej3Wbj73OjgUE/R06fxeO4K7J1bgTnCsRqvJj9USnwRgmwYHiXRkDARp9MqYz1DXixy KKnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=XT7QH0TKEQOH/i8oG44EVb5JyVYV+iGYYxCmT1ZQkiQ=; b=dQlfzmzJZdfFYrfQTzVH/O6EV0u4r0TbrAfNJlgoP9YRH41ls1ZG5/TyAsGXoxGDn0 NwngWVgIROFoVN5uX7FCvQYuaqCpWPM9wCSexN+5U120Agn0cC++bjJDP2JS2R6TF2Db dSdt3K/ejQa4qSmKlMRh9qhUP1xRmwfvxFV4QjcecHub4TFrAnTyF1XQwEQsiIhlw9Cw 5evLZQ0HYuG6cA6rbMCkv4uI1U1bs/pRM5a7Mxnqmhb3H9vseZCTpOLNwjO9zaA6/RNS t1GllTOu8KTx8x6JP5UQW42EJXxOFywFfaQk8CWdi4fZ0QqvJ6T1PvASE+AUXKR5sell gnPA== X-Gm-Message-State: AIVw112z04I/Jk3FAnFxPz7LUevelOwKMXuCuk00+Ig2Ut4xuug66c3E jMyDjP0TgQwsjH7rxXE= X-Received: by 10.200.10.77 with SMTP id f13mr7630114qti.226.1500928111032; Mon, 24 Jul 2017 13:28:31 -0700 (PDT) Received: from bigtime.com ([71.217.194.233]) by smtp.gmail.com with ESMTPSA id p52sm9196808qtc.74.2017.07.24.13.28.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jul 2017 13:28:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 24 Jul 2017 13:27:16 -0700 Message-Id: <20170724202728.25960-21-rth@twiddle.net> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170724202728.25960-1-rth@twiddle.net> References: <20170724202728.25960-1-rth@twiddle.net> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::242 Subject: [Qemu-devel] [PATCH v15 20/32] target/arm: [tcg, a64] Port to insn_start 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: cota@braap.org, vilanova@ac.upc.edu Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Lluís Vilanova Incrementally paves the way towards using the generic instruction translation loop. Signed-off-by: Lluís Vilanova Reviewed-by: Richard Henderson Reviewed-by: Alex Benneé Message-Id: <150002413187.22386.156315485813606121.stgit@frigg.lan> [rth: Use DISAS_TOO_MANY for "execute only one more" after bp.] Signed-off-by: Richard Henderson --- target/arm/translate-a64.c | 11 ++++++++-- target/arm/translate.c | 55 +++++++++++++++++++++++++++++----------------- 2 files changed, 44 insertions(+), 22 deletions(-) diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 2919e5a636..2edcfe05f3 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -11238,6 +11238,14 @@ static int aarch64_tr_init_disas_context(DisasContextBase *dcbase, return max_insns; } +static void aarch64_tr_insn_start(DisasContextBase *dcbase, CPUState *cpu) +{ + DisasContext *dc = container_of(dcbase, DisasContext, base); + + dc->insn_start_idx = tcg_op_buf_count(); + tcg_gen_insn_start(dc->pc, 0, 0); +} + void gen_intermediate_code_a64(DisasContextBase *dcbase, CPUState *cs, TranslationBlock *tb) { @@ -11269,8 +11277,7 @@ void gen_intermediate_code_a64(DisasContextBase *dcbase, CPUState *cs, do { dc->base.num_insns++; - dc->insn_start_idx = tcg_op_buf_count(); - tcg_gen_insn_start(dc->pc, 0, 0); + aarch64_tr_insn_start(&dc->base, cs); if (unlikely(!QTAILQ_EMPTY(&cs->breakpoints))) { CPUBreakpoint *bp; diff --git a/target/arm/translate.c b/target/arm/translate.c index c7010fffa5..30db22fa79 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -11916,6 +11916,33 @@ static void arm_tr_insn_start(DisasContextBase *dcbase, CPUState *cpu) 0); } +static bool arm_tr_breakpoint_check(DisasContextBase *dcbase, CPUState *cpu, + const CPUBreakpoint *bp) +{ + DisasContext *dc = container_of(dcbase, DisasContext, base); + + if (bp->flags & BP_CPU) { + gen_set_condexec(dc); + gen_set_pc_im(dc, dc->pc); + gen_helper_check_breakpoints(cpu_env); + /* End the TB early; it's likely not going to be executed */ + dc->base.is_jmp = DISAS_TOO_MANY; + } else { + gen_exception_internal_insn(dc, 0, EXCP_DEBUG); + /* The address covered by the breakpoint must be + included in [tb->pc, tb->pc + tb->size) in order + to for it to be properly cleared -- thus we + increment the PC here so that the logic setting + tb->size below does the right thing. */ + /* TODO: Advance PC by correct instruction length to + * avoid disassembler error messages */ + dc->pc += 2; + dc->base.is_jmp = DISAS_NORETURN; + } + + return true; +} + /* generate intermediate code for basic block 'tb'. */ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb) { @@ -11964,28 +11991,15 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb) if (unlikely(!QTAILQ_EMPTY(&cs->breakpoints))) { CPUBreakpoint *bp; QTAILQ_FOREACH(bp, &cs->breakpoints, entry) { - if (bp->pc == dc->pc) { - if (bp->flags & BP_CPU) { - gen_set_condexec(dc); - gen_set_pc_im(dc, dc->pc); - gen_helper_check_breakpoints(cpu_env); - /* End the TB early; it's likely not going to be executed */ - dc->base.is_jmp = DISAS_UPDATE; - } else { - gen_exception_internal_insn(dc, 0, EXCP_DEBUG); - /* The address covered by the breakpoint must be - included in [tb->pc, tb->pc + tb->size) in order - to for it to be properly cleared -- thus we - increment the PC here so that the logic setting - tb->size below does the right thing. */ - /* TODO: Advance PC by correct instruction length to - * avoid disassembler error messages */ - dc->pc += 2; - goto done_generating; + if (bp->pc == dc->base.pc_next) { + if (arm_tr_breakpoint_check(&dc->base, cs, bp)) { + break; } - break; } } + if (dc->base.is_jmp > DISAS_TOO_MANY) { + break; + } } if (dc->base.num_insns == max_insns && (tb->cflags & CF_LAST_IO)) { @@ -12107,6 +12121,7 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb) gen_exception(EXCP_SMC, syn_aa32_smc(), 3); break; case DISAS_NEXT: + case DISAS_TOO_MANY: case DISAS_UPDATE: gen_set_pc_im(dc, dc->pc); /* fall through */ @@ -12128,6 +12143,7 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb) */ switch(dc->base.is_jmp) { case DISAS_NEXT: + case DISAS_TOO_MANY: gen_goto_tb(dc, 1, dc->pc); break; case DISAS_JUMP: @@ -12181,7 +12197,6 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb) } } -done_generating: gen_tb_end(tb, dc->base.num_insns); #ifdef DEBUG_DISAS