[Avida-SVN] r1716 - in development: Avida.xcodeproj source/cpu source/tools

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2007-06-26 00:39:35 -0400 (Tue, 26 Jun 2007)
New Revision: 1716

Modified:
   development/Avida.xcodeproj/project.pbxproj
   development/source/cpu/cHardwareExperimental.cc
   development/source/tools/cMerit.cc
Log:
Properly initialize reading flag in cHardwareExperimental::cLocalThread::Reset.

Modified: development/Avida.xcodeproj/project.pbxproj
===================================================================
--- development/Avida.xcodeproj/project.pbxproj	2007-06-25 17:31:01 UTC (rev 1715)
+++ development/Avida.xcodeproj/project.pbxproj	2007-06-26 04:39:35 UTC (rev 1716)
@@ -198,23 +198,6 @@
 		};
 /* End PBXBuildRule section */
 
-/* Begin PBXBuildStyle section */
-		B543837A0C300EE2005F1A1E /* Development */ = {
-			isa = PBXBuildStyle;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-			};
-			name = Development;
-		};
-		B543837B0C300EE2005F1A1E /* Deployment */ = {
-			isa = PBXBuildStyle;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-			};
-			name = Deployment;
-		};
-/* End PBXBuildStyle section */
-
 /* Begin PBXContainerItemProxy section */
 		7023ECA60C0A436000362B9C /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
@@ -1690,12 +1673,6 @@
 		DCC30C4D0762532C008F7A48 /* Project object */ = {
 			isa = PBXProject;
 			buildConfigurationList = 702442D70859E0B00059BD9B /* Build configuration list for PBXProject "Avida" */;
-			buildSettings = {
-			};
-			buildStyles = (
-				B543837A0C300EE2005F1A1E /* Development */,
-				B543837B0C300EE2005F1A1E /* Deployment */,
-			);
 			hasScannedForEncodings = 0;
 			mainGroup = DCC30C490762532C008F7A48;
 			productRefGroup = DCC3164E07626CF3008F7A48 /* Products */;

Modified: development/source/cpu/cHardwareExperimental.cc
===================================================================
--- development/source/cpu/cHardwareExperimental.cc	2007-06-25 17:31:01 UTC (rev 1715)
+++ development/source/cpu/cHardwareExperimental.cc	2007-06-26 04:39:35 UTC (rev 1716)
@@ -226,6 +226,8 @@
   stack.Clear();
   cur_stack = 0;
   cur_head = nHardware::HEAD_IP;
+  
+  reading = false;
   read_label.Clear();
   next_label.Clear();
 }

Modified: development/source/tools/cMerit.cc
===================================================================
--- development/source/tools/cMerit.cc	2007-06-25 17:31:01 UTC (rev 1715)
+++ development/source/tools/cMerit.cc	2007-06-26 04:39:35 UTC (rev 1716)
@@ -10,6 +10,8 @@
 
 #include "cMerit.h"
 
+#include <cmath>
+
 using namespace std;
 
 
@@ -30,7 +32,7 @@
 
   value = in_value;
 
-  double mant = frexp(value , &bits);
+  double mant = frexp(round(value), &bits);
 
   if (bits > max_bits)
     offset = bits - max_bits;