From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33155) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aszTK-00086h-HM for qemu-devel@nongnu.org; Wed, 20 Apr 2016 17:15:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aszTJ-0004aJ-Fs for qemu-devel@nongnu.org; Wed, 20 Apr 2016 17:15:42 -0400 Received: from mail-lf0-x233.google.com ([2a00:1450:4010:c07::233]:32860) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aszTJ-0004a7-3s for qemu-devel@nongnu.org; Wed, 20 Apr 2016 17:15:41 -0400 Received: by mail-lf0-x233.google.com with SMTP id e190so48943118lfe.0 for ; Wed, 20 Apr 2016 14:15:40 -0700 (PDT) From: Sergey Fedorov Date: Thu, 21 Apr 2016 00:15:19 +0300 Message-Id: <1461186921-14977-9-git-send-email-sergey.fedorov@linaro.org> In-Reply-To: <1461186921-14977-1-git-send-email-sergey.fedorov@linaro.org> References: <1461186921-14977-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 v4 08/10] tcg: Clean up tb_jmp_unlink() 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 Unify the code of this function with tb_jmp_remove_from_list(). Making these functions similar improves their readability. Also this could be a step towards making this function thread-safe. Signed-off-by: Sergey Fedorov Signed-off-by: Sergey Fedorov Reviewed-by: Alex Bennée --- Changes in v2: * Tweaked a comment to better describe jmp_list_{next|first} usage * Eliminated duplicate dereference of 'ptb' in tb_jmp_unlink() translate-all.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/translate-all.c b/translate-all.c index ce609778c810..b09774b1768b 100644 --- a/translate-all.c +++ b/translate-all.c @@ -964,25 +964,22 @@ static inline void tb_reset_jump(TranslationBlock *tb, int n) /* remove any jumps to the TB */ static inline void tb_jmp_unlink(TranslationBlock *tb) { - uintptr_t tb1, tb2; + TranslationBlock *tb1; + uintptr_t *ptb, ntb; unsigned int n1; - tb1 = tb->jmp_list_first; + ptb = &tb->jmp_list_first; for (;;) { - TranslationBlock *tmp_tb; - n1 = tb1 & 3; + ntb = *ptb; + n1 = ntb & 3; + tb1 = (TranslationBlock *)(ntb & ~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; + tb_reset_jump(tb1, n1); + *ptb = tb1->jmp_list_next[n1]; + tb1->jmp_list_next[n1] = (uintptr_t)NULL; } - - assert(((uintptr_t)tb & 3) == 0); - tb->jmp_list_first = (uintptr_t)tb | 2; /* fail safe */ } /* invalidate one TB */ -- 2.8.1