diff mbox

[PULL,08/58] tcg: set up tb->page_addr before insertion

Message ID 1473786989-54823-9-git-send-email-pbonzini@redhat.com
State Accepted
Commit 2e1ae44a4f4a6149fbb9dc812243522f07284700
Headers show

Commit Message

Paolo Bonzini Sept. 13, 2016, 5:15 p.m. UTC 
From: Alex Bennée <alex.bennee@linaro.org>


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>

---
 translate-all.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

-- 
1.8.3.1
diff mbox

Patch

diff --git a/translate-all.c b/translate-all.c
index 5a5499f..b6663dc 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -1131,10 +1131,6 @@  static void tb_link_page(TranslationBlock *tb, tb_page_addr_t phys_pc,
 {
     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 */
     tb_alloc_page(tb, 0, phys_pc & TARGET_PAGE_MASK);
     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;
     }
 
+    /* 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
     tb_page_check();
 #endif