Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/810693/?format=api
{ "id": 810693, "url": "http://patchwork.ozlabs.org/api/patches/810693/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906160612.22769-5-richard.henderson@linaro.org/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "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-5-richard.henderson@linaro.org>", "list_archive_url": null, "date": "2017-09-06T16:05:44", "name": "[PULL,04/32] target: [tcg] Use a generic enum for DISAS_ values", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "a6544f5aa048d3755c02922a0890085ad65e4b9a", "submitter": { "id": 72104, "url": "http://patchwork.ozlabs.org/api/people/72104/?format=api", "name": "Richard Henderson", "email": "richard.henderson@linaro.org" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906160612.22769-5-richard.henderson@linaro.org/mbox/", "series": [ { "id": 1847, "url": "http://patchwork.ozlabs.org/api/series/1847/?format=api", "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/810693/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/810693/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=\"eZ/rXieZ\"; 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 3xnT4d1L9bz9t2d\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 7 Sep 2017 02:07:29 +1000 (AEST)", "from localhost ([::1]:36960 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 1dpcrP-0008Uh-7Z\n\tfor incoming@patchwork.ozlabs.org; Wed, 06 Sep 2017 12:07:27 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:41599)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <richard.henderson@linaro.org>) id 1dpcqS-0008O1-In\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 1dpcqL-0001c1-Fd\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 12:06:28 -0400", "from mail-pf0-x22f.google.com ([2607:f8b0:400e:c00::22f]:35362)\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 1dpcqL-0001bV-6n\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 12:06:21 -0400", "by mail-pf0-x22f.google.com with SMTP id g13so13482247pfm.2\n\tfor <qemu-devel@nongnu.org>; Wed, 06 Sep 2017 09:06:21 -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.18\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tWed, 06 Sep 2017 09:06:18 -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=KGLbiRgGM9Mz5zskuosarjAY1Dtzs6FkBr2PJb4ER/8=;\n\tb=eZ/rXieZAjS8ur6a7W0VGqdXGvYotGdfpHNKjVpm7zFuPejuGXZR6FspB7LYKje0Uj\n\tZBxRnS8GvyFdu78YzRInj80F6GlF891ON5dTbv358w1J924XatYVc09NaR692Nnx3g7o\n\tdDGLRKVGYxRxDpFdWRHEF/LhG18Be7o6LTwdU=", "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=KGLbiRgGM9Mz5zskuosarjAY1Dtzs6FkBr2PJb4ER/8=;\n\tb=aRvCDeH/H1stiPrM82+YVW7FJWhofoO/Y74BrmSoimIi6VBchxCG2CxDhtteZe+oDi\n\tOXaah1BlMpRl02rOXd6fTSZf3zNzl7DI5tkDzuYPojShZhL0DMDz7UTVYLDercrnBqmd\n\tQU97iQL1wWhVTz5pge40TPor6RiJ6eKCDxRuc3+mLQ0rlFBqb8hPTYzd7s4fx1kmdYPI\n\tvUSuGjgrIldx10+Hw9hNjhYVHYvjB4IKtl8TtBAQoE+rHvuJdfTepoJ40pmHe6uOfdoR\n\tTPJjz4XYGG05Z8FQy2Ac9NrWig4mVqkISoa/tnOGlxcIOsVq3Cck8LEGtqCbPOf1ikmW\n\t7q2w==", "X-Gm-Message-State": "AHPjjUia3RbsXh+468gLXw+vBilhnjeqxsFWZahBXeUcBHs1NAFZw7wu\n\tukx5f5sWJIkLKu/OYMYbSw==", "X-Google-Smtp-Source": "ADKCNb4tR+Xlfo6HotxXVxzi+L49UV0cgopjfs0W3o7MfvQFUihdZ71PbzImBvDfBqQPuwbcr5gs+A==", "X-Received": "by 10.101.75.136 with SMTP id t8mr7867259pgq.359.1504713979834; \n\tWed, 06 Sep 2017 09:06:19 -0700 (PDT)", "From": "Richard Henderson <richard.henderson@linaro.org>", "To": "qemu-devel@nongnu.org", "Date": "Wed, 6 Sep 2017 09:05:44 -0700", "Message-Id": "<20170906160612.22769-5-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:c00::22f", "Subject": "[Qemu-devel] [PULL 04/32] target: [tcg] Use a generic enum for\n\tDISAS_ values", "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\nUsed later. An enum makes expected values explicit and\nbounds the value space of switches.\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: <150002049746.22386.2316077281615710615.stgit@frigg.lan>\nSigned-off-by: Richard Henderson <rth@twiddle.net>\n---\n include/exec/exec-all.h | 30 ------------------------------\n include/exec/translator.h | 40 ++++++++++++++++++++++++++++++++++++++++\n target/arm/translate.h | 23 ++++++++++++++---------\n target/arm/translate.c | 2 +-\n target/cris/translate.c | 7 ++++++-\n target/i386/translate.c | 3 +--\n target/lm32/translate.c | 6 ++++++\n target/m68k/translate.c | 7 ++++++-\n target/microblaze/translate.c | 6 ++++++\n target/nios2/translate.c | 6 ++++++\n target/openrisc/translate.c | 6 ++++++\n target/s390x/translate.c | 3 ++-\n target/unicore32/translate.c | 7 ++++++-\n target/xtensa/translate.c | 4 ++++\n 14 files changed, 104 insertions(+), 46 deletions(-)\n create mode 100644 include/exec/translator.h", "diff": "diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h\nindex b434988979..ff8fbe423d 100644\n--- a/include/exec/exec-all.h\n+++ b/include/exec/exec-all.h\n@@ -35,36 +35,6 @@ typedef abi_ulong tb_page_addr_t;\n typedef ram_addr_t tb_page_addr_t;\n #endif\n \n-/* DisasContext is_jmp field values\n- *\n- * is_jmp starts as DISAS_NEXT. The translator will keep processing\n- * instructions until an exit condition is reached. If we reach the\n- * exit condition and is_jmp is still DISAS_NEXT (because of some\n- * other condition) we simply \"jump\" to the next address.\n- * The remaining exit cases are:\n- *\n- * DISAS_JUMP - Only the PC was modified dynamically (e.g computed)\n- * DISAS_TB_JUMP - Only the PC was modified statically (e.g. branch)\n- *\n- * In these cases as long as the PC is updated we can chain to the\n- * next TB either by exiting the loop or looking up the next TB via\n- * the loookup helper.\n- *\n- * DISAS_UPDATE - CPU State was modified dynamically\n- *\n- * This covers any other CPU state which necessities us exiting the\n- * TCG code to the main run-loop. Typically this includes anything\n- * that might change the interrupt state.\n- *\n- * Individual translators may define additional exit cases to deal\n- * with per-target special conditions.\n- */\n-#define DISAS_NEXT 0 /* next instruction can be analyzed */\n-#define DISAS_JUMP 1 /* only pc was modified dynamically */\n-#define DISAS_TB_JUMP 2 /* only pc was modified statically */\n-#define DISAS_UPDATE 3 /* cpu state was modified dynamically */\n-#define DISAS_NORETURN 4 /* the tb has already been exited */\n-\n #include \"qemu/log.h\"\n \n void gen_intermediate_code(CPUState *cpu, struct TranslationBlock *tb);\ndiff --git a/include/exec/translator.h b/include/exec/translator.h\nnew file mode 100644\nindex 0000000000..b51b8f8a4e\n--- /dev/null\n+++ b/include/exec/translator.h\n@@ -0,0 +1,40 @@\n+/*\n+ * Generic intermediate code generation.\n+ *\n+ * Copyright (C) 2016-2017 Lluís Vilanova <vilanova@ac.upc.edu>\n+ *\n+ * This work is licensed under the terms of the GNU GPL, version 2 or later.\n+ * See the COPYING file in the top-level directory.\n+ */\n+\n+#ifndef EXEC__TRANSLATOR_H\n+#define EXEC__TRANSLATOR_H\n+\n+/**\n+ * DisasJumpType:\n+ * @DISAS_NEXT: Next instruction in program order.\n+ * @DISAS_TOO_MANY: Too many instructions translated.\n+ * @DISAS_NORETURN: Following code is dead.\n+ * @DISAS_TARGET_*: Start of target-specific conditions.\n+ *\n+ * What instruction to disassemble next.\n+ */\n+typedef enum DisasJumpType {\n+ DISAS_NEXT,\n+ DISAS_TOO_MANY,\n+ DISAS_NORETURN,\n+ DISAS_TARGET_0,\n+ DISAS_TARGET_1,\n+ DISAS_TARGET_2,\n+ DISAS_TARGET_3,\n+ DISAS_TARGET_4,\n+ DISAS_TARGET_5,\n+ DISAS_TARGET_6,\n+ DISAS_TARGET_7,\n+ DISAS_TARGET_8,\n+ DISAS_TARGET_9,\n+ DISAS_TARGET_10,\n+ DISAS_TARGET_11,\n+} DisasJumpType;\n+\n+#endif /* EXEC__TRANSLATOR_H */\ndiff --git a/target/arm/translate.h b/target/arm/translate.h\nindex 90f64d9716..1eb432dc2c 100644\n--- a/target/arm/translate.h\n+++ b/target/arm/translate.h\n@@ -1,6 +1,9 @@\n #ifndef TARGET_ARM_TRANSLATE_H\n #define TARGET_ARM_TRANSLATE_H\n \n+#include \"exec/translator.h\"\n+\n+\n /* internal defines */\n typedef struct DisasContext {\n target_ulong pc;\n@@ -119,29 +122,31 @@ static void disas_set_insn_syndrome(DisasContext *s, uint32_t syn)\n s->insn_start_idx = 0;\n }\n \n-/* target-specific extra values for is_jmp */\n+/* is_jmp field values */\n+#define DISAS_JUMP DISAS_TARGET_0 /* only pc was modified dynamically */\n+#define DISAS_UPDATE DISAS_TARGET_1 /* cpu state was modified dynamically */\n /* These instructions trap after executing, so the A32/T32 decoder must\n * defer them until after the conditional execution state has been updated.\n * WFI also needs special handling when single-stepping.\n */\n-#define DISAS_WFI 5\n-#define DISAS_SWI 6\n+#define DISAS_WFI DISAS_TARGET_2\n+#define DISAS_SWI DISAS_TARGET_3\n /* WFE */\n-#define DISAS_WFE 7\n-#define DISAS_HVC 8\n-#define DISAS_SMC 9\n-#define DISAS_YIELD 10\n+#define DISAS_WFE DISAS_TARGET_4\n+#define DISAS_HVC DISAS_TARGET_5\n+#define DISAS_SMC DISAS_TARGET_6\n+#define DISAS_YIELD DISAS_TARGET_7\n /* M profile branch which might be an exception return (and so needs\n * custom end-of-TB code)\n */\n-#define DISAS_BX_EXCRET 11\n+#define DISAS_BX_EXCRET DISAS_TARGET_8\n /* For instructions which want an immediate exit to the main loop,\n * as opposed to attempting to use lookup_and_goto_ptr. Unlike\n * DISAS_UPDATE this doesn't write the PC on exiting the translation\n * loop so you need to ensure something (gen_a64_set_pc_im or runtime\n * helper) has done so before we reach return from cpu_tb_exec.\n */\n-#define DISAS_EXIT 12\n+#define DISAS_EXIT DISAS_TARGET_9\n \n #ifdef TARGET_AARCH64\n void a64_translate_init(void);\ndiff --git a/target/arm/translate.c b/target/arm/translate.c\nindex b14329dc27..0c39c2b996 100644\n--- a/target/arm/translate.c\n+++ b/target/arm/translate.c\n@@ -4174,7 +4174,7 @@ static void gen_goto_tb(DisasContext *s, int n, target_ulong dest)\n gen_set_pc_im(s, dest);\n gen_goto_ptr();\n }\n- s->is_jmp = DISAS_TB_JUMP;\n+ s->is_jmp = DISAS_NORETURN;\n }\n \n static inline void gen_jmp (DisasContext *s, uint32_t dest)\ndiff --git a/target/cris/translate.c b/target/cris/translate.c\nindex 12b96eb68f..38a999e6f1 100644\n--- a/target/cris/translate.c\n+++ b/target/cris/translate.c\n@@ -31,6 +31,7 @@\n #include \"exec/helper-proto.h\"\n #include \"mmu.h\"\n #include \"exec/cpu_ldst.h\"\n+#include \"exec/translator.h\"\n #include \"crisv32-decode.h\"\n \n #include \"exec/helper-gen.h\"\n@@ -50,7 +51,11 @@\n #define BUG() (gen_BUG(dc, __FILE__, __LINE__))\n #define BUG_ON(x) ({if (x) BUG();})\n \n-#define DISAS_SWI 5\n+/* is_jmp field values */\n+#define DISAS_JUMP DISAS_TARGET_0 /* only pc was modified dynamically */\n+#define DISAS_UPDATE DISAS_TARGET_1 /* cpu state was modified dynamically */\n+#define DISAS_TB_JUMP DISAS_TARGET_2 /* only pc was modified statically */\n+#define DISAS_SWI DISAS_TARGET_3\n \n /* Used by the decoder. */\n #define EXTRACT_FIELD(src, start, end) \\\ndiff --git a/target/i386/translate.c b/target/i386/translate.c\nindex 26e8002433..a0d8788c57 100644\n--- a/target/i386/translate.c\n+++ b/target/i386/translate.c\n@@ -24,6 +24,7 @@\n #include \"exec/exec-all.h\"\n #include \"tcg-op.h\"\n #include \"exec/cpu_ldst.h\"\n+#include \"exec/translator.h\"\n \n #include \"exec/helper-proto.h\"\n #include \"exec/helper-gen.h\"\n@@ -31,8 +32,6 @@\n #include \"trace-tcg.h\"\n #include \"exec/log.h\"\n \n-#define DISAS_TOO_MANY 5\n-\n #define PREFIX_REPZ 0x01\n #define PREFIX_REPNZ 0x02\n #define PREFIX_LOCK 0x04\ndiff --git a/target/lm32/translate.c b/target/lm32/translate.c\nindex f68f372f15..65bc9c0bf6 100644\n--- a/target/lm32/translate.c\n+++ b/target/lm32/translate.c\n@@ -22,6 +22,7 @@\n #include \"disas/disas.h\"\n #include \"exec/helper-proto.h\"\n #include \"exec/exec-all.h\"\n+#include \"exec/translator.h\"\n #include \"tcg-op.h\"\n \n #include \"exec/cpu_ldst.h\"\n@@ -47,6 +48,11 @@\n \n #define MEM_INDEX 0\n \n+/* is_jmp field values */\n+#define DISAS_JUMP DISAS_TARGET_0 /* only pc was modified dynamically */\n+#define DISAS_UPDATE DISAS_TARGET_1 /* cpu state was modified dynamically */\n+#define DISAS_TB_JUMP DISAS_TARGET_2 /* only pc was modified statically */\n+\n static TCGv_env cpu_env;\n static TCGv cpu_R[32];\n static TCGv cpu_pc;\ndiff --git a/target/m68k/translate.c b/target/m68k/translate.c\nindex be24355080..d738f32f9c 100644\n--- a/target/m68k/translate.c\n+++ b/target/m68k/translate.c\n@@ -25,6 +25,7 @@\n #include \"tcg-op.h\"\n #include \"qemu/log.h\"\n #include \"exec/cpu_ldst.h\"\n+#include \"exec/translator.h\"\n \n #include \"exec/helper-proto.h\"\n #include \"exec/helper-gen.h\"\n@@ -173,7 +174,11 @@ static void do_writebacks(DisasContext *s)\n }\n }\n \n-#define DISAS_JUMP_NEXT 4\n+/* is_jmp field values */\n+#define DISAS_JUMP DISAS_TARGET_0 /* only pc was modified dynamically */\n+#define DISAS_UPDATE DISAS_TARGET_1 /* cpu state was modified dynamically */\n+#define DISAS_TB_JUMP DISAS_TARGET_2 /* only pc was modified statically */\n+#define DISAS_JUMP_NEXT DISAS_TARGET_3\n \n #if defined(CONFIG_USER_ONLY)\n #define IS_USER(s) 1\ndiff --git a/target/microblaze/translate.c b/target/microblaze/translate.c\nindex 83e2ef4960..067b0878d6 100644\n--- a/target/microblaze/translate.c\n+++ b/target/microblaze/translate.c\n@@ -27,6 +27,7 @@\n #include \"microblaze-decode.h\"\n #include \"exec/cpu_ldst.h\"\n #include \"exec/helper-gen.h\"\n+#include \"exec/translator.h\"\n \n #include \"trace-tcg.h\"\n #include \"exec/log.h\"\n@@ -46,6 +47,11 @@\n #define EXTRACT_FIELD(src, start, end) \\\n (((src) >> start) & ((1 << (end - start + 1)) - 1))\n \n+/* is_jmp field values */\n+#define DISAS_JUMP DISAS_TARGET_0 /* only pc was modified dynamically */\n+#define DISAS_UPDATE DISAS_TARGET_1 /* cpu state was modified dynamically */\n+#define DISAS_TB_JUMP DISAS_TARGET_2 /* only pc was modified statically */\n+\n static TCGv env_debug;\n static TCGv_env cpu_env;\n static TCGv cpu_R[32];\ndiff --git a/target/nios2/translate.c b/target/nios2/translate.c\nindex 8b97d6585f..6b0961837d 100644\n--- a/target/nios2/translate.c\n+++ b/target/nios2/translate.c\n@@ -29,6 +29,12 @@\n #include \"exec/helper-gen.h\"\n #include \"exec/log.h\"\n #include \"exec/cpu_ldst.h\"\n+#include \"exec/translator.h\"\n+\n+/* is_jmp field values */\n+#define DISAS_JUMP DISAS_TARGET_0 /* only pc was modified dynamically */\n+#define DISAS_UPDATE DISAS_TARGET_1 /* cpu state was modified dynamically */\n+#define DISAS_TB_JUMP DISAS_TARGET_2 /* only pc was modified statically */\n \n #define INSTRUCTION_FLG(func, flags) { (func), (flags) }\n #define INSTRUCTION(func) \\\ndiff --git a/target/openrisc/translate.c b/target/openrisc/translate.c\nindex a01413113b..112db1ad0f 100644\n--- a/target/openrisc/translate.c\n+++ b/target/openrisc/translate.c\n@@ -27,6 +27,7 @@\n #include \"qemu/log.h\"\n #include \"qemu/bitops.h\"\n #include \"exec/cpu_ldst.h\"\n+#include \"exec/translator.h\"\n \n #include \"exec/helper-proto.h\"\n #include \"exec/helper-gen.h\"\n@@ -37,6 +38,11 @@\n #define LOG_DIS(str, ...) \\\n qemu_log_mask(CPU_LOG_TB_IN_ASM, \"%08x: \" str, dc->pc, ## __VA_ARGS__)\n \n+/* is_jmp field values */\n+#define DISAS_JUMP DISAS_TARGET_0 /* only pc was modified dynamically */\n+#define DISAS_UPDATE DISAS_TARGET_1 /* cpu state was modified dynamically */\n+#define DISAS_TB_JUMP DISAS_TARGET_2 /* only pc was modified statically */\n+\n typedef struct DisasContext {\n TranslationBlock *tb;\n target_ulong pc;\ndiff --git a/target/s390x/translate.c b/target/s390x/translate.c\nindex 4b0db7b7bd..909b12818d 100644\n--- a/target/s390x/translate.c\n+++ b/target/s390x/translate.c\n@@ -77,7 +77,8 @@ typedef struct {\n } u;\n } DisasCompare;\n \n-#define DISAS_EXCP 4\n+/* is_jmp field values */\n+#define DISAS_EXCP DISAS_TARGET_0\n \n #ifdef DEBUG_INLINE_BRANCHES\n static uint64_t inline_branch_hit[CC_OP_MAX];\ndiff --git a/target/unicore32/translate.c b/target/unicore32/translate.c\nindex 8f30cff932..6c094d59d7 100644\n--- a/target/unicore32/translate.c\n+++ b/target/unicore32/translate.c\n@@ -16,6 +16,7 @@\n #include \"tcg-op.h\"\n #include \"qemu/log.h\"\n #include \"exec/cpu_ldst.h\"\n+#include \"exec/translator.h\"\n \n #include \"exec/helper-proto.h\"\n #include \"exec/helper-gen.h\"\n@@ -45,9 +46,13 @@ typedef struct DisasContext {\n #define IS_USER(s) 1\n #endif\n \n+/* is_jmp field values */\n+#define DISAS_JUMP DISAS_TARGET_0 /* only pc was modified dynamically */\n+#define DISAS_UPDATE DISAS_TARGET_1 /* cpu state was modified dynamically */\n+#define DISAS_TB_JUMP DISAS_TARGET_2 /* only pc was modified statically */\n /* These instructions trap after executing, so defer them until after the\n conditional executions state has been updated. */\n-#define DISAS_SYSCALL 5\n+#define DISAS_SYSCALL DISAS_TARGET_3\n \n static TCGv_env cpu_env;\n static TCGv_i32 cpu_R[32];\ndiff --git a/target/xtensa/translate.c b/target/xtensa/translate.c\nindex f3f0ff589c..d7bf07e8e6 100644\n--- a/target/xtensa/translate.c\n+++ b/target/xtensa/translate.c\n@@ -38,6 +38,7 @@\n #include \"sysemu/sysemu.h\"\n #include \"exec/cpu_ldst.h\"\n #include \"exec/semihost.h\"\n+#include \"exec/translator.h\"\n \n #include \"exec/helper-proto.h\"\n #include \"exec/helper-gen.h\"\n@@ -46,6 +47,9 @@\n #include \"exec/log.h\"\n \n \n+/* is_jmp field values */\n+#define DISAS_UPDATE DISAS_TARGET_0 /* cpu state was modified dynamically */\n+\n typedef struct DisasContext {\n const XtensaConfig *config;\n TranslationBlock *tb;\n", "prefixes": [ "PULL", "04/32" ] }