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

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2008-12-12 16:55:21 -0500 (Fri, 12 Dec 2008)
New Revision: 3028

Modified:
   development/source/cpu/cHardwareCPU.cc
   development/source/cpu/cHardwareGX.cc
Log:
Attempt to fix some conditional statements in the green-beard family of instructions that were discovered with GCC 4.2.   This breaks the green_beard_instructions consistency test.   I am not going to change the consistency test results until the code modification has been verified as correct by Jeff Clune.

Modified: development/source/cpu/cHardwareCPU.cc
===================================================================
--- development/source/cpu/cHardwareCPU.cc	2008-12-12 21:42:06 UTC (rev 3027)
+++ development/source/cpu/cHardwareCPU.cc	2008-12-12 21:55:21 UTC (rev 3028)
@@ -3757,9 +3757,7 @@
       }
       
       // stop searching through the neighbors if we already found one
-      if (found == true);{
-    	break;
-      }
+      if (found == true) break;
   
       m_organism->Rotate(1);
       neighbor_id++;
@@ -3831,9 +3829,7 @@
       }
       
       // stop searching through the neighbors if we already found one
-      if (found == true);{
-    	break;
-      }
+      if (found == true) break;
   
       m_organism->Rotate(1);
       neighbor_id++;
@@ -3908,9 +3904,7 @@
       }
       
       // stop searching through the neighbors if we already found one
-      if (found == true);{
-    	break;
-      }
+      if (found == true) break;
   
       m_organism->Rotate(1);
       neighbor_id++;
@@ -4005,9 +3999,7 @@
       }
       
       // stop searching through the neighbors if we already found one
-      if (found == true);{
-    	break;
-      }
+      if (found == true) break;
   
       m_organism->Rotate(1);
       neighbor_id++;

Modified: development/source/cpu/cHardwareGX.cc
===================================================================
--- development/source/cpu/cHardwareGX.cc	2008-12-12 21:42:06 UTC (rev 3027)
+++ development/source/cpu/cHardwareGX.cc	2008-12-12 21:55:21 UTC (rev 3028)
@@ -2701,9 +2701,7 @@
       }
       
       // stop searching through the neighbors if we already found one
-      if (found == true);{
-    	break;
-      }
+      if (found == true) break;
   
       m_organism->Rotate(1);
       neighbor_id++;
@@ -2775,9 +2773,7 @@
       }
       
       // stop searching through the neighbors if we already found one
-      if (found == true);{
-    	break;
-      }
+      if (found == true) break;
   
       m_organism->Rotate(1);
       neighbor_id++;
@@ -2852,9 +2848,7 @@
       }
       
       // stop searching through the neighbors if we already found one
-      if (found == true);{
-    	break;
-      }
+      if (found == true) break;
   
       m_organism->Rotate(1);
       neighbor_id++;
@@ -2949,9 +2943,7 @@
       }
       
       // stop searching through the neighbors if we already found one
-      if (found == true);{
-    	break;
-      }
+      if (found == true) break;
   
       m_organism->Rotate(1);
       neighbor_id++;