From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52967) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agYI6-0003Qc-U7 for qemu-devel@nongnu.org; Thu, 17 Mar 2016 09:48:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1agYI3-0008Jp-N6 for qemu-devel@nongnu.org; Thu, 17 Mar 2016 09:48:42 -0400 Received: from mail-lf0-x229.google.com ([2a00:1450:4010:c07::229]:33876) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agYI3-0008Jf-FP for qemu-devel@nongnu.org; Thu, 17 Mar 2016 09:48:39 -0400 Received: by mail-lf0-x229.google.com with SMTP id e138so41677655lfe.1 for ; Thu, 17 Mar 2016 06:48:39 -0700 (PDT) From: sergey.fedorov@linaro.org Date: Thu, 17 Mar 2016 16:46:20 +0300 Message-Id: <1458222382-6498-4-git-send-email-sergey.fedorov@linaro.org> In-Reply-To: <1458222382-6498-1-git-send-email-sergey.fedorov@linaro.org> References: <1458222382-6498-1-git-send-email-sergey.fedorov@linaro.org> Subject: [Qemu-devel] [PATCH 3/5] tcg: always keep jump target and tb->jmp_next consistent List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Sergey Fedorov , Richard Henderson , Peter Crosthwaite , Sergey Fedorov , Paolo Bonzini From: Paolo Bonzini Simple code simplification. Signed-off-by: Paolo Bonzini Signed-off-by: Sergey Fedorov --- translate-all.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/translate-all.c b/translate-all.c index f17ace1ae899..a1ac9841de48 100644 --- a/translate-all.c +++ b/translate-all.c @@ -927,6 +927,14 @@ static inline void tb_page_remove(TranslationBlock **ptb, TranslationBlock *tb) } } +/* reset the jump entry 'n' of a TB so that it is not chained to + another TB */ +static inline void tb_reset_jump(TranslationBlock *tb, int n) +{ + tb_set_jmp_target(tb, n, (uintptr_t)(tb->tc_ptr + tb->tb_next_offset[n])); + tb->jmp_next[n] = NULL; +} + static inline void tb_jmp_remove(TranslationBlock *tb, int n) { TranslationBlock *tb1, **ptb; @@ -951,18 +959,10 @@ static inline void tb_jmp_remove(TranslationBlock *tb, int n) } /* now we can suppress tb(n) from the list */ *ptb = tb->jmp_next[n]; - - tb->jmp_next[n] = NULL; + tb_reset_jump(tb, n); } } -/* reset the jump entry 'n' of a TB so that it is not chained to - another TB */ -static inline void tb_reset_jump(TranslationBlock *tb, int n) -{ - tb_set_jmp_target(tb, n, (uintptr_t)(tb->tc_ptr + tb->tb_next_offset[n])); -} - /* invalidate one TB */ void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr) { @@ -1013,7 +1013,6 @@ void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr) tb1 = (TranslationBlock *)((uintptr_t)tb1 & ~3); tb2 = tb1->jmp_next[n1]; tb_reset_jump(tb1, n1); - tb1->jmp_next[n1] = NULL; tb1 = tb2; } tb->jmp_first = (TranslationBlock *)((uintptr_t)tb | 2); /* fail safe */ -- 2.7.3