[avida-cvs] avida(kaben) CVS commits: /current/source defs.hh /current/source/cpu hardware_util.cc

[kaben]

kaben		Fri May 23 05:05:09 2003 EDT

  Modified files:              (Branch: kaben)
    /avida/current/source	defs.hh 
    /avida/current/source/cpu	hardware_util.cc 
  Log:
  
  Merge against main branch.
  
  
  
Index: avida/current/source/defs.hh
diff -u avida/current/source/defs.hh:1.25.2.4 avida/current/source/defs.hh:1.25.2.5
--- avida/current/source/defs.hh:1.25.2.4	Fri May 23 03:17:39 2003
+++ avida/current/source/defs.hh	Fri May 23 05:05:07 2003
@@ -18,7 +18,14 @@
 #define HTMLDIR "../work/doc_html/"
 #endif
 
+/*
+When defined, instruction sets, instruction libraries, hardware use new
+instruction set code.  The old code remains, and will be used if the
+following is not defined.
+*/
+/* XXX remove after regression tests */
 #define USE_INST_SET_CODE
+/**/
 
 // -= Various view modes =-
 #define VIEW_NEWVIEWER
Index: avida/current/source/cpu/hardware_util.cc
diff -u avida/current/source/cpu/hardware_util.cc:1.12.2.6 avida/current/source/cpu/hardware_util.cc:1.12.2.7
--- avida/current/source/cpu/hardware_util.cc:1.12.2.6	Fri May 23 04:07:41 2003
+++ avida/current/source/cpu/hardware_util.cc	Fri May 23 05:05:08 2003
@@ -55,22 +55,16 @@
     
     // Otherwise, this instruction will be in the set.
     // First, determine if it is a nop...
-#ifdef USE_INST_SET_CODE
-    /* XXX start -- kgn */
     int nop_mod = -1;
-    if(nop_dict.Find(inst_name, nop_mod) == true) {
+    if (nop_dict.Find(inst_name, nop_mod) == true) {
+#ifdef USE_INST_SET_CODE
       inst_set.AddNop2(nop_mod, redundancy, ft_cost, cost, prob_fail);
-      continue;
-    }
-    /* XXX end */
 #else /* USE_INST_SET_CODE */
-    int nop_mod = -1;
-    if (nop_dict.Find(inst_name, nop_mod) == true) {
       inst_set.AddNop(inst_name, &cHardwareBase::Inst_Nop, nop_mod,
 		      redundancy, ft_cost, cost, prob_fail);
+#endif /* USE_INST_SET_CODE */
       continue;
     }
-#endif /* USE_INST_SET_CODE */
 
     // Otherwise, it had better be in the main dictionary...
 #ifdef USE_INST_SET_CODE