yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-12-24 00:25:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

tcg: Extract removing of jumps to TB from tb_phys_invalidate()

Browse source 
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.

Backports commit 89bba496322d4cf996d42cdd4bb0912231656c3d from qemu
This commit is contained in:
Sergey Fedorov 2018-02-23 21:35:36 -05:00 committed by Lioncash
parent 0d2e91518b
commit c530eb06a9
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
qemu/translate-all.c
View file

@ -1042,6 +1042,30 @@ 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(struct uc_struct *uc,
TranslationBlock *tb, tb_page_addr_t page_addr)
@ -1049,9 +1073,8 @@ void tb_phys_invalidate(struct uc_struct *uc,
TCGContext *tcg_ctx = uc->tcg_ctx;
CPUState *cpu = uc->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);
@ -1083,23 +1106,7 @@ void tb_phys_invalidate(struct uc_struct *uc,
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;
}
/* fail safe */
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++;
}