| Message ID | 1338863464-28694-1-git-send-email-peter.crosthwaite@petalogix.com |
|---|---|
| State | New |
| Headers | show |
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 <peter.crosthwaite@petalogix.com> > --- > 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 >
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);
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 <peter.crosthwaite@petalogix.com> --- target-microblaze/translate.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-)