--- previous/src/dimension/i860cfg.h	2018/04/24 19:30:01	1.1
+++ previous/src/dimension/i860cfg.h	2018/04/24 19:33:24	1.1.1.3
@@ -9,6 +9,9 @@
 #ifndef i860cfg_h
 #define i860cfg_h
 
+#include "configuration.h"
+#include "log.h"
+
 /* Emulator configurations - keep in sync with i860_cpu_device::init() */
 
 #define CONF_I860_SPEED     1
@@ -16,44 +19,49 @@
 #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 */
 
 #if CONF_I860==CONF_I860_DEV
-#define TRACE_RDWR_MEM       0
-#define TRACE_PAGE_FAULT     0
-#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
+#define TRACE_RDWR_MEM         LOG_NONE
+#define TRACE_PAGE_FAULT       LOG_NONE
+#define TRACE_UNDEFINED_I860   LOG_WARN
+#define TRACE_UNALIGNED_MEM    LOG_WARN
+#define TRACE_EXT_INT          LOG_NONE
+#define TRACE_ADDR_TRANSLATION LOG_NONE
+#define ENABLE_I860_DB_BREAK   0
+#define ENABLE_PERF_COUNTERS   1
+#define ENABLE_DEBUGGER        1
 
 #elif CONF_I860==CONF_I860_SPEED
-#define TRACE_RDWR_MEM       0
-#define TRACE_PAGE_FAULT     0
-#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
+#define TRACE_RDWR_MEM         LOG_NONE
+#define TRACE_PAGE_FAULT       LOG_NONE
+#define TRACE_UNDEFINED_I860   LOG_NONE
+#define TRACE_UNALIGNED_MEM    LOG_NONE
+#define TRACE_EXT_INT          LOG_NONE
+#define TRACE_ADDR_TRANSLATION LOG_NONE
+#define ENABLE_I860_DB_BREAK   0
+#define ENABLE_PERF_COUNTERS   0
+#define ENABLE_DEBUGGER        0
 
 
 #elif CONF_I860==CONF_I860_NO_THREAD
-#define TRACE_RDWR_MEM       0
-#define TRACE_PAGE_FAULT     0
-#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
+#define TRACE_RDWR_MEM         LOG_NONE
+#define TRACE_PAGE_FAULT       LOG_NONE
+#define TRACE_UNDEFINED_I860   LOG_NONE
+#define TRACE_UNALIGNED_MEM    LOG_NONE
+#define TRACE_EXT_INT          LOG_NONE
+#define TRACE_ADDR_TRANSLATION LOG_NONE
+#define ENABLE_I860_DB_BREAK   0
+#define ENABLE_PERF_COUNTERS   0
+#define ENABLE_DEBUGGER        0
 
 #endif