* Build by defualt a 32-bit executable.

* My last checkin doesn't compile. Get it compiling again.

The 64-bit version has twice the peak memory usage of the 32-bit version on testcase15.stp.smt.

git-svn-id: https://stp-fast-prover.svn.sourceforge.net/svnroot/stp-fast-prover/trunk/stp@226 e59a4935-1847-0410-ae03-e826735625c1

diff --git a/scripts/Makefile.common b/scripts/Makefile.common
index ec455186b16e4b37749d5ea1a9a852b4d233e6cb..66b2cb077d65d58b59f3a7fdad5467138e2b1549 100644 (file)
--- a/scripts/Makefile.common
+++ b/scripts/Makefile.common
@@ -39,7 +39,7 @@ ifeq ($(shell uname -s), DarwinX)
   CFLAGS = -isysroot $(UNIVERSAL_SDK) $(UNIVERSAL_ARCH) $(CFLAGS_BASE)
 else
   LDFLAGS = $(LDFLAGS_BASE)
-  CFLAGS = $(CFLAGS_BASE)
+  CFLAGS = $(CFLAGS_BASE) -m32
 endif
 
 #CXXFLAGS = $(CFLAGS) -Wall -Wextra -DEXT_HASH_MAP -Wno-deprecated

diff --git a/src/AST/Transform.cpp b/src/AST/Transform.cpp
index 9dd11fa4331a7e1b9d4b0ddbc179e5655d353c74..d89a78f371ac7bfa7456bd5f420faf967399d415 100644 (file)
--- a/src/AST/Transform.cpp
+++ b/src/AST/Transform.cpp
@@ -38,7 +38,7 @@ namespace BEEV
   // up the cache that the others use.
   ASTNode BeevMgr::TransformFormula_TopLevel(const ASTNode& form)
   {
-       runTimes.start(RunTimes::TransformFormulaTopLevel);
+       runTimes.start(RunTimes::Transforming);
 
     assert(TransformMap == NULL);
     TransformMap = new ASTNodeMap(100);
@@ -49,7 +49,7 @@ namespace BEEV
     delete TransformMap;
     TransformMap = NULL;
 
-    runTimes.stop(RunTimes::TransformFormulaTopLevel);
+    runTimes.stop(RunTimes::Transforming);
 
     return result;
   }
@@ -190,7 +190,7 @@ namespace BEEV
     //Get the name of Boolean Var
     var.PL_Print(outVar);
     constant.PL_Print(outNum);
-    std::string str(outVar.str()); 
+    std::string str(outVar.str());
     str += "(";
     str += outNum.str();
     str += ")";
@@ -304,7 +304,7 @@ namespace BEEV
          else
            {
              result = simpleForm;
-           }     
+           }
          break;
        }
       default: