From nobody Mon Feb 9 11:32:34 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1500928609224732.585635333173; Mon, 24 Jul 2017 13:36:49 -0700 (PDT) Received: from localhost ([::1]:56857 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZk5u-0001Io-Rj for importer@patchew.org; Mon, 24 Jul 2017 16:36:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47922) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZjxm-00038u-PE for qemu-devel@nongnu.org; Mon, 24 Jul 2017 16:28:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dZjxl-00013t-Q3 for qemu-devel@nongnu.org; Mon, 24 Jul 2017 16:28:22 -0400 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:38338) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dZjxl-00013E-LA for qemu-devel@nongnu.org; Mon, 24 Jul 2017 16:28:21 -0400 Received: by mail-qk0-x242.google.com with SMTP id t2so10965342qkc.5 for ; Mon, 24 Jul 2017 13:28:21 -0700 (PDT) Received: from bigtime.com ([71.217.194.233]) by smtp.gmail.com with ESMTPSA id p52sm9196808qtc.74.2017.07.24.13.28.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jul 2017 13:28:20 -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=SswCkFu5W4Wi85PJIaHTNCz8rgmL8lu2rbNLiey9Q0U=; b=hZE9dXr2mmhUP56iBb5P5rE76VugvPaPpU3BAx6D7Tzw5SCKg7J9fkBP5JGjYaKEJA 886leYwpoDezqZcudA6KN234CQRB9Hdvmcs6FDp31Zy6fFHmH0GQK0YDt0QKsEdXm0nh sTabWj1KBZFW1FNqvn0tRI2yo7AWijH7wRpIBhYcRW6JY0rlrYxm5wSzB27Y/qXjZL0N GBsK9IFSR4Np7LlG/J8kYTHYQYFAA5WV5o+dgrlXudTn4Te6SNPMt8/ywj3llpxNBI3X iKDKOg564/2mrBHUQ9Lxgno2dw/N3jwR1/SeRd/8avhvvCu6IOEX0fLyF5HpVs6xSzYE vJKA== 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=SswCkFu5W4Wi85PJIaHTNCz8rgmL8lu2rbNLiey9Q0U=; b=Sdc9x7KOn8UiKYqhegdLAJ3pBc3bm9ONm15THe4P/PvRYln6G/saI2G0rQ05vC77Ze nqNtrKnyxFJQSVjJvE4+VRAhXwi2BolJEVxvaec5axYczHcNkuC4v4u6G2tKia8v+nZn EeEAXBr8IE4QWZ5XQt7QVmwCt5+oQiOuVuPMY6r6v6CboFm0h4nguN4VH5dm+UDkBEYI 8tCJBH9OZwOG9AYdWslsgdQqYjNsGhtq6PKSc4m23WXrMO5N9a9aUi7b3QK15EKiaaS4 +MYAzAfBv2QWNY9xm8Ih9cOHWdcFyMGnOGinKEEbQn02SbSrPS4CtXjNPmWQzmpT2bDe olJw== X-Gm-Message-State: AIVw111Q+d9vjsbzXyiVwzo861RAlrU4zIlfXTGp0Gxo5eradyjVIR6M H6uKcKLjTzIJ5tAu+mE= X-Received: by 10.55.191.7 with SMTP id p7mr20317302qkf.223.1500928100830; Mon, 24 Jul 2017 13:28:20 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 24 Jul 2017 13:27:09 -0700 Message-Id: <20170724202728.25960-14-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::242 Subject: [Qemu-devel] [PATCH v15 13/32] target/i386: [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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 From: Llu=C3=ADs Vilanova Incrementally paves the way towards using the generic instruction translati= on loop. Signed-off-by: Llu=C3=ADs Vilanova Reviewed-by: Emilio G. Cota Reviewed-by: Richard Henderson Message-Id: <150002243497.22386.8888053391875656102.stgit@frigg.lan> [rth: Move tb->size computation and use that result.] Signed-off-by: Richard Henderson --- target/i386/translate.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/target/i386/translate.c b/target/i386/translate.c index 8238533c0e..8e7212cf92 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -8517,6 +8517,21 @@ static void i386_tr_tb_stop(DisasContextBase *dcbase= , CPUState *cpu) } } =20 +static void i386_tr_disas_log(const DisasContextBase *dcbase, + CPUState *cpu) +{ + DisasContext *dc =3D container_of(dcbase, DisasContext, base); + int disas_flags =3D !dc->code32; + + qemu_log("IN: %s\n", lookup_symbol(dc->base.pc_first)); +#ifdef TARGET_X86_64 + if (dc->code64) { + disas_flags =3D 2; + } +#endif + log_target_disas(cpu, dc->base.pc_first, dc->base.tb->size, disas_flag= s); +} + /* generate intermediate code for basic block 'tb'. */ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb) { @@ -8592,28 +8607,19 @@ void gen_intermediate_code(CPUState *cs, Translatio= nBlock *tb) gen_io_end(); gen_tb_end(tb, num_insns); =20 + tb->size =3D dc->base.pc_next - dc->base.pc_first; + tb->icount =3D num_insns; + #ifdef DEBUG_DISAS if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM) && qemu_log_in_addr_range(dc->base.pc_first)) { - int disas_flags; qemu_log_lock(); qemu_log("----------------\n"); - qemu_log("IN: %s\n", lookup_symbol(dc->base.pc_first)); -#ifdef TARGET_X86_64 - if (dc->code64) - disas_flags =3D 2; - else -#endif - disas_flags =3D !dc->code32; - log_target_disas(cs, dc->base.pc_first, dc->base.pc_next - dc->bas= e.pc_first, - disas_flags); + i386_tr_disas_log(&dc->base, cs); qemu_log("\n"); qemu_log_unlock(); } #endif - - tb->size =3D dc->base.pc_next - dc->base.pc_first; - tb->icount =3D num_insns; } =20 void restore_state_to_opc(CPUX86State *env, TranslationBlock *tb, --=20 2.13.3