Author: hjg
Date: 2008-07-31 09:06:36 -0400 (Thu, 31 Jul 2008)
New Revision: 2736
Modified:
branches/uml/source/cpu/cHardwareCPU.cc
branches/uml/source/cpu/cHardwareCPU.h
Log:
added in different selection instructions
Modified: branches/uml/source/cpu/cHardwareCPU.cc
===================================================================
--- branches/uml/source/cpu/cHardwareCPU.cc 2008-07-30 16:40:27 UTC (rev 2735)
+++ branches/uml/source/cpu/cHardwareCPU.cc 2008-07-31 13:06:36 UTC (rev 2736)
@@ -519,7 +519,7 @@
"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,
@@ -584,7 +584,7 @@
"Change to action 12"),
tInstLibEntry<tMethod>("action-13", &cHardwareCPU::Inst_Action13, false,
"Change to action 13"),
-*/
+
tInstLibEntry<tMethod>("prop-abs", &cHardwareCPU::Inst_AbsenceProperty, false,
"Add an absence property"),
@@ -4793,7 +4793,7 @@
-/*
+
bool cHardwareCPU::Inst_Trigger0(cAvidaContext& ctx)
{ return (organism->getStateDiagram()->absoluteJumpTrigger(0)); }
@@ -4886,8 +4886,8 @@
bool cHardwareCPU::Inst_Action13(cAvidaContext& ctx)
{ return (organism->getStateDiagram()->absoluteJumpAction(13)); }
-*/
+
bool cHardwareCPU::Inst_RelativeMoveTrigger(cAvidaContext& ctx)
{
ReadLabel();
Modified: branches/uml/source/cpu/cHardwareCPU.h
===================================================================
--- branches/uml/source/cpu/cHardwareCPU.h 2008-07-30 16:40:27 UTC (rev 2735)
+++ branches/uml/source/cpu/cHardwareCPU.h 2008-07-31 13:06:36 UTC (rev 2736)
@@ -642,7 +642,7 @@
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);
@@ -677,8 +677,8 @@
bool Inst_Action11(cAvidaContext& ctx);
bool Inst_Action12(cAvidaContext& ctx);
bool Inst_Action13(cAvidaContext& ctx);
- */
+
// UML instructions used to construct properties
bool Inst_AbsenceProperty(cAvidaContext& ctx);
bool Inst_UniversialityProperty(cAvidaContext& ctx);