Selaa lähdekoodia

tcg/aarch64: Fix patching of LDR in tb_target_set_jmp_target

'offset' should be bits [23:5] of LDR instruction, rather than [4:0].

Fixes: d59d83a1c388 ("tcg/aarch64: Reorg goto_tb implementation")
Reviewed-by: Zenghui Yu <yuzenghui@huawei.com>
Reported-by: Zenghui Yu <yuzenghui@huawei.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Richard Henderson 2 vuotta sitten
vanhempi
commit
a2495ede07
1 muutettua tiedostoa jossa 1 lisäystä ja 1 poistoa
  1. 1 1
      tcg/aarch64/tcg-target.c.inc

+ 1 - 1
tcg/aarch64/tcg-target.c.inc

@@ -1914,7 +1914,7 @@ void tb_target_set_jmp_target(const TranslationBlock *tb, int n,
         ptrdiff_t i_offset = i_addr - jmp_rx;
         ptrdiff_t i_offset = i_addr - jmp_rx;
 
 
         /* Note that we asserted this in range in tcg_out_goto_tb. */
         /* Note that we asserted this in range in tcg_out_goto_tb. */
-        insn = deposit32(I3305_LDR | TCG_REG_TMP, 0, 5, i_offset >> 2);
+        insn = deposit32(I3305_LDR | TCG_REG_TMP, 5, 19, i_offset >> 2);
     }
     }
     qatomic_set((uint32_t *)jmp_rw, insn);
     qatomic_set((uint32_t *)jmp_rw, insn);
     flush_idcache_range(jmp_rx, jmp_rw, 4);
     flush_idcache_range(jmp_rx, jmp_rw, 4);