Commit cc53adbca0df43a69fec1ce271833b7130db9abb
1 parent
07c485ce
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
Showing
6 changed files
with
8 additions
and
6 deletions
hw/etraxfs_eth.c
hw/etraxfs_ser.c
hw/etraxfs_timer.c
target-cris/cpu.h
| @@ -216,6 +216,9 @@ static inline int cpu_mmu_index (CPUState *env) | @@ -216,6 +216,9 @@ static inline int cpu_mmu_index (CPUState *env) | ||
| 216 | return !!(env->pregs[PR_CCS] & U_FLAG); | 216 | return !!(env->pregs[PR_CCS] & U_FLAG); |
| 217 | } | 217 | } |
| 218 | 218 | ||
| 219 | +int cpu_cris_handle_mmu_fault(CPUState *env, target_ulong address, int rw, | ||
| 220 | + int mmu_idx, int is_softmmu); | ||
| 221 | + | ||
| 219 | #if defined(CONFIG_USER_ONLY) | 222 | #if defined(CONFIG_USER_ONLY) |
| 220 | static inline void cpu_clone_regs(CPUState *env, target_ulong newsp) | 223 | static inline void cpu_clone_regs(CPUState *env, target_ulong newsp) |
| 221 | { | 224 | { |
target-cris/exec.h
| @@ -33,9 +33,6 @@ static inline void regs_to_env(void) | @@ -33,9 +33,6 @@ static inline void regs_to_env(void) | ||
| 33 | { | 33 | { |
| 34 | } | 34 | } |
| 35 | 35 | ||
| 36 | -int cpu_cris_handle_mmu_fault (CPUState *env, target_ulong address, int rw, | ||
| 37 | - int mmu_idx, int is_softmmu); | ||
| 38 | - | ||
| 39 | #if !defined(CONFIG_USER_ONLY) | 36 | #if !defined(CONFIG_USER_ONLY) |
| 40 | #include "softmmu_exec.h" | 37 | #include "softmmu_exec.h" |
| 41 | #endif | 38 | #endif |
target-cris/translate.c
| @@ -2633,7 +2633,8 @@ static unsigned int dec_movem_mr(DisasContext *dc) | @@ -2633,7 +2633,8 @@ static unsigned int dec_movem_mr(DisasContext *dc) | ||
| 2633 | tmp32 = tcg_temp_new_i32(); | 2633 | tmp32 = tcg_temp_new_i32(); |
| 2634 | tcg_gen_addi_tl(addr, cpu_R[dc->op1], i * 8); | 2634 | tcg_gen_addi_tl(addr, cpu_R[dc->op1], i * 8); |
| 2635 | gen_load(dc, tmp32, addr, 4, 0); | 2635 | gen_load(dc, tmp32, addr, 4, 0); |
| 2636 | - } | 2636 | + } else |
| 2637 | + TCGV_UNUSED(tmp32); | ||
| 2637 | tcg_temp_free(addr); | 2638 | tcg_temp_free(addr); |
| 2638 | 2639 | ||
| 2639 | for (i = 0; i < (nr >> 1); i++) { | 2640 | for (i = 0; i < (nr >> 1); i++) { |