[Qemu-devel] [6638] CRIS: Fix remaining build warnings.

[Qemu-devel] [6638] CRIS: Fix remaining build warnings.

[Edgar E. Iglesias]

Revision: 6638
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6638
Author:   edgar_igl
Date:     2009-02-22 11:59:59 +0000 (Sun, 22 Feb 2009)

Log Message:
-----------
CRIS: Fix remaining build warnings.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Acked-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>

Modified Paths:
--------------
    trunk/hw/etraxfs_eth.c
    trunk/hw/etraxfs_ser.c
    trunk/hw/etraxfs_timer.c
    trunk/target-cris/cpu.h
    trunk/target-cris/exec.h
    trunk/target-cris/translate.c

Modified: trunk/hw/etraxfs_eth.c
===================================================================
--- trunk/hw/etraxfs_eth.c	2009-02-21 17:29:14 UTC (rev 6637)
+++ trunk/hw/etraxfs_eth.c	2009-02-22 11:59:59 UTC (rev 6638)
@@ -25,9 +25,8 @@
 #include <stdio.h>
 #include "hw.h"
 #include "net.h"
+#include "etraxfs.h"
 
-#include "etraxfs_dma.h"
-
 #define D(x)
 
 /* Advertisement control register. */

Modified: trunk/hw/etraxfs_ser.c
===================================================================
--- trunk/hw/etraxfs_ser.c	2009-02-21 17:29:14 UTC (rev 6637)
+++ trunk/hw/etraxfs_ser.c	2009-02-22 11:59:59 UTC (rev 6638)
@@ -26,6 +26,7 @@
 #include <ctype.h>
 #include "hw.h"
 #include "qemu-char.h"
+#include "etraxfs.h"
 
 #define D(x)
 

Modified: trunk/hw/etraxfs_timer.c
===================================================================
--- trunk/hw/etraxfs_timer.c	2009-02-21 17:29:14 UTC (rev 6637)
+++ trunk/hw/etraxfs_timer.c	2009-02-22 11:59:59 UTC (rev 6638)
@@ -26,6 +26,7 @@
 #include "hw.h"
 #include "sysemu.h"
 #include "qemu-timer.h"
+#include "etraxfs.h"
 
 #define D(x)
 

Modified: trunk/target-cris/cpu.h
===================================================================
--- trunk/target-cris/cpu.h	2009-02-21 17:29:14 UTC (rev 6637)
+++ trunk/target-cris/cpu.h	2009-02-22 11:59:59 UTC (rev 6638)
@@ -216,6 +216,9 @@
 	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)
 {

Modified: trunk/target-cris/exec.h
===================================================================
--- trunk/target-cris/exec.h	2009-02-21 17:29:14 UTC (rev 6637)
+++ trunk/target-cris/exec.h	2009-02-22 11:59:59 UTC (rev 6638)
@@ -33,9 +33,6 @@
 {
 }
 
-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

Modified: trunk/target-cris/translate.c
===================================================================
--- trunk/target-cris/translate.c	2009-02-21 17:29:14 UTC (rev 6637)
+++ trunk/target-cris/translate.c	2009-02-22 11:59:59 UTC (rev 6638)
@@ -2633,7 +2633,8 @@
 		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++) {