diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2020-10-28 23:30:21 -0700 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2021-01-07 05:09:41 -1000 |
| commit | 1acbad0f278ad585bbfc46081b5b639447585be0 (patch) | |
| tree | 15960198ece2b2f54d5801f6ec6e07d77422202f /accel | |
| parent | 755bf9e514e3f60ffa3f0495e6bc524fca74f3be (diff) | |
| download | qemu-1acbad0f278ad585bbfc46081b5b639447585be0.zip qemu-1acbad0f278ad585bbfc46081b5b639447585be0.tar.gz qemu-1acbad0f278ad585bbfc46081b5b639447585be0.tar.bz2 | |
tcg: Adjust tb_target_set_jmp_target for split-wx
Pass both rx and rw addresses to tb_target_set_jmp_target.
Reviewed-by: Joelle van Dyne <j@getutm.app>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'accel')
| -rw-r--r-- | accel/tcg/cpu-exec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index f9344db..29294f2 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -382,7 +382,9 @@ void tb_set_jmp_target(TranslationBlock *tb, int n, uintptr_t addr) if (TCG_TARGET_HAS_direct_jump) { uintptr_t offset = tb->jmp_target_arg[n]; uintptr_t tc_ptr = (uintptr_t)tb->tc.ptr; - tb_target_set_jmp_target(tc_ptr, tc_ptr + offset, addr); + uintptr_t jmp_rx = tc_ptr + offset; + uintptr_t jmp_rw = jmp_rx - tcg_splitwx_diff; + tb_target_set_jmp_target(tc_ptr, jmp_rx, jmp_rw, addr); } else { tb->jmp_target_arg[n] = addr; } |