[Qemu-devel] [PATCH 10/11] ppc: avoid write only variables

[Blue Swirl]

Compiling with GCC 4.6.0 20100925 produced warnings:
/src/qemu/target-ppc/op_helper.c: In function 'helper_icbi':
/src/qemu/target-ppc/op_helper.c:351:14: error: variable 'tmp' set but
not used [-Werror=unused-but-set-variable]
/src/qemu/target-ppc/op_helper.c: In function 'do_6xx_tlb':
/src/qemu/target-ppc/op_helper.c:3805:28: error: variable 'EPN' set
but not used [-Werror=unused-but-set-variable]
/src/qemu/target-ppc/op_helper.c: In function 'do_74xx_tlb':
/src/qemu/target-ppc/op_helper.c:3838:28: error: variable 'EPN' set
but not used [-Werror=unused-but-set-variable]

Fix by making the variable declarations and their uses also conditional
to debug definition. Delete tmp.

Signed-off-by: Blue Swirl <address@hidden>
---
 target-ppc/op_helper.c |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/target-ppc/op_helper.c b/target-ppc/op_helper.c
index 45f1655..348844f 100644
--- a/target-ppc/op_helper.c
+++ b/target-ppc/op_helper.c
@@ -348,15 +348,13 @@ void helper_dcbz_970(target_ulong addr)

 void helper_icbi(target_ulong addr)
 {
-    uint32_t tmp;
-
     addr &= ~(env->dcache_line_size - 1);
     /* Invalidate one cache line :
      * PowerPC specification says this is to be treated like a load
      * (not a fetch) by the MMU. To be sure it will be so,
      * do the load "by hand".
      */
-    tmp = ldl(addr);
+    ldl(addr);
     tb_invalidate_page_range(addr, addr + env->icache_line_size);
 }

@@ -3802,16 +3800,23 @@ void helper_tlbie (target_ulong addr)
 /* PowerPC 602/603 software TLB load instructions helpers */
 static void do_6xx_tlb (target_ulong new_EPN, int is_code)
 {
-    target_ulong RPN, CMP, EPN;
+    target_ulong RPN, CMP;
+#ifdef DEBUG_SOFTWARE_TLB
+    target_ulong EPN;
+#endif
     int way;

     RPN = env->spr[SPR_RPA];
     if (is_code) {
         CMP = env->spr[SPR_ICMP];
+#ifdef DEBUG_SOFTWARE_TLB
         EPN = env->spr[SPR_IMISS];
+#endif
     } else {
         CMP = env->spr[SPR_DCMP];
+#ifdef DEBUG_SOFTWARE_TLB
         EPN = env->spr[SPR_DMISS];
+#endif
     }
     way = (env->spr[SPR_SRR1] >> 17) & 1;
     LOG_SWTLB("%s: EPN " TARGET_FMT_lx " " TARGET_FMT_lx " PTE0 " TARGET_FMT_lx
@@ -3835,12 +3840,17 @@ void helper_6xx_tlbi (target_ulong EPN)
 /* PowerPC 74xx software TLB load instructions helpers */
 static void do_74xx_tlb (target_ulong new_EPN, int is_code)
 {
-    target_ulong RPN, CMP, EPN;
+    target_ulong RPN, CMP;
+#ifdef DEBUG_SOFTWARE_TLB
+    target_ulong EPN;
+#endif
     int way;

     RPN = env->spr[SPR_PTELO];
     CMP = env->spr[SPR_PTEHI];
+#ifdef DEBUG_SOFTWARE_TLB
     EPN = env->spr[SPR_TLBMISS] & ~0x3;
+#endif
     way = env->spr[SPR_TLBMISS] & 0x3;
     LOG_SWTLB("%s: EPN " TARGET_FMT_lx " " TARGET_FMT_lx " PTE0 " TARGET_FMT_lx
               " PTE1 " TARGET_FMT_lx " way %d\n", __func__, new_EPN, EPN, CMP,
-- 
1.6.2.4