From 87c3382dc8cf80d580ddd8d2ccd2e14b3bc48258 Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Fri, 23 Feb 2018 20:42:21 -0500 Subject: [PATCH] tcg/mips: Make direct jump patching thread-safe Ensure direct jump patching in MIPS is atomic by using atomic_read()/atomic_set() for code patching. Backports commit c82460a560176ef69c2f0662bd280612e274db96 from qemu --- qemu/tcg/mips/tcg-target.inc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qemu/tcg/mips/tcg-target.inc.c b/qemu/tcg/mips/tcg-target.inc.c index 914cf6cd..216795ff 100644 --- a/qemu/tcg/mips/tcg-target.inc.c +++ b/qemu/tcg/mips/tcg-target.inc.c @@ -1886,7 +1886,6 @@ static void tcg_target_init(TCGContext *s) void tb_set_jmp_target1(uintptr_t jmp_addr, uintptr_t addr) { - uint32_t *ptr = (uint32_t *)jmp_addr; - *ptr = deposit32(*ptr, 0, 26, addr >> 2); + atomic_set((uint32_t *)jmp_addr, deposit32(OPC_J, 0, 26, addr >> 2)); flush_icache_range(jmp_addr, jmp_addr + 4); }