summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Ramesa <mpr@hi.t-com.hr>2013-11-29 22:53:41 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2013-12-05 06:00:24 +0900
commite2f095dc681558b63913e4080ee9a9bec595b427 (patch)
treee4125e5ae24319bda06c8e4dfa518b73da0f0028
parenteecf95e4455a50b6f1738f91da00171a8056ad16 (diff)
i386/i386/fpu.c, trap.c: remove forward declarations
* i386/i386/fpu.c: Include i386/trap.h. (void i386_exception, fp_save, fp_load): Remove forward declaration. * i386/i386/trap.c (void i386_exception): Remove forward declaration. * i386/i386/trap.h (void i386_exception): Add prototype.
-rw-r--r--i386/i386/fpu.c6
-rw-r--r--i386/i386/trap.c2
-rw-r--r--i386/i386/trap.h6
3 files changed, 7 insertions, 7 deletions
diff --git a/i386/i386/fpu.c b/i386/i386/fpu.c
index fb2c8ce..4e3ab57 100644
--- a/i386/i386/fpu.c
+++ b/i386/i386/fpu.c
@@ -53,6 +53,7 @@
#include <i386/pio.h>
#include <i386/pic.h>
#include <i386/locore.h>
+#include <i386/trap.h>
#include "cpu_number.h"
#if 0
@@ -68,15 +69,10 @@
#define ASSERT_IPL(L)
#endif
-extern void i386_exception();
-
int fp_kind = FP_387; /* 80387 present */
struct kmem_cache ifps_cache; /* cache for FPU save area */
static unsigned long mxcsr_feature_mask = 0xffffffff; /* Always AND user-provided mxcsr with this security mask */
-void fp_save(thread_t thread);
-void fp_load(thread_t thread);
-
#if NCPUS == 1
volatile thread_t fp_thread = THREAD_NULL;
/* thread whose state is in FPU */
diff --git a/i386/i386/trap.c b/i386/i386/trap.c
index 89d1f3d..5571a1f 100644
--- a/i386/i386/trap.c
+++ b/i386/i386/trap.c
@@ -66,8 +66,6 @@
extern void exception() __attribute__ ((noreturn));
extern void thread_exception_return() __attribute__ ((noreturn));
-extern void i386_exception() __attribute__ ((noreturn));
-
#if MACH_KDB
boolean_t debug_all_traps_with_kdb = FALSE;
extern struct db_watchpoint *db_watchpoint_list;
diff --git a/i386/i386/trap.h b/i386/i386/trap.h
index b4e9224..6f5d2af 100644
--- a/i386/i386/trap.h
+++ b/i386/i386/trap.h
@@ -36,6 +36,12 @@ char *trap_name(unsigned int trapnum);
unsigned int interrupted_pc(thread_t);
+void
+i386_exception(
+ int exc,
+ int code,
+ int subcode) __attribute__ ((noreturn));
+
#endif /* !__ASSEMBLER__ */
#endif /* _I386_TRAP_H_ */