* sim-main.h, sky-libvpe.c: r59fp_op* functions were called with

	1st parm of wrong type.  Converted remaining "/" to "FDiv".
	* interp.c: Make "--float-type host" the default.

diff --git a/sim/mips/sim-main.h b/sim/mips/sim-main.h
index a1ea1aa7bf68973f001ee0e6bf5942c703fe12df..137f08dadc6bd0da318051b0290f39edef231667 100644 (file)
--- a/sim/mips/sim-main.h
+++ b/sim/mips/sim-main.h
@@ -171,6 +171,7 @@ convert (SD, CPU, cia, rm, op, from, to)
 /* start-sanitize-sky */
 #ifdef TARGET_SKY
 #ifdef SKY_FUNIT
+#include <assert.h>
 #include "wf.h"
 #endif
 #endif
@@ -669,17 +670,6 @@ enum float_operation
   unsigned8 acc[3 * 8];
   /* end-sanitize-vr5400 */
 
-/* start-sanitize-sky */
-#ifdef TARGET_SKY
-#ifdef SKY_FUNIT
-  /* Record of option for floating point implementation type. */
-  int fp_type_opt;
-#define STATE_FP_TYPE_OPT(sd) ((sd)->base.fp_type_opt)
-#define STATE_FP_TYPE_OPT_TARGET 0x80000000
-#endif
-#endif
-/* end-sanitize-sky */
-
   sim_cpu_base base;
 };
 
@@ -707,6 +697,17 @@ struct sim_state {
 #define STATE_CPU(sd,n) (&(sd)->cpu[0])
 #endif
 
+/* start-sanitize-sky */
+#ifdef TARGET_SKY
+#ifdef SKY_FUNIT
+  /* Record of option for floating point implementation type. */
+  int fp_type_opt;
+#define STATE_FP_TYPE_OPT(sd) ((sd)->fp_type_opt)
+#define STATE_FP_TYPE_OPT_TARGET 0x80000000
+#endif
+#endif
+/* end-sanitize-sky */
+
   sim_state_base base;
 };