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

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2007-02-10 13:27:27 -0500 (Sat, 10 Feb 2007)
New Revision: 1263

Modified:
   development/source/cpu/cHardwareExperimental.h
   development/support/config/experimental.org
   development/support/config/instset-experimental.cfg
Log:
Adjust experimental hardware to 6 registers/heads/nops.

Modified: development/source/cpu/cHardwareExperimental.h
===================================================================
--- development/source/cpu/cHardwareExperimental.h	2007-02-10 18:24:55 UTC (rev 1262)
+++ development/source/cpu/cHardwareExperimental.h	2007-02-10 18:27:27 UTC (rev 1263)
@@ -68,10 +68,10 @@
 
 protected:
   // --------  Structure Constants  --------
-  static const int NUM_REGISTERS = 5;
+  static const int NUM_REGISTERS = 6;
   static const int NUM_HEADS = nHardware::NUM_HEADS >= NUM_REGISTERS ? nHardware::NUM_HEADS : NUM_REGISTERS;
   enum tRegisters { REG_AX = 0, REG_BX, REG_CX, REG_DX, REG_EX, REG_FX };
-  static const int NUM_NOPS = 5;
+  static const int NUM_NOPS = 6;
   
   // --------  Data Structures  --------
   struct cLocalThread

Modified: development/support/config/experimental.org
===================================================================
--- development/support/config/experimental.org	2007-02-10 18:24:55 UTC (rev 1262)
+++ development/support/config/experimental.org	2007-02-10 18:27:27 UTC (rev 1263)
@@ -1,6 +1,6 @@
 h-alloc    # Allocate space for child
 h-search   # Locate the end of the organism
-nop-E      #
+nop-F      #
 nop-A      #
 mov-head   # Place write-head at beginning of offspring.
 nop-C      #
@@ -90,7 +90,7 @@
 h-search   # Mark the beginning of the copy loop
 h-copy     # Do the copy
 if-label   # If we're done copying....
-nop-E      #
+nop-F      #
 nop-A      #
 h-divide   #    ...divide!
 mov-head   # Otherwise, loop back to the beginning of the copy loop.

Modified: development/support/config/instset-experimental.cfg
===================================================================
--- development/support/config/instset-experimental.cfg	2007-02-10 18:24:55 UTC (rev 1262)
+++ development/support/config/instset-experimental.cfg	2007-02-10 18:27:27 UTC (rev 1263)
@@ -3,6 +3,7 @@
 nop-C      1   # c
 nop-D      1   # c
 nop-E      1   # c
+nop-F      1   # c
 if-n-equ   1   # d
 if-less    1   # e
 pop        1   # f