diff options
| author | aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-03-07 21:48:08 +0000 |
|---|---|---|
| committer | aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-03-07 21:48:08 +0000 |
| commit | aaedd1f9f302c0f5fd4554c10e85ae63603e3cb5 (patch) | |
| tree | 5e53880cba7a012a00ae28600773b8b04d4bdf6e | |
| parent | 2b3ea3154d38920238fff4a67f477f989d9d8d24 (diff) | |
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
| -rw-r--r-- | target-m68k/cpu.h | 3 | ||||
| -rw-r--r-- | target-m68k/exec.h | 3 | ||||
| -rw-r--r-- | target-m68k/helper.c | 5 |
3 files changed, 3 insertions, 8 deletions
diff --git a/target-m68k/cpu.h b/target-m68k/cpu.h index 6a2aba4805..e2529eb0ac 100644 --- a/target-m68k/cpu.h +++ b/target-m68k/cpu.h @@ -223,6 +223,9 @@ static inline int cpu_mmu_index (CPUState *env) return (env->sr & SR_S) == 0 ? 1 : 0; } +int cpu_m68k_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-m68k/exec.h b/target-m68k/exec.h index 9117484598..fba371cf40 100644 --- a/target-m68k/exec.h +++ b/target-m68k/exec.h @@ -37,9 +37,6 @@ static inline void regs_to_env(void) { } -int cpu_m68k_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-m68k/helper.c b/target-m68k/helper.c index 7eb21ddd3d..493498e9b4 100644 --- a/target-m68k/helper.c +++ b/target-m68k/helper.c @@ -454,11 +454,6 @@ uint32_t HELPER(xflag_lt)(uint32_t a, uint32_t b) return a < b; } -uint32_t HELPER(btest)(uint32_t x) -{ - return x != 0; -} - void HELPER(set_sr)(CPUState *env, uint32_t val) { env->sr = val & 0xffff; |