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

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2007-02-20 08:36:25 -0500 (Tue, 20 Feb 2007)
New Revision: 1341

Modified:
   development/source/cpu/cHardwareExperimental.h
   development/source/cpu/cInstSet.h
Log:
Eh? SVN missed some files. Rewrite cHardwareExperimental's head search to search for 'label' instruction delineated labels.

Modified: development/source/cpu/cHardwareExperimental.h
===================================================================
--- development/source/cpu/cHardwareExperimental.h	2007-02-20 13:32:01 UTC (rev 1340)
+++ development/source/cpu/cHardwareExperimental.h	2007-02-20 13:36:25 UTC (rev 1341)
@@ -163,10 +163,7 @@
   const cCodeLabel& GetLabel() const { return m_threads[m_cur_thread].next_label; }
   cCodeLabel& GetLabel() { return m_threads[m_cur_thread].next_label; }
   void ReadLabel(int max_size=nHardware::MAX_LABEL_SIZE);
-  cHeadCPU FindLabel(int direction);
-  int FindLabel_Forward(const cCodeLabel & search_label, const cGenome& search_genome, int pos);
-  int FindLabel_Backward(const cCodeLabel & search_label, const cGenome& search_genome, int pos);
-  cHeadCPU FindLabel(const cCodeLabel & in_label, int direction);
+  cHeadCPU FindLabelStart();
   const cCodeLabel& GetReadLabel() const { return m_threads[m_cur_thread].read_label; }
   cCodeLabel& GetReadLabel() { return m_threads[m_cur_thread].read_label; }
   

Modified: development/source/cpu/cInstSet.h
===================================================================
--- development/source/cpu/cInstSet.h	2007-02-20 13:32:01 UTC (rev 1340)
+++ development/source/cpu/cInstSet.h	2007-02-20 13:36:25 UTC (rev 1341)
@@ -112,6 +112,7 @@
 
   // Instruction Analysis.
   int IsNop(const cInstruction& inst) const { return (inst.GetOp() < m_lib_nopmod_map.GetSize()); }
+  int IsLabel(const cInstruction& inst) const { return m_inst_lib->Get(inst.GetOp()).IsLabel(); }
 
   // Insertion of new instructions...
   int AddInst(int lib_fun_id, int redundancy = 1, int ft_cost = 0, int cost = 0, double prob_fail = 0.0, int addl_time_cost = 0);