From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:58944) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ScYgR-00065e-5U for qemu-devel@nongnu.org; Thu, 07 Jun 2012 05:07:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ScYgP-0007PP-3P for qemu-devel@nongnu.org; Thu, 07 Jun 2012 05:07:10 -0400 Received: from mail-lb0-f173.google.com ([209.85.217.173]:58682) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ScYgO-0007Ou-Pa for qemu-devel@nongnu.org; Thu, 07 Jun 2012 05:07:09 -0400 Received: by lbok6 with SMTP id k6so410908lbo.4 for ; Thu, 07 Jun 2012 02:07:05 -0700 (PDT) Date: Thu, 7 Jun 2012 11:07:00 +0200 From: "Edgar E. Iglesias" Message-ID: <20120607090700.GA23308@edde.se.axis.com> References: <1338863464-28694-1-git-send-email-peter.crosthwaite@petalogix.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1338863464-28694-1-git-send-email-peter.crosthwaite@petalogix.com> Subject: Re: [Qemu-devel] [PATCH] target-microblaze: fix swx build breakage List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Peter A. G. Crosthwaite" Cc: sw@weilnetz.de, david.holsgrove@petalogix.com, qemu-devel@nongnu.org, john.williams@petalogix.com On Tue, Jun 05, 2012 at 12:31:04PM +1000, Peter A. G. Crosthwaite wrote: > The lazy initialisation of r_check was throwing an error on --enable-debug. > Removed the lazy initialisation of r_check and swx_addr. Applied, thanks! > > Signed-off-by: Peter A. G. Crosthwaite > --- > target-microblaze/translate.c | 11 ++++++----- > 1 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/target-microblaze/translate.c b/target-microblaze/translate.c > index e462eab..269f201 100644 > --- a/target-microblaze/translate.c > +++ b/target-microblaze/translate.c > @@ -1095,7 +1095,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; > > @@ -1119,9 +1119,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); > @@ -1211,11 +1211,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); > -- > 1.7.3.2 >