--- previous/src/dimension/i860cfg.h	2018/04/24 19:30:01	1.1
+++ previous/src/dimension/i860cfg.h	2018/04/24 19:31:31	1.1.1.2
@@ -9,6 +9,8 @@
 #ifndef i860cfg_h
 #define i860cfg_h
 
+#include "configuration.h"
+
 /* Emulator configurations - keep in sync with i860_cpu_device::init() */
 
 #define CONF_I860_SPEED     1
@@ -16,8 +18,13 @@
 #define CONF_I860_NO_THREAD 3
 #define CONF_STR(CONF) #CONF
 
-/* Change this to select your emulator configuration */
+#if ENABLE_TESTING
+#define CONF_I860 CONF_I860_DEV
+#else
 #define CONF_I860 CONF_I860_SPEED
+#endif
+
+#define WITH_SOFTFLOAT_I860  1
 
 /* Emulator configurations */
 
@@ -27,7 +34,6 @@
 #define TRACE_UNDEFINED_I860 1
 #define TRACE_UNALIGNED_MEM  1
 #define TRACE_EXT_INT        0
-#define ENABLE_I860_THREAD   1
 #define ENABLE_I860_DB_BREAK 0
 #define ENABLE_PERF_COUNTERS 1
 #define ENABLE_DEBUGGER      1
@@ -38,7 +44,6 @@
 #define TRACE_UNDEFINED_I860 0
 #define TRACE_UNALIGNED_MEM  0
 #define TRACE_EXT_INT        0
-#define ENABLE_I860_THREAD   1
 #define ENABLE_I860_DB_BREAK 0
 #define ENABLE_PERF_COUNTERS 0
 #define ENABLE_DEBUGGER      0
@@ -50,7 +55,6 @@
 #define TRACE_UNDEFINED_I860 0
 #define TRACE_UNALIGNED_MEM  0
 #define TRACE_EXT_INT        0
-#define ENABLE_I860_THREAD   0
 #define ENABLE_I860_DB_BREAK 0
 #define ENABLE_PERF_COUNTERS 0
 #define ENABLE_DEBUGGER      0