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

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2008-01-29 13:53:23 -0500 (Tue, 29 Jan 2008)
New Revision: 2288

Modified:
   development/source/cpu/cHardwareExperimental.cc
Log:
Adjust PROMOTER_TO_REGISTER behavior to target Register D.

Modified: development/source/cpu/cHardwareExperimental.cc
===================================================================
--- development/source/cpu/cHardwareExperimental.cc	2008-01-29 18:17:43 UTC (rev 2287)
+++ development/source/cpu/cHardwareExperimental.cc	2008-01-29 18:53:23 UTC (rev 2288)
@@ -1348,11 +1348,7 @@
   // Reset the thread.
   if (m_world->GetConfig().TERMINATION_RESETS.Get())
   {
-    //const int write_head_pos = GetHead(nHardware::HEAD_WRITE).GetPosition();
-    //const int read_head_pos = GetHead(nHardware::HEAD_READ).GetPosition();
     m_threads[m_cur_thread].Reset(this, m_threads[m_cur_thread].GetID());
-    //GetHead(nHardware::HEAD_WRITE).Set(write_head_pos);
-    //GetHead(nHardware::HEAD_READ).Set(read_head_pos);
     
     //Setting this makes it harder to do things. You have to be modular.
     organism->GetOrgInterface().ResetInputs(ctx);   // Re-randomize the inputs this organism sees
@@ -1363,7 +1359,7 @@
   // Reset our count
   m_threads[m_cur_thread].ResetPromoterInstExecuted();
   m_advance_ip = false;
-  const int reg_used = REG_BX; // register to put chosen promoter code in, for now always BX
+  const int promoter_reg_used = REG_DX; // register to put chosen promoter code in, default to DX
   
   
   // @DMB - should the promoter index and offset be stored in cLocalThread to allow multiple threads?
@@ -1399,16 +1395,16 @@
         // Set defaults for when no active promoter is found
         m_promoter_index = -1;
         IP().Set(0);
-        GetRegister(reg_used) = 0;
-        
-        // @JEB HACK! -- All kinds of bad stuff happens if execution length is zero. For now:
-        if (m_world->GetConfig().NO_ACTIVE_PROMOTER_EFFECT.Get() == 2) m_memory.SetFlagExecuted(0);
+        GetRegister(promoter_reg_used) = 0;
         break;
+        
       case 1: // Death to organisms that refuse to use promoters!
         organism->Die();
         break;
+        
       default:
         cout << "Unrecognized NO_ACTIVE_PROMOTER_EFFECT setting: " << m_world->GetConfig().NO_ACTIVE_PROMOTER_EFFECT.Get() << endl;
+        exit(1);
         break;
     }
   } else {
@@ -1417,7 +1413,8 @@
     IP().Set(m_promoters[m_promoter_index].m_pos + 1);
     
     // Put its bit code in BX for the organism to have if option is set
-    if (m_world->GetConfig().PROMOTER_TO_REGISTER.Get()) GetRegister(reg_used) = m_promoters[m_promoter_index].m_bit_code;
+    if (m_world->GetConfig().PROMOTER_TO_REGISTER.Get())
+      GetRegister(promoter_reg_used) = m_promoters[m_promoter_index].m_bit_code;
   }
   return true;
 }