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

diff --git a/target-m68k/cpu.h b/target-m68k/cpu.h
index 6a2aba480549fcb933078e33456a3a0cea586183..e2529eb0acda890206fe94d77b12086bf36ec95c 100644 (file)
--- 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 9117484598ea01a6af67e6988812d9a1ddb3ec47..fba371cf409805b6eecd5a18c0edf970ff81aa4f 100644 (file)
--- 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 7eb21ddd3d702650f8f3deeae7052e5365eccb5b..493498e9b4dd7a7490c0095582c01bafb4128492 100644 (file)
--- 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;