Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LNSUj-0004zY-S9 for qemu-devel@nongnu.org; Thu, 15 Jan 2009 08:42:50 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LNSUa-0004wt-Tx for qemu-devel@nongnu.org; Thu, 15 Jan 2009 08:42:45 -0500 Received: from [199.232.76.173] (port=48995 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LNSUW-0004vX-HV for qemu-devel@nongnu.org; Thu, 15 Jan 2009 08:42:37 -0500 Received: from soufre.accelance.net ([213.162.48.15]:56696) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LNSUW-0005BL-4G for qemu-devel@nongnu.org; Thu, 15 Jan 2009 08:42:36 -0500 Received: from [192.168.1.22] (APlessis-Bouchard-151-1-21-4.w82-121.abo.wanadoo.fr [82.121.179.4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by soufre.accelance.net (Postfix) with ESMTP id 35EC24505B for ; Thu, 15 Jan 2009 14:42:34 +0100 (CET) From: Lionel Landwerlin Content-Type: text/plain Date: Thu, 15 Jan 2009 14:42:37 +0100 Message-Id: <1232026957.7873.2.camel@couak.urd44.com> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] sh4: Make atomic tas.b instruction thread safe Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This is usefull for user emulation where guest threads are emulated with host threads and atomic guest instructions must keep atomic in generated host instructions. Signed-off-by: Lionel Landwerlin --- target-sh4/helper.h | 3 +++ target-sh4/op_helper.c | 12 ++++++++++++ target-sh4/translate.c | 5 ++++- 3 files changed, 19 insertions(+), 1 deletions(-) diff --git a/target-sh4/helper.h b/target-sh4/helper.h index e665185..887d57a 100644 --- a/target-sh4/helper.h +++ b/target-sh4/helper.h @@ -46,4 +46,7 @@ DEF_HELPER_1(fsqrt_DT, i64, i64) DEF_HELPER_1(ftrc_FT, i32, i32) DEF_HELPER_1(ftrc_DT, i32, i64) +DEF_HELPER_0(lock, void) +DEF_HELPER_0(unlock, void) + #include "def-helper.h" diff --git a/target-sh4/op_helper.c b/target-sh4/op_helper.c index ead14e3..a11e8d6 100644 --- a/target-sh4/op_helper.c +++ b/target-sh4/op_helper.c @@ -615,3 +615,15 @@ uint32_t helper_ftrc_DT(uint64_t t0) d.ll = t0; return float64_to_int32_round_to_zero(d.d, &env->fp_status); } + +static spinlock_t global_cpu_lock = SPIN_LOCK_UNLOCKED; + +void helper_lock(void) +{ + spin_lock(&global_cpu_lock); +} + +void helper_unlock(void) +{ + spin_unlock(&global_cpu_lock); +} diff --git a/target-sh4/translate.c b/target-sh4/translate.c index bce7463..4762ef7 100644 --- a/target-sh4/translate.c +++ b/target-sh4/translate.c @@ -1656,7 +1656,9 @@ static void _decode_opc(DisasContext * ctx) case 0x401b: /* tas.b @Rn */ { TCGv addr, val; - addr = tcg_temp_local_new(); + + gen_helper_lock(); + addr = tcg_temp_local_new(); tcg_gen_mov_i32(addr, REG(B11_8)); val = tcg_temp_local_new(); tcg_gen_qemu_ld8u(val, addr, ctx->memidx); @@ -1665,6 +1667,7 @@ static void _decode_opc(DisasContext * ctx) tcg_gen_qemu_st8(val, addr, ctx->memidx); tcg_temp_free(val); tcg_temp_free(addr); + gen_helper_unlock(); } return; case 0xf00d: /* fsts FPUL,FRn - FPSCR: Nothing */ -- 1.5.6.5