[Avida-SVN] r1385 - in development: source/cpu support/config

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2007-03-04 23:05:50 -0500 (Sun, 04 Mar 2007)
New Revision: 1385

Modified:
   development/source/cpu/cHardwareExperimental.cc
   development/support/config/instset-experimental.cfg
Log:
Adjust experimental cpu configuration to use goto instruction.

Modified: development/source/cpu/cHardwareExperimental.cc
===================================================================
--- development/source/cpu/cHardwareExperimental.cc	2007-03-05 03:07:09 UTC (rev 1384)
+++ development/source/cpu/cHardwareExperimental.cc	2007-03-05 04:05:50 UTC (rev 1385)
@@ -120,7 +120,7 @@
     tInstLibEntry<tMethod>("get-head", &cHardwareExperimental::Inst_GetHead, nInstFlag::DEFAULT, "Copy the position of the ?IP? head into CX"),
     tInstLibEntry<tMethod>("if-label", &cHardwareExperimental::Inst_IfLabel, nInstFlag::DEFAULT, "Execute next if we copied complement of attached label"),
     tInstLibEntry<tMethod>("set-flow", &cHardwareExperimental::Inst_SetFlow, nInstFlag::DEFAULT, "Set flow-head to position in ?CX?"),
-    tInstLibEntry<tMethod>("goto", &cHardwareExperimental::Inst_Goto, 0, "Move IP to labeled position matching the label that follows")
+    tInstLibEntry<tMethod>("goto", &cHardwareExperimental::Inst_Goto, nInstFlag::DEFAULT, "Move IP to labeled position matching the label that follows")
   };
   
   const int n_size = sizeof(s_n_array)/sizeof(cNOPEntry);

Modified: development/support/config/instset-experimental.cfg
===================================================================
--- development/support/config/instset-experimental.cfg	2007-03-05 03:07:09 UTC (rev 1384)
+++ development/support/config/instset-experimental.cfg	2007-03-05 04:05:50 UTC (rev 1385)
@@ -27,9 +27,8 @@
 if-label   1   # z
 set-flow   1   # A   Move flow-head to address in ?CX?
 label      1   # B   delineate labeled regions of the genome
+goto       1   # C   Move IP to the labeled position in the genome
 
-#goto       1   # C   Move IP to the labeled position in the genome
-
 #adv-head   1
 #jump-f     1
 #jump-b     1