From 083dbf489d1b0592e910ecfb90b3858c23e49ab7 Mon Sep 17 00:00:00 2001 From: "Peter A. G. Crosthwaite" Date: Tue, 5 Jun 2012 12:31:04 +1000 Subject: target-microblaze: fix swx build breakage The lazy initialisation of r_check was throwing an error on --enable-debug. Removed the lazy initialisation of r_check and swx_addr. Signed-off-by: Peter A. G. Crosthwaite Signed-off-by: Edgar E. Iglesias --- target-microblaze/translate.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'target-microblaze') diff --git a/target-microblaze/translate.c b/target-microblaze/translate.c index 02b2dc6b96..c0a6bfd9c3 100644 --- a/target-microblaze/translate.c +++ b/target-microblaze/translate.c @@ -1105,7 +1105,7 @@ static void gen_store(DisasContext *dc, TCGv addr, TCGv val, static void dec_store(DisasContext *dc) { - TCGv t, *addr, swx_addr, r_check = 0; + TCGv t, *addr, swx_addr, r_check; int swx_skip = 0; unsigned int size, rev = 0, ex = 0; @@ -1129,9 +1129,9 @@ 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 */ - r_check = tcg_temp_new(); - swx_addr = tcg_temp_local_new(); /* Force addr into the swx_addr. */ tcg_gen_mov_tl(swx_addr, *addr); @@ -1221,11 +1221,12 @@ static void dec_store(DisasContext *dc) gen_helper_memalign(*addr, tcg_const_tl(dc->rd), tcg_const_tl(1), tcg_const_tl(size - 1)); } + if (ex) { gen_set_label(swx_skip); - tcg_temp_free(r_check); - tcg_temp_free(swx_addr); } + tcg_temp_free(r_check); + tcg_temp_free(swx_addr); if (addr == &t) tcg_temp_free(t); -- cgit v1.2.3