{"id":810711,"url":"http://patchwork.ozlabs.org/api/patches/810711/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906160612.22769-14-richard.henderson@linaro.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170906160612.22769-14-richard.henderson@linaro.org>","list_archive_url":null,"date":"2017-09-06T16:05:53","name":"[PULL,13/32] target/i386: [tcg] Port to disas_log","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"495e13807f6ce00454c1b97fb205126ace90e50f","submitter":{"id":72104,"url":"http://patchwork.ozlabs.org/api/people/72104/?format=json","name":"Richard Henderson","email":"richard.henderson@linaro.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906160612.22769-14-richard.henderson@linaro.org/mbox/","series":[{"id":1847,"url":"http://patchwork.ozlabs.org/api/series/1847/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1847","date":"2017-09-06T16:05:41","name":"[PULL,01/32] tcg: Add generic DISAS_NORETURN","version":1,"mbox":"http://patchwork.ozlabs.org/series/1847/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810711/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810711/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=linaro.org header.i=@linaro.org\n\theader.b=\"P+VhubcS\"; dkim-atps=neutral"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xnTN26BGwz9s7F\n\tfor ;\n\tThu, 7 Sep 2017 02:20:50 +1000 (AEST)","from localhost ([::1]:37009 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dpd4K-0003If-Qp\n\tfor incoming@patchwork.ozlabs.org; Wed, 06 Sep 2017 12:20:48 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:41754)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dpcqd-00009G-RJ\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 12:06:43 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dpcqX-00029c-W1\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 12:06:39 -0400","from mail-pg0-x235.google.com ([2607:f8b0:400e:c05::235]:36202)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from )\n\tid 1dpcqX-00027w-QD\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 12:06:33 -0400","by mail-pg0-x235.google.com with SMTP id m9so16046038pgd.3\n\tfor ; Wed, 06 Sep 2017 09:06:33 -0700 (PDT)","from bigtime.twiddle.net (97-126-108-236.tukw.qwest.net.\n\t[97.126.108.236]) by smtp.gmail.com with ESMTPSA id\n\tt65sm262863pfk.59.2017.09.06.09.06.30\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tWed, 06 Sep 2017 09:06:31 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=eB0FH3t+OZuRMiq5J2cNC7DQkRCrEPN4sXzCTB1u54o=;\n\tb=P+VhubcSxTHvMsCzkiUul+OE/y6Cp3nSnD/0R1etiXj04ANGjF0LlOxQDIYHfQEws6\n\tZ4Gep3aF4VPe6HZsg3G8YU76YTX4OrR78Lwa280yNGMBQAx2Up8ysCTJDOprYLrVxfnC\n\tjLw+hjvhpjnqzdbQSAKocjq8efvQJhu/CV90s=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=eB0FH3t+OZuRMiq5J2cNC7DQkRCrEPN4sXzCTB1u54o=;\n\tb=NI0ryU/60/TfDkN8pbS7DMRGsbDstiAb8CS+XDWUTYUADlbNDzeVubA5qLtiqBboOr\n\t6TeK61Xua974Z3DtSFebKws8GuK6o9gTZZvsR99dF7IOfTF/HsLtxKCCBm0n8iYwMH8J\n\tkrPZIsKfhqNPXs/MPU/2WTCQ7XaFtrqTdhWdbcBumJbwU160ziEFi/twpLd11MDP1P9q\n\tCd+l4Pr1Gy+xf4Ydsnhhm+1coH1Ijg/An2Mnnbsg82gsHDZg7g5GNTgk/EZl7BcloTCa\n\txsRhdXMQC/cAWrCtQeAcF233i7Ddim1nScjezIK+ZGwpRLHYJyWpcCCcVVP456GUjXAB\n\tJ6Tg==","X-Gm-Message-State":"AHPjjUjEUhF6d3kv9CaMN544MedP4eU2wrtyGM9ZxsEd/LPQh6hSdqDx\n\tNwk3p4dTA/u920yTT9IuYw==","X-Google-Smtp-Source":"ADKCNb7IAkESjKS6bZPahnD7AqKS2mIiGB9ygh/BRe/oIFXEj20IgTARVdD1Ir1m0YyfxrrX9O3MlQ==","X-Received":"by 10.98.197.134 with SMTP id j128mr7660605pfg.113.1504713992460;\n\tWed, 06 Sep 2017 09:06:32 -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","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","X-detected-operating-system":"by eggs.gnu.org: Genre and OS details not\n\trecognized.","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":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"peter.maydell@linaro.org, =?utf-8?q?Llu=C3=ADs_Vilanova?=\n\t, \tRichard Henderson ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Lluís Vilanova \n\nIncrementally paves the way towards using the generic instruction translation\nloop.\n\nSigned-off-by: Lluís Vilanova \nReviewed-by: Emilio G. Cota \nReviewed-by: Richard Henderson \nMessage-Id: <150002243497.22386.8888053391875656102.stgit@frigg.lan>\n[rth: Move tb->size computation and use that result.]\nSigned-off-by: Richard Henderson \n---\n target/i386/translate.c | 32 +++++++++++++++++++-------------\n 1 file changed, 19 insertions(+), 13 deletions(-)","diff":"diff --git a/target/i386/translate.c b/target/i386/translate.c\nindex 9872f84a03..ad4b2735f4 100644\n--- a/target/i386/translate.c\n+++ b/target/i386/translate.c\n@@ -8518,6 +8518,21 @@ static void i386_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu)\n }\n }\n \n+static void i386_tr_disas_log(const DisasContextBase *dcbase,\n+ CPUState *cpu)\n+{\n+ DisasContext *dc = container_of(dcbase, DisasContext, base);\n+ int disas_flags = !dc->code32;\n+\n+ qemu_log(\"IN: %s\\n\", lookup_symbol(dc->base.pc_first));\n+#ifdef TARGET_X86_64\n+ if (dc->code64) {\n+ disas_flags = 2;\n+ }\n+#endif\n+ log_target_disas(cpu, dc->base.pc_first, dc->base.tb->size, disas_flags);\n+}\n+\n /* generate intermediate code for basic block 'tb'. */\n void gen_intermediate_code(CPUState *cs, TranslationBlock *tb)\n {\n@@ -8593,28 +8608,19 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb)\n gen_io_end();\n gen_tb_end(tb, num_insns);\n \n+ tb->size = dc->base.pc_next - dc->base.pc_first;\n+ tb->icount = num_insns;\n+\n #ifdef DEBUG_DISAS\n if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)\n && qemu_log_in_addr_range(dc->base.pc_first)) {\n- int disas_flags;\n qemu_log_lock();\n qemu_log(\"----------------\\n\");\n- qemu_log(\"IN: %s\\n\", lookup_symbol(dc->base.pc_first));\n-#ifdef TARGET_X86_64\n- if (dc->code64)\n- disas_flags = 2;\n- else\n-#endif\n- disas_flags = !dc->code32;\n- log_target_disas(cs, dc->base.pc_first, dc->base.pc_next - dc->base.pc_first,\n- disas_flags);\n+ i386_tr_disas_log(&dc->base, cs);\n qemu_log(\"\\n\");\n qemu_log_unlock();\n }\n #endif\n-\n- tb->size = dc->base.pc_next - dc->base.pc_first;\n- tb->icount = num_insns;\n }\n \n void restore_state_to_opc(CPUX86State *env, TranslationBlock *tb,\n","prefixes":["PULL","13/32"]}