[Qemu-devel] [PATCH v2 5/7] clean build: Fix remaining cris warnings

[Jan Kiszka <jan.kiszka@web.de>]

Laurent Desnogues wrote:
> On Sun, Feb 22, 2009 at 12:03 AM, Stuart Brady <sdbrady@ntlworld.com> wrote:
>> On Sat, Feb 21, 2009 at 08:00:55PM +0100, Jan Kiszka wrote:
>>> diff --git a/target-cris/translate.c b/target-cris/translate.c
>>> index f575e63..954b038 100644
>>> --- a/target-cris/translate.c
>>> +++ b/target-cris/translate.c
>>> @@ -2613,7 +2613,7 @@ static unsigned int dec_move_pm(DisasContext *dc)
>>>  static unsigned int dec_movem_mr(DisasContext *dc)
>>>  {
>>>       TCGv_i64 tmp[16];
>>> -        TCGv tmp32;
>>> +        TCGv tmp32 = 0;
>>>       TCGv addr;
>>>       int i;
>>>       int nr = dc->op2 + 1;
>> Hmm, GCC just gets it wrong here -- and 0 isn't really very meaningful.
>> At the very least, shouldn't there be a comment?  Something like Linux's
>> uninitialized_var() macro might be worth considering...
> 
> Some targets use TCGV_UNUSED_I32/I64.  I would initialize tmp32
> to that value in an additional else part to the first if (nr & 1).  That
> should silence gcc.
> 

Good point, here is a fixed version according to your suggestion:

------------->

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

 hw/etraxfs_eth.c        |    3 +--
 hw/etraxfs_ser.c        |    1 +
 hw/etraxfs_timer.c      |    1 +
 target-cris/cpu.h       |    3 +++
 target-cris/exec.h      |    3 ---
 target-cris/translate.c |    3 ++-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/hw/etraxfs_eth.c b/hw/etraxfs_eth.c
index 13d1900..c87e55f 100644
--- a/hw/etraxfs_eth.c
+++ b/hw/etraxfs_eth.c
@@ -25,8 +25,7 @@
 #include <stdio.h>
 #include "hw.h"
 #include "net.h"
-
-#include "etraxfs_dma.h"
+#include "etraxfs.h"
 
 #define D(x)
 
diff --git a/hw/etraxfs_ser.c b/hw/etraxfs_ser.c
index e32e2eb..8367386 100644
--- a/hw/etraxfs_ser.c
+++ b/hw/etraxfs_ser.c
@@ -26,6 +26,7 @@
 #include <ctype.h>
 #include "hw.h"
 #include "qemu-char.h"
+#include "etraxfs.h"
 
 #define D(x)
 
diff --git a/hw/etraxfs_timer.c b/hw/etraxfs_timer.c
index ebb06e1..1144369 100644
--- a/hw/etraxfs_timer.c
+++ b/hw/etraxfs_timer.c
@@ -26,6 +26,7 @@
 #include "hw.h"
 #include "sysemu.h"
 #include "qemu-timer.h"
+#include "etraxfs.h"
 
 #define D(x)
 
diff --git a/target-cris/cpu.h b/target-cris/cpu.h
index dea4cc4..754953c 100644
--- a/target-cris/cpu.h
+++ b/target-cris/cpu.h
@@ -216,6 +216,9 @@ static inline int cpu_mmu_index (CPUState *env)
 	return !!(env->pregs[PR_CCS] & U_FLAG);
 }
 
+int cpu_cris_handle_mmu_fault(CPUState *env, target_ulong address, int rw,
+                              int mmu_idx, int is_softmmu);
+
 #if defined(CONFIG_USER_ONLY)
 static inline void cpu_clone_regs(CPUState *env, target_ulong newsp)
 {
diff --git a/target-cris/exec.h b/target-cris/exec.h
index cce87f6..77e4240 100644
--- a/target-cris/exec.h
+++ b/target-cris/exec.h
@@ -33,9 +33,6 @@ static inline void regs_to_env(void)
 {
 }
 
-int cpu_cris_handle_mmu_fault (CPUState *env, target_ulong address, int rw,
-                              int mmu_idx, int is_softmmu);
-
 #if !defined(CONFIG_USER_ONLY)
 #include "softmmu_exec.h"
 #endif
diff --git a/target-cris/translate.c b/target-cris/translate.c
index f575e63..d5fcb9e 100644
--- a/target-cris/translate.c
+++ b/target-cris/translate.c
@@ -2633,7 +2633,8 @@ static unsigned int dec_movem_mr(DisasContext *dc)
 		tmp32 = tcg_temp_new_i32();
 		tcg_gen_addi_tl(addr, cpu_R[dc->op1], i * 8);
 		gen_load(dc, tmp32, addr, 4, 0);
-	}
+	} else
+		TCGV_UNUSED(tmp32);
 	tcg_temp_free(addr);
 
 	for (i = 0; i < (nr >> 1); i++) {