[Avida-cvs] [Avida2-svn] r376 - in development: Avida.xcodeproj source/cpu

[brysonda@myxo.css.msu.edu]

Author: brysonda
Date: 2005-11-07 12:27:01 -0500 (Mon, 07 Nov 2005)
New Revision: 376

Modified:
   development/Avida.xcodeproj/project.pbxproj
   development/source/cpu/cHardwareSMT.cc
   development/source/cpu/cHardwareSMT.h
Log:
Implement SMT::Apoptosis instruction

Modified: development/Avida.xcodeproj/project.pbxproj
===================================================================
--- development/Avida.xcodeproj/project.pbxproj	2005-11-06 21:26:23 UTC (rev 375)
+++ development/Avida.xcodeproj/project.pbxproj	2005-11-07 17:27:01 UTC (rev 376)
@@ -2043,7 +2043,7 @@
 /* Begin PBXProject section */
 		DCC30C4D0762532C008F7A48 /* Project object */ = {
 			isa = PBXProject;
-			buildConfigurationList = 702442D70859E0B00059BD9B /* Build configuration list for PBXProject "Avida2" */;
+			buildConfigurationList = 702442D70859E0B00059BD9B /* Build configuration list for PBXProject "Avida" */;
 			buildSettings = {
 			};
 			buildStyles = (
@@ -2571,7 +2571,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Deployment;
 		};
-		702442D70859E0B00059BD9B /* Build configuration list for PBXProject "Avida2" */ = {
+		702442D70859E0B00059BD9B /* Build configuration list for PBXProject "Avida" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				702442D80859E0B00059BD9B /* Development */,

Modified: development/source/cpu/cHardwareSMT.cc
===================================================================
--- development/source/cpu/cHardwareSMT.cc	2005-11-06 21:26:23 UTC (rev 375)
+++ development/source/cpu/cHardwareSMT.cc	2005-11-07 17:27:01 UTC (rev 376)
@@ -90,7 +90,8 @@
     cInstEntry("ThreadFork", &cHardwareSMT::Inst_ForkThread), // 33
     cInstEntry("ThreadKill", &cHardwareSMT::Inst_KillThread), // 34
     cInstEntry("IO", &cHardwareSMT::Inst_IO), // 35
-    cInstEntry("Inject", &cHardwareSMT::Inst_Inject) // 36
+    cInstEntry("Inject", &cHardwareSMT::Inst_Inject), // 36
+    cInstEntry("Apoptosis", &cHardwareSMT::Inst_Apoptosis)
   };
 	
   const int n_size = sizeof(s_n_array)/sizeof(cNOPEntry);
@@ -2198,3 +2199,10 @@
 	
   return InjectParasite(mut_multiplier);
 }
+
+bool cHardwareSMT::Inst_Apoptosis()
+{
+  organism->Die();
+  
+  return true;
+}

Modified: development/source/cpu/cHardwareSMT.h
===================================================================
--- development/source/cpu/cHardwareSMT.h	2005-11-06 21:26:23 UTC (rev 375)
+++ development/source/cpu/cHardwareSMT.h	2005-11-07 17:27:01 UTC (rev 376)
@@ -296,6 +296,7 @@
   bool Inst_KillThread();
   bool Inst_IO();
   bool Inst_Inject();
+  bool Inst_Apoptosis();
 };