From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34578) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZSCw-0002wS-VU for qemu-devel@nongnu.org; Thu, 24 Oct 2013 17:12:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VZSCj-0006XF-Mq for qemu-devel@nongnu.org; Thu, 24 Oct 2013 17:12:42 -0400 Received: from mail-la0-x234.google.com ([2a00:1450:4010:c03::234]:55514) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZSCj-0006VN-F1 for qemu-devel@nongnu.org; Thu, 24 Oct 2013 17:12:29 -0400 Received: by mail-la0-f52.google.com with SMTP id eh20so2417234lab.11 for ; Thu, 24 Oct 2013 14:12:28 -0700 (PDT) Received: from localhost (h59ec325f.selukar.dyn.perspektivbredband.net. [89.236.50.95]) by mx.google.com with ESMTPSA id b6sm3232874lae.0.2013.10.24.14.12.25 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 24 Oct 2013 14:12:26 -0700 (PDT) From: edgar.iglesias@gmail.com Date: Thu, 24 Oct 2013 23:08:54 +0200 Message-Id: <1382648937-14769-8-git-send-email-edgar.iglesias@gmail.com> In-Reply-To: <1382648937-14769-1-git-send-email-edgar.iglesias@gmail.com> References: <1382648937-14769-1-git-send-email-edgar.iglesias@gmail.com> Subject: [Qemu-devel] [PATCH 07/10] microblaze: Turn res_addr into a tcg global List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org From: "Edgar E. Iglesias" Signed-off-by: Edgar E. Iglesias --- target-microblaze/translate.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/target-microblaze/translate.c b/target-microblaze/translate.c index 021a504..57627fc 100644 --- a/target-microblaze/translate.c +++ b/target-microblaze/translate.c @@ -49,6 +49,7 @@ static TCGv env_imm; static TCGv env_btaken; static TCGv env_btarget; static TCGv env_iflags; +static TCGv env_res_addr; #include "exec/gen-icount.h" @@ -877,7 +878,7 @@ static inline void gen_load(DisasContext *dc, TCGv dst, TCGv addr, cpu_abort(dc->env, "Incorrect load size %d\n", size); if (exclusive) { - tcg_gen_st_tl(addr, cpu_env, offsetof(CPUMBState, res_addr)); + tcg_gen_mov_tl(env_res_addr, addr); } } @@ -1101,7 +1102,7 @@ static void gen_store(DisasContext *dc, TCGv addr, TCGv val, static void dec_store(DisasContext *dc) { - TCGv t, *addr, swx_addr, r_check; + TCGv t, *addr, swx_addr; int swx_skip = 0; unsigned int size, rev = 0, ex = 0; @@ -1125,7 +1126,6 @@ static void dec_store(DisasContext *dc) sync_jmpstate(dc); addr = compute_ldst_addr(dc, &t); - r_check = tcg_temp_new(); swx_addr = tcg_temp_local_new(); if (ex) { /* swx */ @@ -1135,10 +1135,9 @@ static void dec_store(DisasContext *dc) /* swx does not throw unaligned access errors, so force alignment */ tcg_gen_andi_tl(swx_addr, swx_addr, ~3); - tcg_gen_ld_tl(r_check, cpu_env, offsetof(CPUMBState, res_addr)); write_carryi(dc, 1); swx_skip = gen_new_label(); - tcg_gen_brcond_tl(TCG_COND_NE, r_check, swx_addr, swx_skip); + tcg_gen_brcond_tl(TCG_COND_NE, env_res_addr, swx_addr, swx_skip); write_carryi(dc, 0); } @@ -1221,7 +1220,6 @@ static void dec_store(DisasContext *dc) if (ex) { gen_set_label(swx_skip); } - tcg_temp_free(r_check); tcg_temp_free(swx_addr); if (addr == &t) @@ -2008,6 +2006,9 @@ void mb_tcg_init(void) env_btaken = tcg_global_mem_new(TCG_AREG0, offsetof(CPUMBState, btaken), "btaken"); + env_res_addr = tcg_global_mem_new(TCG_AREG0, + offsetof(CPUMBState, res_addr), + "res_addr"); for (i = 0; i < ARRAY_SIZE(cpu_R); i++) { cpu_R[i] = tcg_global_mem_new(TCG_AREG0, offsetof(CPUMBState, regs[i]), -- 1.7.10.4