tcg: Clean up tb_jmp_unlink()

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.

Backports commit f9c5b66f487a04d3747dc6997b1503f9258df945 from qemu
This commit is contained in:
Sergey Fedorov 2018-02-23 21:40:01 -05:00 committed by Lioncash
parent 68272af618
commit 39d262f0d2
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7

View file

@ -1043,25 +1043,22 @@ static inline void tb_reset_jump(TranslationBlock *tb, int n)
/* remove any jumps to the TB */ /* remove any jumps to the TB */
static inline void tb_jmp_unlink(TranslationBlock *tb) static inline void tb_jmp_unlink(TranslationBlock *tb)
{ {
uintptr_t tb1, tb2; TranslationBlock *tb1;
uintptr_t *ptb, ntb;
unsigned int n1; unsigned int n1;
tb1 = tb->jmp_list_first; ptb = &tb->jmp_list_first;
for (;;) { for (;;) {
TranslationBlock *tmp_tb; ntb = *ptb;
n1 = tb1 & 3; n1 = ntb & 3;
tb1 = (TranslationBlock *)(ntb & ~3);
if (n1 == 2) { if (n1 == 2) {
break; break;
} }
tmp_tb = (TranslationBlock *)(tb1 & ~3); tb_reset_jump(tb1, n1);
tb2 = tmp_tb->jmp_list_next[n1]; *ptb = tb1->jmp_list_next[n1];
tb_reset_jump(tmp_tb, n1); tb1->jmp_list_next[n1] = (uintptr_t)NULL;
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 */ /* invalidate one TB */