[Avida-SVN] r2556 - branches/uml/source/cpu

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2008-04-27 13:31:02 -0400 (Sun, 27 Apr 2008)
New Revision: 2556

Modified:
   branches/uml/source/cpu/cHardwareCPU.cc
   branches/uml/source/cpu/cHardwareCPU.h
Log:


Modified: branches/uml/source/cpu/cHardwareCPU.cc
===================================================================
--- branches/uml/source/cpu/cHardwareCPU.cc	2008-04-27 17:13:06 UTC (rev 2555)
+++ branches/uml/source/cpu/cHardwareCPU.cc	2008-04-27 17:31:02 UTC (rev 2556)
@@ -433,7 +433,7 @@
 							 "Change to state diagram 2"),
 	tInstLibEntry<tMethod>("sd-3", &cHardwareCPU::Inst_StateDiag3, false, 
 							 "Change to state diagram 3"),
-/*	tInstLibEntry<tMethod>("s-orig-0", &cHardwareCPU::Inst_OrigState0, false, 
+	tInstLibEntry<tMethod>("s-orig-0", &cHardwareCPU::Inst_OrigState0, false, 
 					"Change the origin to state 0"),
 	tInstLibEntry<tMethod>("s-orig-1", &cHardwareCPU::Inst_OrigState1, false, 
 					"Change the origin to state 1"),
@@ -509,7 +509,17 @@
 					"Change to transition label 10"),		
 	tInstLibEntry<tMethod>("trans-11", &cHardwareCPU::Inst_TransLab11, false, 
 					"Change to transition label 11"),	
-					
+	tInstLibEntry<tMethod>("trans-12", &cHardwareCPU::Inst_TransLab12, false, 
+							 "Change to transition label 12"),		
+	tInstLibEntry<tMethod>("trans-13", &cHardwareCPU::Inst_TransLab13, false, 
+							 "Change to transition label 13"),		
+	tInstLibEntry<tMethod>("trans-14", &cHardwareCPU::Inst_TransLab14, false, 
+							 "Change to transition label 14"),		
+	tInstLibEntry<tMethod>("trans-15", &cHardwareCPU::Inst_TransLab15, false, 
+							 "Change to transition label 15"),		
+	tInstLibEntry<tMethod>("trans-16", &cHardwareCPU::Inst_TransLab16, false, 
+							 "Change to transition label 16"),		  
+/*					
 	tInstLibEntry<tMethod>("trig-0", &cHardwareCPU::Inst_Trigger0, false, 
 					"Change to trigger 0"),	
 	tInstLibEntry<tMethod>("trig-1", &cHardwareCPU::Inst_Trigger1, false, 
@@ -4650,7 +4660,7 @@
 bool cHardwareCPU::Inst_StateDiag3(cAvidaContext& ctx)
 { return (organism->absoluteJumpStateDiagram(3)); }
 
-/*
+
 bool cHardwareCPU::Inst_OrigState0(cAvidaContext& ctx)
 { return (organism->getStateDiagram()->absoluteJumpOriginState(0)); }
 
@@ -4766,6 +4776,24 @@
 bool cHardwareCPU::Inst_TransLab11(cAvidaContext& ctx)
 { return (organism->getStateDiagram()->absoluteJumpTransitionLabel(11)); }
 
+bool cHardwareCPU::Inst_TransLab12(cAvidaContext& ctx)
+{ return (organism->getStateDiagram()->absoluteJumpTransitionLabel(12)); }
+
+bool cHardwareCPU::Inst_TransLab13(cAvidaContext& ctx)
+{ return (organism->getStateDiagram()->absoluteJumpTransitionLabel(13)); }
+
+bool cHardwareCPU::Inst_TransLab14(cAvidaContext& ctx)
+{ return (organism->getStateDiagram()->absoluteJumpTransitionLabel(14)); }
+
+bool cHardwareCPU::Inst_TransLab15(cAvidaContext& ctx)
+{ return (organism->getStateDiagram()->absoluteJumpTransitionLabel(15)); }
+
+bool cHardwareCPU::Inst_TransLab16(cAvidaContext& ctx)
+{ return (organism->getStateDiagram()->absoluteJumpTransitionLabel(16)); }
+
+
+
+/*
 bool cHardwareCPU::Inst_Trigger0(cAvidaContext& ctx)
 { return (organism->getStateDiagram()->absoluteJumpTrigger(0)); }
 

Modified: branches/uml/source/cpu/cHardwareCPU.h
===================================================================
--- branches/uml/source/cpu/cHardwareCPU.h	2008-04-27 17:13:06 UTC (rev 2555)
+++ branches/uml/source/cpu/cHardwareCPU.h	2008-04-27 17:31:02 UTC (rev 2556)
@@ -594,7 +594,7 @@
   bool Inst_AbsoluteMoveTransLabel(cAvidaContext& ctx);  
   bool Inst_NextTransLabel(cAvidaContext& ctx);
   
-/*
+
   bool Inst_OrigState0(cAvidaContext& ctx);
   bool Inst_OrigState1(cAvidaContext& ctx);
   bool Inst_OrigState2(cAvidaContext& ctx);
@@ -637,7 +637,12 @@
   bool Inst_TransLab9(cAvidaContext& ctx);
   bool Inst_TransLab10(cAvidaContext& ctx);
   bool Inst_TransLab11(cAvidaContext& ctx);
-
+  bool Inst_TransLab12(cAvidaContext& ctx);
+  bool Inst_TransLab13(cAvidaContext& ctx);
+  bool Inst_TransLab14(cAvidaContext& ctx);
+  bool Inst_TransLab15(cAvidaContext& ctx);
+  bool Inst_TransLab16(cAvidaContext& ctx);  
+/*
   bool Inst_Trigger0(cAvidaContext& ctx);
   bool Inst_Trigger1(cAvidaContext& ctx);
   bool Inst_Trigger2(cAvidaContext& ctx);