From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45346) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajDGB-00006M-IC for qemu-devel@nongnu.org; Thu, 24 Mar 2016 17:57:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ajDGA-0008Sy-HF for qemu-devel@nongnu.org; Thu, 24 Mar 2016 17:57:43 -0400 Received: from mail-lb0-x22c.google.com ([2a00:1450:4010:c04::22c]:35407) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajDGA-0008Sp-9T for qemu-devel@nongnu.org; Thu, 24 Mar 2016 17:57:42 -0400 Received: by mail-lb0-x22c.google.com with SMTP id bc4so39330399lbc.2 for ; Thu, 24 Mar 2016 14:57:42 -0700 (PDT) From: sergey.fedorov@linaro.org Date: Fri, 25 Mar 2016 00:56:43 +0300 Message-Id: <1458856607-3275-5-git-send-email-sergey.fedorov@linaro.org> In-Reply-To: <1458856607-3275-1-git-send-email-sergey.fedorov@linaro.org> References: <1458856607-3275-1-git-send-email-sergey.fedorov@linaro.org> Subject: [Qemu-devel] [PATCH v2 4/8] tcg: Init TB's direct jumps before making it visible List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Sergey Fedorov , Peter Crosthwaite , Paolo Bonzini , Sergey Fedorov , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson From: Sergey Fedorov Initialize TB's direct jump list data fields and reset the jumps before tb_link_page() puts it into the physical hash table and the physical page list. So TB is completely initialized before it becomes visible. Signed-off-by: Sergey Fedorov Signed-off-by: Sergey Fedorov --- Notes: Changes in v2: * Tweaked a comment translate-all.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/translate-all.c b/translate-all.c index e54afb89e414..6e4d9de06fa0 100644 --- a/translate-all.c +++ b/translate-all.c @@ -1132,19 +1132,6 @@ static void tb_link_page(TranslationBlock *tb, tb_page_addr_t phys_pc, tb->page_addr[1] = -1; } - assert(((uintptr_t)tb & 3) == 0); - tb->jmp_list_first = (uintptr_t)tb | 2; - tb->jmp_list_next[0] = (uintptr_t)NULL; - tb->jmp_list_next[1] = (uintptr_t)NULL; - - /* init original jump addresses */ - if (tb->jmp_reset_offset[0] != TB_JMP_RESET_OFFSET_INVALID) { - tb_reset_jump(tb, 0); - } - if (tb->jmp_reset_offset[1] != TB_JMP_RESET_OFFSET_INVALID) { - tb_reset_jump(tb, 1); - } - #ifdef DEBUG_TB_CHECK tb_page_check(); #endif @@ -1252,6 +1239,20 @@ TranslationBlock *tb_gen_code(CPUState *cpu, ROUND_UP((uintptr_t)gen_code_buf + gen_code_size + search_size, CODE_GEN_ALIGN); + /* init jump list */ + assert(((uintptr_t)tb & 3) == 0); + tb->jmp_list_first = (uintptr_t)tb | 2; + tb->jmp_list_next[0] = (uintptr_t)NULL; + tb->jmp_list_next[1] = (uintptr_t)NULL; + + /* init original jump addresses wich has been set during tcg_gen_code() */ + if (tb->jmp_reset_offset[0] != TB_JMP_RESET_OFFSET_INVALID) { + tb_reset_jump(tb, 0); + } + if (tb->jmp_reset_offset[1] != TB_JMP_RESET_OFFSET_INVALID) { + tb_reset_jump(tb, 1); + } + /* check next page if needed */ virt_page2 = (pc + tb->size - 1) & TARGET_PAGE_MASK; phys_page2 = -1; -- 2.7.3