tracer-x · rasoolmaghareh · Apr 2, 2021 · Apr 2, 2021 · Apr 30, 2021 · May 7, 2021
diff --git a/include/klee/Internal/Module/TxValues.h b/include/klee/Internal/Module/TxValues.h
@@ -47,6 +47,7 @@ class TxStoreEntry;
 class TxStore;
 
 const uint64_t symbolicBoundId = ULONG_MAX;
+void setDebugSubsumptionLevelTxValue(int debugSubsumptionLevel);
 
 class TxAllocationContext {
 
@@ -626,7 +627,8 @@ class TxStateAddress {
   ///
   /// \param stream The stream to print the data to.
   /// \param prefix Padding spaces to print before the actual data.
-  void print(llvm::raw_ostream &stream, const std::string &prefix) const;
+  void print(llvm::raw_ostream &stream, const std::string &prefix, int debug) const;
+void print(llvm::raw_ostream &stream, const std::string &prefix) const;
 };
 
 /// \brief A class that represents LLVM value that can be destructively

diff --git a/include/klee/util/TxPrintUtil.h b/include/klee/util/TxPrintUtil.h
@@ -113,7 +113,7 @@ class TxPrettyExpressionBuilder {
   static std::string construct(ref<Expr> e);
 
   static std::string constructQuery(ConstraintManager &constraints,
-                                    ref<Expr> e);
+                                    ref<Expr> e, int debugSubsumptionLevel);
 };
 
 /// \brief Output function name to the output stream

diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp
@@ -2857,7 +2857,7 @@ static inline const llvm::fltSemantics *fpWidthToSemantics(unsigned width) {
 void Executor::executeInstruction(ExecutionState &state, KInstruction *ki) {
   Instruction *i = ki->inst;
   // if this is starting a new BB then
-  // check for non-linear & new BB in speculation mode
+  // check for non-linear & new BB in speculation mode  
   if (INTERPOLATION_ENABLED && SpecTypeToUse != NO_SPEC &&
       txTree->isSpeculationNode() &&
       (i == &state.txTreeNode->getBasicBlock()->front())) {

diff --git a/lib/Core/TxDependency.cpp b/lib/Core/TxDependency.cpp
@@ -14,6 +14,7 @@
 ///
 //===----------------------------------------------------------------------===//
 
+
 #include "TxDependency.h"
 
 #include "Context.h"
@@ -44,7 +45,6 @@
 using namespace klee;
 
 namespace klee {
-
 bool TxDependency::isMainArgument(const llvm::Value *loc) {
   const llvm::Argument *vArg = llvm::dyn_cast<llvm::Argument>(loc);
 
@@ -305,20 +305,25 @@ TxDependency::TxDependency(
     std::map<const llvm::GlobalValue *, ref<ConstantExpr> > *_globalAddresses)
     : parent(parent), left(0), right(0), targetData(_targetData),
       globalAddresses(_globalAddresses) {
+
+
   if (parent) {
     pathCondition = TxPathCondition::create(parent->pathCondition);
     store = TxStore::create(parent->store);
     debugSubsumptionLevel = parent->debugSubsumptionLevel;
+    setDebugSubsumptionLevelTxValue(debugSubsumptionLevel);
     debugStateLevel = parent->debugStateLevel;
   } else {
     pathCondition = TxPathCondition::create(0);
     store = TxStore::create(0);
 #ifdef ENABLE_Z3
     debugSubsumptionLevel = DebugSubsumption;
     debugStateLevel = DebugState;
+    setDebugSubsumptionLevelTxValue(debugSubsumptionLevel);
 #else
     debugSubsumptionLevel = 0;
     debugStateLevel = 0;
+    setDebugSubsumptionLevelTxValue(debugSubsumptionLevel);
 #endif
   }
 }
@@ -1576,21 +1581,21 @@ ref<TxStateValue> TxDependency::evalConstantExpr(
 
 /// \brief Print the content of the object to the LLVM error stream
 void TxDependency::print(llvm::raw_ostream &stream) const {
-  this->print(stream, 0);
+  this->print(stream);
 }
 
 void TxDependency::print(llvm::raw_ostream &stream,
-                         const unsigned paddingAmount) const {
+                         const unsigned paddingAmount, int debugSubsumptionLevel) const {
   std::string tabs = makeTabs(paddingAmount);
 
-  pathCondition->print(stream, paddingAmount);
+  pathCondition->print(stream, paddingAmount, debugSubsumptionLevel);
   stream << "\n";
 
   store->print(stream, paddingAmount);
 
   if (parent) {
     stream << tabs << "\n--------- Parent Dependencies ----------\n";
-    parent->print(stream, paddingAmount);
+    parent->print(stream, paddingAmount, debugSubsumptionLevel);
   }
 }
 }
diff --git a/lib/Core/TxDependency.h b/lib/Core/TxDependency.h
@@ -17,6 +17,7 @@
 #ifndef KLEE_DEPENDENCY_H
 #define KLEE_DEPENDENCY_H
 
+
 #include "TxPathCondition.h"
 #include "TxStore.h"
 
@@ -336,6 +337,10 @@ class TxDependency {
 
   std::set<ref<TxStoreEntry> > &getMarkedGlobal() { return markedGlobal; }
 
+  void setMarkedGlobal(std::set<ref<TxStoreEntry> >& newMarkedGlobal) {
+	  markedGlobal = newMarkedGlobal;
+	}
+
   bool isEntryInParent(ref<TxStoreEntry> se) {
     if (!parent)
       return false;
@@ -586,7 +591,7 @@ class TxDependency {
   /// \param stream The stream to print the data to.
   /// \param paddingAmount The number of whitespaces to be printed before each
   /// line.
-  void print(llvm::raw_ostream &stream, const unsigned paddingAmount) const;
+  void print(llvm::raw_ostream &stream, const unsigned paddingAmount, int debugSubsumptionLevel) const;
 };
 }
 

diff --git a/lib/Core/TxPathCondition.cpp b/lib/Core/TxPathCondition.cpp
@@ -197,11 +197,11 @@ ref<Expr> TxPathCondition::packInterpolant(
 }
 
 void TxPathCondition::print(llvm::raw_ostream &stream) const {
-  print(stream, 0);
+  print(stream, 0, 0);
 }
 
 void TxPathCondition::print(llvm::raw_ostream &stream,
-                            const unsigned paddingAmount) const {
+                            const unsigned paddingAmount, int debugSubsumptionLevel) const {
   std::string tabs = makeTabs(paddingAmount);
   std::string tabsNext = appendTab(tabs);
 

diff --git a/lib/Core/TxPathCondition.h b/lib/Core/TxPathCondition.h
@@ -127,7 +127,7 @@ class TxPathCondition {
   /// \param stream The stream to print the data to.
   /// \param paddingAmount The number of whitespaces to be printed before each
   /// line.
-  void print(llvm::raw_ostream &stream, const unsigned paddingAmount) const;
+  void print(llvm::raw_ostream &stream, const unsigned paddingAmount, int debugSubsumptionLevel) const;
 };
 }
 

diff --git a/lib/Core/TxPrintUtil.cpp b/lib/Core/TxPrintUtil.cpp
@@ -533,10 +533,11 @@ std::string TxPrettyExpressionBuilder::construct(ref<Expr> e) {
 
 std::string
 TxPrettyExpressionBuilder::constructQuery(ConstraintManager &constraints,
-                                          ref<Expr> query) {
+                                          ref<Expr> query, int debugSubsumptionLevel) {  // Added 'debugSubsumptionLevel' variable for PrettyPrint
   std::string msg;
   std::string tabs = makeTabs(1);
   llvm::raw_string_ostream stream(msg);
+  if (debugSubsumptionLevel>3){ /*Added 'debugSubsumptionLevel' varaible here for Pretty Print*/
   stream << "antecedent:\n";
   for (ConstraintManager::const_iterator it = constraints.begin(),
                                          ie = constraints.end();
@@ -545,7 +546,7 @@ TxPrettyExpressionBuilder::constructQuery(ConstraintManager &constraints,
   }
   stream << "consequent:\n";
   stream << tabs << construct(query) << "\n";
-  stream.flush();
+  stream.flush();} 
   return msg;
 }
 

diff --git a/lib/Core/TxStore.cpp b/lib/Core/TxStore.cpp
@@ -301,6 +301,7 @@ TxStore::getAddressofLatestCopyLLVMValue(llvm::Value *val) {
                                      ie = internalStore.end();
        it != ie; ++it) {
     ref<TxAllocationContext> temp = (*it).first;
+    //llvm::outs()<<"Address-01\n";
     if (temp->getValue() == val) {
       if (!foundValue) {
         address = temp;
@@ -311,11 +312,39 @@ TxStore::getAddressofLatestCopyLLVMValue(llvm::Value *val) {
       }
     }
   }
-
-  // Maybe NULL
   return address;
 }
 
+ref<TxStoreEntry> TxStore::getAddressofLatestCopyLLVMValueFromHistoricalStore(llvm::Value *val){
+ref<TxStoreEntry> address;
+ bool foundValue = false;
+for (LowerStateStore::const_iterator
+          it = symbolicallyAddressedHistoricalStore.begin(),
+          ie = symbolicallyAddressedHistoricalStore.end();
+      it != ie; ++it) {
+ref<TxStoreEntry> temp = (*it).second;
+    if (temp->getValue() == val) {     
+        address = temp;
+        foundValue = true;
+    }
+}
+if(!foundValue)
+{
+for (LowerStateStore::const_iterator
+          it = concretelyAddressedHistoricalStore.begin(),
+          ie = concretelyAddressedHistoricalStore.end();
+      it != ie; ++it) {
+ref<TxStoreEntry> temp = (*it).second;
+    if (temp->getValue() == val) {     
+        address = temp;
+        foundValue = true;
+    }
+}
+
+}
+return address;
+}
+
 inline void TxStore::concreteToInterpolant(
     ref<TxVariable> variable, ref<TxStoreEntry> entry,
     const std::map<ref<Expr>, ref<Expr> > &substitution,
@@ -795,7 +824,7 @@ bool TxStore::markPointerFlow(ref<TxStateValue> target,
 }
 
 /// \brief Print the content of the object to the LLVM error stream
-void TxStore::print(llvm::raw_ostream &stream) const { this->print(stream, 0); }
+void TxStore::print(llvm::raw_ostream &stream) const { this->print(stream); }
 
 void TxStore::print(llvm::raw_ostream &stream,
                     const unsigned paddingAmount) const {

diff --git a/lib/Core/TxStore.h b/lib/Core/TxStore.h
@@ -272,6 +272,8 @@ class TxStore {
       LowerInterpolantStore &_symbolicallyAddressedHistoricalStore) const;
 
   ref<TxAllocationContext> getAddressofLatestCopyLLVMValue(llvm::Value *val);
+
+  ref<TxStoreEntry> getAddressofLatestCopyLLVMValueFromHistoricalStore(llvm::Value *val);
 
   /// \brief Newly relate a location with its stored value, when the value is
   /// loaded from the location