From 7538001da93f68b5f9ecf6ca5479869a036361ac Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Fri, 23 Feb 2018 20:41:38 -0500 Subject: [PATCH] tcg/sparc: Make direct jump patching thread-safe Ensure direct jump patching in SPARC is atomic by using atomic_read()/atomic_set() for code patching. Backports commit 84f79fb7c6e857edc807e4a251338243ce0cbac3 from qemu --- qemu/tcg/sparc/tcg-target.inc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu/tcg/sparc/tcg-target.inc.c b/qemu/tcg/sparc/tcg-target.inc.c index b43f15b9..ee42e19d 100644 --- a/qemu/tcg/sparc/tcg-target.inc.c +++ b/qemu/tcg/sparc/tcg-target.inc.c @@ -1614,6 +1614,6 @@ void tb_set_jmp_target1(uintptr_t jmp_addr, uintptr_t addr) the code_gen_buffer can't be larger than 2GB. */ tcg_debug_assert(disp == (int32_t)disp); - *ptr = CALL | (uint32_t)disp >> 2; + atomic_set(ptr, deposit32(CALL, 0, 30, disp >> 2)); flush_icache_range(jmp_addr, jmp_addr + 4); }