[Avida-SVN] r1259 - in development: source/cpu support/config
brysonda at myxo.css.msu.edu
brysonda at myxo.css.msu.edu
Sat Feb 10 10:21:43 PST 2007
Author: brysonda
Date: 2007-02-10 13:21:43 -0500 (Sat, 10 Feb 2007)
New Revision: 1259
Modified:
development/source/cpu/cHardwareExperimental.h
development/support/config/experimental.org
development/support/config/instset-experimental.cfg
Log:
Adjust experimental hardware to 4 registers/heads/nops.
Modified: development/source/cpu/cHardwareExperimental.h
===================================================================
--- development/source/cpu/cHardwareExperimental.h 2007-02-10 18:11:56 UTC (rev 1258)
+++ development/source/cpu/cHardwareExperimental.h 2007-02-10 18:21:43 UTC (rev 1259)
@@ -68,10 +68,10 @@
protected:
// -------- Structure Constants --------
- static const int NUM_REGISTERS = 3;
+ static const int NUM_REGISTERS = 4;
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 = 3;
+ static const int NUM_NOPS = 4;
// -------- Data Structures --------
struct cLocalThread
Modified: development/support/config/experimental.org
===================================================================
--- development/support/config/experimental.org 2007-02-10 18:11:56 UTC (rev 1258)
+++ development/support/config/experimental.org 2007-02-10 18:21:43 UTC (rev 1259)
@@ -1,6 +1,6 @@
h-alloc # Allocate space for child
h-search # Locate the end of the organism
-nop-C #
+nop-D #
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-C #
+nop-D #
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:11:56 UTC (rev 1258)
+++ development/support/config/instset-experimental.cfg 2007-02-10 18:21:43 UTC (rev 1259)
@@ -1,6 +1,7 @@
nop-A 1 # a
nop-B 1 # b
nop-C 1 # c
+nop-D 1 # c
if-n-equ 1 # d
if-less 1 # e
pop 1 # f
More information about the Avida-cvs
mailing list