{"id":810699,"url":"http://patchwork.ozlabs.org/api/1.2/patches/810699/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906160612.22769-13-richard.henderson@linaro.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/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-13-richard.henderson@linaro.org>","list_archive_url":null,"date":"2017-09-06T16:05:52","name":"[PULL,12/32] target/i386: [tcg] Port to tb_stop","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"5d4e47e4359111089a7ed32e75ab94afa13b3efb","submitter":{"id":72104,"url":"http://patchwork.ozlabs.org/api/1.2/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-13-richard.henderson@linaro.org/mbox/","series":[{"id":1847,"url":"http://patchwork.ozlabs.org/api/1.2/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/810699/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810699/checks/","tags":{},"related":[],"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","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=<UNKNOWN>)","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=\"VTv20rXA\"; 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 3xnTBc2zJdz9s7F\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu,  7 Sep 2017 02:12:40 +1000 (AEST)","from localhost ([::1]:36977 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dpcwQ-0004kk-CJ\n\tfor incoming@patchwork.ozlabs.org; Wed, 06 Sep 2017 12:12:38 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:41663)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <richard.henderson@linaro.org>) id 1dpcqX-0008SX-Ie\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 12:06:34 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <richard.henderson@linaro.org>) id 1dpcqW-00021w-Ar\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 12:06:33 -0400","from mail-pg0-x22d.google.com ([2607:f8b0:400e:c05::22d]:34479)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from <richard.henderson@linaro.org>)\n\tid 1dpcqW-00020a-3s\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 12:06:32 -0400","by mail-pg0-x22d.google.com with SMTP id q68so157402pgq.1\n\tfor <qemu-devel@nongnu.org>; Wed, 06 Sep 2017 09:06:32 -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.29\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tWed, 06 Sep 2017 09:06:29 -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=/hs5DJ5ZOYzeGcPj2CaJWFBYCthdShVyhxl4UMKX3/s=;\n\tb=VTv20rXAv/yU273uHMQMIJ4c6Xibi4EyV9LUmMU9j+GYhUqW/5NA+3P0tLtqQYz/KQ\n\tTAEIqk/0mPEZKtRKixH5YjRavHPs/NnSMDNaSBHTif1MeoROL38naH6AgJr5X0llg8wF\n\tE+1gmcGdO6d4fZWMGSbSFVbVOyaG5s9NChW7c=","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=/hs5DJ5ZOYzeGcPj2CaJWFBYCthdShVyhxl4UMKX3/s=;\n\tb=DKtm7Xhy2OD/z0WVLHHZI50+0gk6k4etgJ4/nmPbVbiovGiLK3l+ogPK6uj+5aMp8o\n\td9gm37vbIU+HfS0xRgflmgWNQ3y27FMPNNrGPw8z0itut8l/tGGi3bEeyUA7hofeuVyz\n\tx/nyN3v1NcHtmbOzHU1n3Eq7mJNFDBjMGgfG0yATYuKEl/fTio5wMvZB7+lQOaUyssy+\n\tR3pU69L0NFKZkVXMy6F1kC1pHoxNSjzhRCPhuvf/gzp8uNSnjJMdpm52jHtgNUyT4TX6\n\tJNtlq+Pgr/E4SERsHJDZk3cHMNPBhJp3OX8h8Qt/MIHJrPbqNIXHR7A4z9mMgSUNSA81\n\tTeTw==","X-Gm-Message-State":"AHPjjUg9YIX6CuTnZ70C5T9Ksx7Wqs2p50QQ4UuiAFHC10C/nqjQXmfe\n\thG3Ev9kuWI+JOLkP7tqdmw==","X-Google-Smtp-Source":"ADKCNb6ZELyvx9oCnZxMuzVBk/TSbDtonY5gWURJtBwxCGqXNu2EIXgz3hvSbkByVOnzRgJWZzifwQ==","X-Received":"by 10.99.121.194 with SMTP id u185mr8433851pgc.314.1504713990798;\n\tWed, 06 Sep 2017 09:06:30 -0700 (PDT)","From":"Richard Henderson <richard.henderson@linaro.org>","To":"qemu-devel@nongnu.org","Date":"Wed,  6 Sep 2017 09:05:52 -0700","Message-Id":"<20170906160612.22769-13-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::22d","Subject":"[Qemu-devel] [PULL 12/32] target/i386: [tcg] Port to tb_stop","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"peter.maydell@linaro.org, =?utf-8?q?Llu=C3=ADs_Vilanova?=\n\t<vilanova@ac.upc.edu>, \tRichard Henderson <rth@twiddle.net>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"},"content":"From: Lluís Vilanova <vilanova@ac.upc.edu>\n\nIncrementally paves the way towards using the generic instruction translation\nloop.\n\nSigned-off-by: Lluís Vilanova <vilanova@ac.upc.edu>\nReviewed-by: Emilio G. Cota <cota@braap.org>\nReviewed-by: Richard Henderson <rth@twiddle.net>\nMessage-Id: <150002219289.22386.17959138704858928730.stgit@frigg.lan>\nSigned-off-by: Richard Henderson <rth@twiddle.net>\n---\n target/i386/translate.c | 26 ++++++++++++++------------\n 1 file changed, 14 insertions(+), 12 deletions(-)","diff":"diff --git a/target/i386/translate.c b/target/i386/translate.c\nindex 0f38896f17..9872f84a03 100644\n--- a/target/i386/translate.c\n+++ b/target/i386/translate.c\n@@ -8488,8 +8488,6 @@ static void i386_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu)\n         /* if irq were inhibited with HF_INHIBIT_IRQ_MASK, we clear\n            the flag and abort the translation to give the irqs a\n            chance to happen */\n-        gen_jmp_im(pc_next - dc->cs_base);\n-        gen_eob(dc);\n         dc->base.is_jmp = DISAS_TOO_MANY;\n     } else if ((dc->base.tb->cflags & CF_USE_ICOUNT)\n                && ((dc->base.pc_next & TARGET_PAGE_MASK)\n@@ -8502,18 +8500,24 @@ static void i386_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu)\n            If current instruction already crossed the bound - it's ok,\n            because an exception hasn't stopped this code.\n          */\n-        gen_jmp_im(pc_next - dc->cs_base);\n-        gen_eob(dc);\n         dc->base.is_jmp = DISAS_TOO_MANY;\n     } else if ((pc_next - dc->base.pc_first) >= (TARGET_PAGE_SIZE - 32)) {\n-        gen_jmp_im(pc_next - dc->cs_base);\n-        gen_eob(dc);\n         dc->base.is_jmp = DISAS_TOO_MANY;\n     }\n \n     dc->base.pc_next = pc_next;\n }\n \n+static void i386_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu)\n+{\n+    DisasContext *dc = container_of(dcbase, DisasContext, base);\n+\n+    if (dc->base.is_jmp == DISAS_TOO_MANY) {\n+        gen_jmp_im(dc->base.pc_next - dc->cs_base);\n+        gen_eob(dc);\n+    }\n+}\n+\n /* generate intermediate code for basic block 'tb'.  */\n void gen_intermediate_code(CPUState *cs, TranslationBlock *tb)\n {\n@@ -8570,23 +8574,21 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb)\n         /* if single step mode, we generate only one instruction and\n            generate an exception */\n         if (dc->base.singlestep_enabled) {\n-            gen_jmp_im(dc->base.pc_next - dc->cs_base);\n-            gen_eob(dc);\n+            dc->base.is_jmp = DISAS_TOO_MANY;\n             break;\n         }\n         /* if too long translation, stop generation too */\n         if (tcg_op_buf_full() ||\n             num_insns >= max_insns) {\n-            gen_jmp_im(dc->base.pc_next - dc->cs_base);\n-            gen_eob(dc);\n+            dc->base.is_jmp = DISAS_TOO_MANY;\n             break;\n         }\n         if (singlestep) {\n-            gen_jmp_im(dc->base.pc_next - dc->cs_base);\n-            gen_eob(dc);\n+            dc->base.is_jmp = DISAS_TOO_MANY;\n             break;\n         }\n     }\n+    i386_tr_tb_stop(&dc->base, cs);\n     if (tb->cflags & CF_LAST_IO)\n         gen_io_end();\n     gen_tb_end(tb, num_insns);\n","prefixes":["PULL","12/32"]}