diff options
| author | edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-02-22 11:59:59 +0000 |
|---|---|---|
| committer | edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-02-22 11:59:59 +0000 |
| commit | cc53adbca0df43a69fec1ce271833b7130db9abb (patch) | |
| tree | 3b237c740d07ff23e6a298559807ce3742e691b7 | |
| parent | 07c485ce78b60de7a40e4606f1f95d9c492d52ed (diff) | |
CRIS: Fix remaining build warnings.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Acked-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6638 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | hw/etraxfs_eth.c | 3 | ||||
| -rw-r--r-- | hw/etraxfs_ser.c | 1 | ||||
| -rw-r--r-- | hw/etraxfs_timer.c | 1 | ||||
| -rw-r--r-- | target-cris/cpu.h | 3 | ||||
| -rw-r--r-- | target-cris/exec.h | 3 | ||||
| -rw-r--r-- | 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 13d19001f3..c87e55f61d 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 e32e2eb701..8367386ed1 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 ebb06e1058..1144369b1c 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 dea4cc46c1..754953cda0 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 cce87f6a08..77e4240e89 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 f575e63c66..d5fcb9e636 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++) { |