[Avida-SVN] r2759 - development/source/cpu

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2008-08-26 10:52:57 -0400 (Tue, 26 Aug 2008)
New Revision: 2759

Modified:
   development/source/cpu/cHardwareExperimental.cc
   development/source/cpu/cHardwareExperimental.h
Log:
Change cHardwareExperimental::setInternalValue to properly propagate env_component status.

Add number moldiness support to tracing output.

Modified: development/source/cpu/cHardwareExperimental.cc
===================================================================
--- development/source/cpu/cHardwareExperimental.cc	2008-08-23 14:57:39 UTC (rev 2758)
+++ development/source/cpu/cHardwareExperimental.cc	2008-08-26 14:52:57 UTC (rev 2759)
@@ -503,9 +503,12 @@
   fp << organism->GetPhenotype().GetCPUCyclesUsed() << " ";
   fp << "IP:" << IP().GetPosition() << "    ";
   
+  
   for (int i = 0; i < NUM_REGISTERS; i++) {
+    sInternalValue& reg = m_threads[m_cur_thread].reg[i];
     fp << static_cast<char>('A' + i) << "X:" << GetRegister(i) << " ";
-    fp << setbase(16) << "[0x" << GetRegister(i) << "]  " << setbase(10);
+    fp << setbase(16) << "[0x" << reg.value <<  "] " << setbase(10);
+    fp << "(" << reg.from_env << " " << reg.env_component << " " << reg.originated << " " << reg.oldest_component << ")  ";
   }
   
   // Add some extra information if additional time costs are used for instructions,
@@ -520,6 +523,7 @@
     << "W-Head:" << GetHead(nHardware::HEAD_WRITE).GetPosition()  << " "
     << "F-Head:" << GetHead(nHardware::HEAD_FLOW).GetPosition()   << "  "
     << "RL:" << GetReadLabel().AsString() << "   "
+    << "Ex:" << m_last_output
     << endl;
     
   int number_of_stacks = GetNumStacks();

Modified: development/source/cpu/cHardwareExperimental.h
===================================================================
--- development/source/cpu/cHardwareExperimental.h	2008-08-23 14:57:39 UTC (rev 2758)
+++ development/source/cpu/cHardwareExperimental.h	2008-08-26 14:52:57 UTC (rev 2759)
@@ -530,7 +530,7 @@
   dest.from_env = false;
   dest.originated = m_cycle_count;
   dest.oldest_component = src.oldest_component;
-  dest.env_component = src.from_env;  
+  dest.env_component = src.env_component;
 }