mirror of https://github.com/proxmox/mirror_qemu
tcg: set up tb->page_addr before insertion
This ensures that if we find the TB on the slow path that tb->page_addr is correctly set before being tested. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Sergey Fedorov <sergey.fedorov@linaro.org> Signed-off-by: Sergey Fedorov <sergey.fedorov@linaro.org> Message-Id: <20160715175852.30749-9-sergey.fedorov@linaro.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>master
parent
6d21e4208f
commit
2e1ae44a4f
|
@ -1131,10 +1131,6 @@ static void tb_link_page(TranslationBlock *tb, tb_page_addr_t phys_pc,
|
||||||
{
|
{
|
||||||
uint32_t h;
|
uint32_t h;
|
||||||
|
|
||||||
/* add in the hash table */
|
|
||||||
h = tb_hash_func(phys_pc, tb->pc, tb->flags);
|
|
||||||
qht_insert(&tcg_ctx.tb_ctx.htable, tb, h);
|
|
||||||
|
|
||||||
/* add in the page list */
|
/* add in the page list */
|
||||||
tb_alloc_page(tb, 0, phys_pc & TARGET_PAGE_MASK);
|
tb_alloc_page(tb, 0, phys_pc & TARGET_PAGE_MASK);
|
||||||
if (phys_page2 != -1) {
|
if (phys_page2 != -1) {
|
||||||
|
@ -1143,6 +1139,10 @@ static void tb_link_page(TranslationBlock *tb, tb_page_addr_t phys_pc,
|
||||||
tb->page_addr[1] = -1;
|
tb->page_addr[1] = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* add in the hash table */
|
||||||
|
h = tb_hash_func(phys_pc, tb->pc, tb->flags);
|
||||||
|
qht_insert(&tcg_ctx.tb_ctx.htable, tb, h);
|
||||||
|
|
||||||
#ifdef DEBUG_TB_CHECK
|
#ifdef DEBUG_TB_CHECK
|
||||||
tb_page_check();
|
tb_page_check();
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue