[Qemu-devel] [PATCH] ppc: Fix compilation for ppc64-softmmu

[Qemu-devel] [PATCH] ppc: Fix compilation for ppc64-softmmu

[Stefan Weil]

When QEMU was configured with --enable-debug-tcg,
compilation fails in spr_write_booke206_mmucsr0() and in
spr_write_booke_pid(). Similar changes are also needed
in conditional code which is normally unused.

Cc: Alexander Graf <agraf@suse.de>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---
 target-ppc/translate_init.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
index b511afa..fc50ae3 100644
--- a/target-ppc/translate_init.c
+++ b/target-ppc/translate_init.c
@@ -73,7 +73,7 @@ static void spr_read_generic (void *opaque, int gprn, int sprn)
     gen_load_spr(cpu_gpr[gprn], sprn);
 #ifdef PPC_DUMP_SPR_ACCESSES
     {
-        TCGv t0 = tcg_const_i32(sprn);
+        TCGv_i32 t0 = tcg_const_i32(sprn);
         gen_helper_load_dump_spr(t0);
         tcg_temp_free_i32(t0);
     }
@@ -85,7 +85,7 @@ static void spr_write_generic (void *opaque, int sprn, int gprn)
     gen_store_spr(sprn, cpu_gpr[gprn]);
 #ifdef PPC_DUMP_SPR_ACCESSES
     {
-        TCGv t0 = tcg_const_i32(sprn);
+        TCGv_i32 t0 = tcg_const_i32(sprn);
         gen_helper_store_dump_spr(t0);
         tcg_temp_free_i32(t0);
     }
@@ -1367,16 +1367,16 @@ static void spr_write_e500_l1csr0 (void *opaque, int sprn, int gprn)
 
 static void spr_write_booke206_mmucsr0 (void *opaque, int sprn, int gprn)
 {
-    TCGv t0 = tcg_const_i32(sprn);
+    TCGv_i32 t0 = tcg_const_i32(sprn);
     gen_helper_booke206_tlbflush(t0);
-    tcg_temp_free(t0);
+    tcg_temp_free_i32(t0);
 }
 
 static void spr_write_booke_pid (void *opaque, int sprn, int gprn)
 {
-    TCGv t0 = tcg_const_i32(sprn);
+    TCGv_i32 t0 = tcg_const_i32(sprn);
     gen_helper_booke_setpid(t0, cpu_gpr[gprn]);
-    tcg_temp_free(t0);
+    tcg_temp_free_i32(t0);
 }
 #endif
 
-- 
1.7.2.5

Re: [Qemu-devel] [PATCH] ppc: Fix compilation for ppc64-softmmu

[Alexander Graf]

On 20.05.2011, at 22:30, Stefan Weil wrote:

> When QEMU was configured with --enable-debug-tcg,
> compilation fails in spr_write_booke206_mmucsr0() and in
> spr_write_booke_pid(). Similar changes are also needed
> in conditional code which is normally unused.

Stefan (Hajnoczi), can we add --enable-debug-tcg builds to the buildbot runs? I'd like to catch these without Stefan (Weil) being around as well - and preferably on my staging tree and not on upstream :(.

Thanks for the patch, applied to ppc-next.


Alex

Re: [Qemu-devel] [PATCH] ppc: Fix compilation for ppc64-softmmu

[Peter Maydell]

On 21 May 2011 09:31, Alexander Graf <agraf@suse.de> wrote:
> On 20.05.2011, at 22:30, Stefan Weil wrote:
>> When QEMU was configured with --enable-debug-tcg,
>> compilation fails in spr_write_booke206_mmucsr0() and in
>> spr_write_booke_pid(). Similar changes are also needed
>> in conditional code which is normally unused.
>
> Stefan (Hajnoczi), can we add --enable-debug-tcg builds
> to the buildbot runs?

--enable-debug implies --enable-debug-tcg, so I would think
that just running both with and without --enable-debug would
be sufficient.

-- PMM