diff options
| author | Sergey Fedorov | 2016-04-22 18:08:45 +0200 |
|---|---|---|
| committer | Richard Henderson | 2016-05-13 02:06:40 +0200 |
| commit | 76442a939ef8fc062b35a890a824de203bb5bd5f (patch) | |
| tree | 3bfd290f9dd64655502b2ef9fc16c60172ed30dc /tcg/tci/tcg-target.inc.c | |
| parent | include/qemu/osdep.h: Add macros for pointer alignment (diff) | |
| download | qemu-76442a939ef8fc062b35a890a824de203bb5bd5f.tar.gz qemu-76442a939ef8fc062b35a890a824de203bb5bd5f.tar.xz qemu-76442a939ef8fc062b35a890a824de203bb5bd5f.zip | |
tci: Make direct jump patching thread-safe
Ensure direct jump patching in TCI is atomic by:
* naturally aligning a location of direct jump address;
* using atomic_read()/atomic_set() to load/store the address.
Signed-off-by: Sergey Fedorov <serge.fdrv@gmail.com>
Signed-off-by: Sergey Fedorov <sergey.fedorov@linaro.org>
Message-Id: <1461341333-19646-4-git-send-email-sergey.fedorov@linaro.org>
Signed-off-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'tcg/tci/tcg-target.inc.c')
| -rw-r--r-- | tcg/tci/tcg-target.inc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tcg/tci/tcg-target.inc.c b/tcg/tci/tcg-target.inc.c index e2fc52a167..85eeb5de24 100644 --- a/tcg/tci/tcg-target.inc.c +++ b/tcg/tci/tcg-target.inc.c @@ -556,6 +556,8 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args, if (s->tb_jmp_offset) { /* Direct jump method. */ tcg_debug_assert(args[0] < ARRAY_SIZE(s->tb_jmp_offset)); + /* Align for atomic patching and thread safety */ + s->code_ptr = QEMU_ALIGN_PTR_UP(s->code_ptr, 4); s->tb_jmp_offset[args[0]] = tcg_current_code_size(s); tcg_out32(s, 0); } else { |