mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-30 15:00:34 +00:00
translate-all.c: Use tb1->phys_hash_next directly in tb_remove
When tb_remove was first commited at fd6ce8f6
, there were three different
calls pass different names to offsetof. In current codebase, the other two
calls are replaced with tb_page_remove. There is no need to have a general
tb_remove. Omit passing the third parameter and using tb1->phys_hash_next
directly.
Signed-off-by: Chen Wei-Ren <chenwj@iis.sinica.edu.tw>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
parent
b2136140f6
commit
0c884d1659
@ -759,19 +759,17 @@ static void tb_page_check(void)
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* invalidate one TB */
|
static inline void tb_hash_remove(TranslationBlock **ptb, TranslationBlock *tb)
|
||||||
static inline void tb_remove(TranslationBlock **ptb, TranslationBlock *tb,
|
|
||||||
int next_offset)
|
|
||||||
{
|
{
|
||||||
TranslationBlock *tb1;
|
TranslationBlock *tb1;
|
||||||
|
|
||||||
for (;;) {
|
for (;;) {
|
||||||
tb1 = *ptb;
|
tb1 = *ptb;
|
||||||
if (tb1 == tb) {
|
if (tb1 == tb) {
|
||||||
*ptb = *(TranslationBlock **)((char *)tb1 + next_offset);
|
*ptb = tb1->phys_hash_next;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
ptb = (TranslationBlock **)((char *)tb1 + next_offset);
|
ptb = &tb1->phys_hash_next;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -828,6 +826,7 @@ 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_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)
|
void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr)
|
||||||
{
|
{
|
||||||
CPUArchState *env;
|
CPUArchState *env;
|
||||||
@ -839,8 +838,7 @@ void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr)
|
|||||||
/* remove the TB from the hash list */
|
/* remove the TB from the hash list */
|
||||||
phys_pc = tb->page_addr[0] + (tb->pc & ~TARGET_PAGE_MASK);
|
phys_pc = tb->page_addr[0] + (tb->pc & ~TARGET_PAGE_MASK);
|
||||||
h = tb_phys_hash_func(phys_pc);
|
h = tb_phys_hash_func(phys_pc);
|
||||||
tb_remove(&tb_phys_hash[h], tb,
|
tb_hash_remove(&tb_phys_hash[h], tb);
|
||||||
offsetof(TranslationBlock, phys_hash_next));
|
|
||||||
|
|
||||||
/* remove the TB from the page list */
|
/* remove the TB from the page list */
|
||||||
if (tb->page_addr[0] != page_addr) {
|
if (tb->page_addr[0] != page_addr) {
|
||||||
|
Loading…
Reference in New Issue
Block a user