From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42978) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1apNBS-0002ik-5z for qemu-devel@nongnu.org; Sun, 10 Apr 2016 17:46:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1apNBR-0002xB-77 for qemu-devel@nongnu.org; Sun, 10 Apr 2016 17:46:18 -0400 Received: from mail-lf0-x22b.google.com ([2a00:1450:4010:c07::22b]:34829) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1apNBQ-0002x5-VY for qemu-devel@nongnu.org; Sun, 10 Apr 2016 17:46:17 -0400 Received: by mail-lf0-x22b.google.com with SMTP id c126so133730192lfb.2 for ; Sun, 10 Apr 2016 14:46:16 -0700 (PDT) From: Sergey Fedorov Date: Mon, 11 Apr 2016 00:45:29 +0300 Message-Id: <1460324732-30330-8-git-send-email-sergey.fedorov@linaro.org> In-Reply-To: <1460324732-30330-1-git-send-email-sergey.fedorov@linaro.org> References: <1460324732-30330-1-git-send-email-sergey.fedorov@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v3 07/10] tcg: Extract removing of jumps to TB from tb_phys_invalidate() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Sergey Fedorov , Paolo Bonzini , Peter Crosthwaite , Richard Henderson , Sergey Fedorov From: Sergey Fedorov Move the code for removing jumps to a TB out of tb_phys_invalidate() to a separate static inline function tb_jmp_unlink(). This simplifies tb_phys_invalidate() and improves code structure. Signed-off-by: Sergey Fedorov Signed-off-by: Sergey Fedorov Reviewed-by: Alex Bennée --- translate-all.c | 44 ++++++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/translate-all.c b/translate-all.c index c2a800a7d8a0..2d82ce5735a1 100644 --- a/translate-all.c +++ b/translate-all.c @@ -961,14 +961,37 @@ static inline void tb_reset_jump(TranslationBlock *tb, int n) tb_set_jmp_target(tb, n, addr); } +/* remove any jumps to the TB */ +static inline void tb_jmp_unlink(TranslationBlock *tb) +{ + uintptr_t tb1, tb2; + unsigned int n1; + + tb1 = tb->jmp_list_first; + for (;;) { + TranslationBlock *tmp_tb; + n1 = tb1 & 3; + if (n1 == 2) { + break; + } + tmp_tb = (TranslationBlock *)(tb1 & ~3); + tb2 = tmp_tb->jmp_list_next[n1]; + tb_reset_jump(tmp_tb, n1); + tmp_tb->jmp_list_next[n1] = (uintptr_t)NULL; + tb1 = tb2; + } + + assert(((uintptr_t)tb & 3) == 0); + tb->jmp_list_first = (uintptr_t)tb | 2; /* fail safe */ +} + /* invalidate one TB */ void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr) { CPUState *cpu; PageDesc *p; - unsigned int h, n1; + unsigned int h; tb_page_addr_t phys_pc; - uintptr_t tb1, tb2; /* remove the TB from the hash list */ phys_pc = tb->page_addr[0] + (tb->pc & ~TARGET_PAGE_MASK); @@ -1002,22 +1025,7 @@ void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr) tb_remove_from_jmp_list(tb, 1); /* suppress any remaining jumps to this TB */ - tb1 = tb->jmp_list_first; - for (;;) { - TranslationBlock *tmp_tb; - n1 = tb1 & 3; - if (n1 == 2) { - break; - } - tmp_tb = (TranslationBlock *)(tb1 & ~3); - tb2 = tmp_tb->jmp_list_next[n1]; - tb_reset_jump(tmp_tb, n1); - tmp_tb->jmp_list_next[n1] = (uintptr_t)NULL; - tb1 = tb2; - } - - assert(((uintptr_t)tb & 3) == 0); - tb->jmp_list_first = (uintptr_t)tb | 2; /* fail safe */ + tb_jmp_unlink(tb); tcg_ctx.tb_ctx.tb_phys_invalidate_count++; } -- 2.8.1