Commit aaedd1f9f302c0f5fd4554c10e85ae63603e3cb5
1 parent
2b3ea315
clean build: Fix remaining m68k warnings
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6767 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
3 changed files
with
3 additions
and
8 deletions
target-m68k/cpu.h
@@ -223,6 +223,9 @@ static inline int cpu_mmu_index (CPUState *env) | @@ -223,6 +223,9 @@ static inline int cpu_mmu_index (CPUState *env) | ||
223 | return (env->sr & SR_S) == 0 ? 1 : 0; | 223 | return (env->sr & SR_S) == 0 ? 1 : 0; |
224 | } | 224 | } |
225 | 225 | ||
226 | +int cpu_m68k_handle_mmu_fault(CPUState *env, target_ulong address, int rw, | ||
227 | + int mmu_idx, int is_softmmu); | ||
228 | + | ||
226 | #if defined(CONFIG_USER_ONLY) | 229 | #if defined(CONFIG_USER_ONLY) |
227 | static inline void cpu_clone_regs(CPUState *env, target_ulong newsp) | 230 | static inline void cpu_clone_regs(CPUState *env, target_ulong newsp) |
228 | { | 231 | { |
target-m68k/exec.h
@@ -37,9 +37,6 @@ static inline void regs_to_env(void) | @@ -37,9 +37,6 @@ static inline void regs_to_env(void) | ||
37 | { | 37 | { |
38 | } | 38 | } |
39 | 39 | ||
40 | -int cpu_m68k_handle_mmu_fault (CPUState *env, target_ulong address, int rw, | ||
41 | - int mmu_idx, int is_softmmu); | ||
42 | - | ||
43 | #if !defined(CONFIG_USER_ONLY) | 40 | #if !defined(CONFIG_USER_ONLY) |
44 | #include "softmmu_exec.h" | 41 | #include "softmmu_exec.h" |
45 | #endif | 42 | #endif |
target-m68k/helper.c
@@ -454,11 +454,6 @@ uint32_t HELPER(xflag_lt)(uint32_t a, uint32_t b) | @@ -454,11 +454,6 @@ uint32_t HELPER(xflag_lt)(uint32_t a, uint32_t b) | ||
454 | return a < b; | 454 | return a < b; |
455 | } | 455 | } |
456 | 456 | ||
457 | -uint32_t HELPER(btest)(uint32_t x) | ||
458 | -{ | ||
459 | - return x != 0; | ||
460 | -} | ||
461 | - | ||
462 | void HELPER(set_sr)(CPUState *env, uint32_t val) | 457 | void HELPER(set_sr)(CPUState *env, uint32_t val) |
463 | { | 458 | { |
464 | env->sr = val & 0xffff; | 459 | env->sr = val & 0xffff; |