From patchwork Mon Jul 24 20:27:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9860545 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 E77E660349 for ; Mon, 24 Jul 2017 20:54:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA1C5285C6 for ; Mon, 24 Jul 2017 20:54:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CCA34285CA; Mon, 24 Jul 2017 20:54:54 +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 540D4285C6 for ; Mon, 24 Jul 2017 20:54:53 +0000 (UTC) Received: from localhost ([::1]:56961 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZkNR-0007ww-AH for patchwork-qemu-devel@patchwork.kernel.org; Mon, 24 Jul 2017 16:54:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48097) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZjyE-0003lR-Rw for qemu-devel@nongnu.org; Mon, 24 Jul 2017 16:28:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dZjyB-0001ow-0m for qemu-devel@nongnu.org; Mon, 24 Jul 2017 16:28:50 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:34512) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dZjyA-0001oX-T9 for qemu-devel@nongnu.org; Mon, 24 Jul 2017 16:28:46 -0400 Received: by mail-qk0-x241.google.com with SMTP id q66so10950557qki.1 for ; Mon, 24 Jul 2017 13:28:46 -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=TMWZ11N6veFo3qdiD7pojn01EqG83it4BK07oN5S6DY=; b=bBmaL5AYULZNZouPeOi20ANafKSp08zVpqWtvJB0S/CCczgqSerQB/sOe1X1cPB7E7 aogVQWGdwpQCppec2vqP8oueoOm8dJ6lLGoTgG+39r6p5TcjULIA/qjYQEo/a7Y9oFBo dGVYIrqESjv+F8tJdw2lg0NrtfCSQtUTAowJzI+Q/tvyDysOFBPQ1KCwjgkaNre7r1IE 3M3UFVB7Kt34JHb+5lSipP7+aMOzepDdWLl/9ooULpwo836Brn9wfMbT7vebsTHZ02RN nlliKfdNN20qIA+Hj7m4xUvSqsgM0KJbaGvPwaONtVg8oOuusI/HKxGrwhWKZBLFNQKc ayCg== 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=TMWZ11N6veFo3qdiD7pojn01EqG83it4BK07oN5S6DY=; b=LZWcgoEewlSCXpAUAW8ND5RVFbPWhRA0HtR/igqav3KO7mN+WXu7tjYeK59OG0g26k XFzPG0QV0jo6Hd2CLP5CwwwELr46zvIuulMQb65+kXl0RxNdOZLoyieyQ48ltKU3eMqs ylkUZH2ZkUsa7IqXcnJIxxkxIoXnpjrZHK9C40+uzpxrkI3n/O259PU/CwRWQypYkO5u v3KFwdmBEXK2nM9s+bcJTn2uxwRoNnFeo/DKlG/sPJsxrQX/BKKTPMpj+GdgM9AqE+r8 q4OGPn207I5YxfuyzSUScq3dWhFTwx7OZFUEm5U3TIYPf+02yBe1dTzm0qfd68JgkKw2 WmlQ== X-Gm-Message-State: AIVw112UGe8AEeUImchw6Ux54Sf+ZxXc4ie6c0/Mk1I4CpF2lNdLs/ys dIhH4MBI0jOFOtDvEFg= X-Received: by 10.55.146.133 with SMTP id u127mr20818668qkd.17.1500928125723; Mon, 24 Jul 2017 13:28:45 -0700 (PDT) Received: from bigtime.com ([71.217.194.233]) by smtp.gmail.com with ESMTPSA id p52sm9196808qtc.74.2017.07.24.13.28.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jul 2017 13:28:44 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 24 Jul 2017 13:27:22 -0700 Message-Id: <20170724202728.25960-27-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:c09::241 Subject: [Qemu-devel] [PATCH v15 26/32] target/arm: [tcg] Port to disas_log 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: <150002582711.22386.191527630537864599.stgit@frigg.lan> [rth: Move tb->size computation and use that result.] Signed-off-by: Richard Henderson --- target/arm/translate.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/target/arm/translate.c b/target/arm/translate.c index bacc0303e5..c5e6ee8468 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -12141,6 +12141,15 @@ static void arm_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu) } } +static void arm_tr_disas_log(const DisasContextBase *dcbase, CPUState *cpu) +{ + DisasContext *dc = container_of(dcbase, DisasContext, base); + + qemu_log("IN: %s\n", lookup_symbol(dc->base.pc_first)); + log_target_disas(cpu, dc->base.pc_first, dc->base.tb->size, + dc->thumb | (dc->sctlr_b << 1)); +} + /* generate intermediate code for basic block 'tb'. */ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb) { @@ -12221,20 +12230,19 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb) gen_tb_end(tb, dc->base.num_insns); + tb->size = dc->pc - dc->base.pc_first; + tb->icount = dc->base.num_insns; + #ifdef DEBUG_DISAS if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM) && qemu_log_in_addr_range(dc->base.pc_first)) { qemu_log_lock(); qemu_log("----------------\n"); - qemu_log("IN: %s\n", lookup_symbol(dc->base.pc_first)); - log_target_disas(cs, dc->base.pc_first, dc->pc - dc->base.pc_first, - dc->thumb | (dc->sctlr_b << 1)); + arm_tr_disas_log(&dc->base, cs); qemu_log("\n"); qemu_log_unlock(); } #endif - tb->size = dc->pc - dc->base.pc_first; - tb->icount = dc->base.num_insns; } static const char *cpu_mode_names[16] = {