From patchwork Wed Sep 6 16:05:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 111822 Delivered-To: patch@linaro.org Received: by 10.140.94.166 with SMTP id g35csp1135319qge; Wed, 6 Sep 2017 09:20:31 -0700 (PDT) X-Received: by 10.200.42.98 with SMTP id l31mr4724687qtl.80.1504714831188; Wed, 06 Sep 2017 09:20:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504714831; cv=none; d=google.com; s=arc-20160816; b=cG5YkzlfWM+3isXS2tn5jpk3vRgmJ38qm6W4EJQUPJ6KRrA8tuf3q+d2eofEsCvL5u 68FODdrXJx6J6HKBIC7etwLP+bdo2zILKU3mnR13v3NilirUbxOM/8AuWfQZ0BHbu7wK xAqAyG3Y2reboEMB8THn6TpuxDH5jNVCw8taQ/aaCMk4OVviDLLS3bBNZ72Q7D5lKYWC DsRgevxKUwg88pNezD2ngyxuE2w8HtXfAhGu4BCgra3OjTfH7t5i+ZvCxmOXR4slIoCY CVyI2wc3EcXKSsK4jPkoYrN0CRjSlR5k7QoM5bbYa6dL1KLUjtOALSWz1HQkuFwJ4UR9 xNuA== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=eB0FH3t+OZuRMiq5J2cNC7DQkRCrEPN4sXzCTB1u54o=; b=B2u+yZcdtdbq1LsE4H3DF11q18M5wBAjvM1RDEOzQjIEdt3x9nzmTVdMbmdcsQ1ixn qlftHI1yO3jVsKbFh//uOq46SrFIAJ6WaBzY7TxvqVhWwPiwq1Ir8PUBF8nehEfFtf61 eSR46GEFwJ+sg9AXapA3kHgtUJdun1olOIuAAa6v91vDkDxI1TH/uCWQDgRPA9aMIxNh x4iLCBOTm2AZEGjFgCXTLjWADAfvg+qk8P4D+Tk1jkCYEBvo5FtIYEUI17oYeWFHKPVo dLFRPDOJMP9fUwjt6B1UquGsKuarE7VIYk+TxS2eZp4wblTrzDsBWU+ZFKdFwZbeEqki o/kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=P+VhubcS; 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=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id g6si182281qtd.553.2017.09.06.09.20.30 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 06 Sep 2017 09:20:31 -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=@linaro.org header.s=google header.b=P+VhubcS; 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=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:37009 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpd40-0003If-Nu for patch@linaro.org; Wed, 06 Sep 2017 12:20:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41754) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpcqd-00009G-RJ for qemu-devel@nongnu.org; Wed, 06 Sep 2017 12:06:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpcqX-00029c-W1 for qemu-devel@nongnu.org; Wed, 06 Sep 2017 12:06:39 -0400 Received: from mail-pg0-x235.google.com ([2607:f8b0:400e:c05::235]:36202) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dpcqX-00027w-QD for qemu-devel@nongnu.org; Wed, 06 Sep 2017 12:06:33 -0400 Received: by mail-pg0-x235.google.com with SMTP id m9so16046038pgd.3 for ; Wed, 06 Sep 2017 09:06:33 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=eB0FH3t+OZuRMiq5J2cNC7DQkRCrEPN4sXzCTB1u54o=; b=P+VhubcSxTHvMsCzkiUul+OE/y6Cp3nSnD/0R1etiXj04ANGjF0LlOxQDIYHfQEws6 Z4Gep3aF4VPe6HZsg3G8YU76YTX4OrR78Lwa280yNGMBQAx2Up8ysCTJDOprYLrVxfnC jLw+hjvhpjnqzdbQSAKocjq8efvQJhu/CV90s= 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:mime-version:content-transfer-encoding; bh=eB0FH3t+OZuRMiq5J2cNC7DQkRCrEPN4sXzCTB1u54o=; b=NI0ryU/60/TfDkN8pbS7DMRGsbDstiAb8CS+XDWUTYUADlbNDzeVubA5qLtiqBboOr 6TeK61Xua974Z3DtSFebKws8GuK6o9gTZZvsR99dF7IOfTF/HsLtxKCCBm0n8iYwMH8J krPZIsKfhqNPXs/MPU/2WTCQ7XaFtrqTdhWdbcBumJbwU160ziEFi/twpLd11MDP1P9q Cd+l4Pr1Gy+xf4Ydsnhhm+1coH1Ijg/An2Mnnbsg82gsHDZg7g5GNTgk/EZl7BcloTCa xsRhdXMQC/cAWrCtQeAcF233i7Ddim1nScjezIK+ZGwpRLHYJyWpcCCcVVP456GUjXAB J6Tg== X-Gm-Message-State: AHPjjUjEUhF6d3kv9CaMN544MedP4eU2wrtyGM9ZxsEd/LPQh6hSdqDx Nwk3p4dTA/u920yTT9IuYw== X-Google-Smtp-Source: ADKCNb7IAkESjKS6bZPahnD7AqKS2mIiGB9ygh/BRe/oIFXEj20IgTARVdD1Ir1m0YyfxrrX9O3MlQ== X-Received: by 10.98.197.134 with SMTP id j128mr7660605pfg.113.1504713992460; Wed, 06 Sep 2017 09:06:32 -0700 (PDT) Received: from bigtime.twiddle.net (97-126-108-236.tukw.qwest.net. [97.126.108.236]) by smtp.gmail.com with ESMTPSA id t65sm262863pfk.59.2017.09.06.09.06.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 06 Sep 2017 09:06:31 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 6 Sep 2017 09:05:53 -0700 Message-Id: <20170906160612.22769-14-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170906160612.22769-1-richard.henderson@linaro.org> References: <20170906160612.22769-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::235 Subject: [Qemu-devel] [PULL 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: peter.maydell@linaro.org, =?utf-8?q?Llu=C3=ADs_Vilanova?= , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Lluís Vilanova Incrementally paves the way towards using the generic instruction translation loop. Signed-off-by: Lluís 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(-) -- 2.13.5 diff --git a/target/i386/translate.c b/target/i386/translate.c index 9872f84a03..ad4b2735f4 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -8518,6 +8518,21 @@ static void i386_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu) } } +static void i386_tr_disas_log(const DisasContextBase *dcbase, + CPUState *cpu) +{ + DisasContext *dc = container_of(dcbase, DisasContext, base); + int disas_flags = !dc->code32; + + qemu_log("IN: %s\n", lookup_symbol(dc->base.pc_first)); +#ifdef TARGET_X86_64 + if (dc->code64) { + disas_flags = 2; + } +#endif + log_target_disas(cpu, dc->base.pc_first, dc->base.tb->size, disas_flags); +} + /* generate intermediate code for basic block 'tb'. */ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb) { @@ -8593,28 +8608,19 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb) gen_io_end(); gen_tb_end(tb, num_insns); + tb->size = dc->base.pc_next - dc->base.pc_first; + tb->icount = 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 = 2; - else -#endif - disas_flags = !dc->code32; - log_target_disas(cs, dc->base.pc_first, dc->base.pc_next - dc->base.pc_first, - disas_flags); + i386_tr_disas_log(&dc->base, cs); qemu_log("\n"); qemu_log_unlock(); } #endif - - tb->size = dc->base.pc_next - dc->base.pc_first; - tb->icount = num_insns; } void restore_state_to_opc(CPUX86State *env, TranslationBlock *tb,