Clear logs

Author: CaelmBleidd

usvm-ts/src/main/kotlin/org/usvm/machine/TsMachine.kt

@@ -8,7 +8,6 @@ import org.usvm.CoverageZone
 import org.usvm.StateCollectionStrategy
 import org.usvm.UMachine
 import org.usvm.UMachineOptions
-import org.usvm.UPathSelector
 import org.usvm.api.targets.TsTarget
 import org.usvm.machine.interpreter.TsInterpreter
 import org.usvm.machine.state.TsMethodResult
@@ -74,39 +73,15 @@ class TsMachine(
 
         val timeStatistics = TimeStatistics<EtsMethod, TsState>()
 
-        val pathSelector = object : UPathSelector<TsState> {
-            val internalSelector = createPathSelector(
-                initialStates = initialStates,
-                options = options,
-                applicationGraph = graph,
-                timeStatistics = timeStatistics,
-                coverageStatisticsFactory = { coverageStatistics },
-                cfgStatisticsFactory = { cfgStatistics },
-                callGraphStatisticsFactory = { callGraphStatistics }
-            )
-
-            override fun isEmpty(): Boolean {
-                return internalSelector.isEmpty()
-            }
-
-            override fun peek(): TsState {
-                return internalSelector.peek()
-            }
-
-            override fun remove(state: TsState) {
-                logger.warn { "Selector size -1" }
-                return internalSelector.remove(state)
-            }
-
-            override fun add(states: Collection<TsState>) {
-                logger.warn { "Selector size +1" }
-                return internalSelector.add(states)
-            }
-
-            override fun update(state: TsState) {
-                return internalSelector.update(state)
-            }
-        }
+        val pathSelector = createPathSelector(
+            initialStates = initialStates,
+            options = options,
+            applicationGraph = graph,
+            timeStatistics = timeStatistics,
+            coverageStatisticsFactory = { coverageStatistics },
+            cfgStatisticsFactory = { cfgStatistics },
+            callGraphStatisticsFactory = { callGraphStatistics }
+        )
 
         val statesCollector =
             when (options.stateCollectionStrategy) {
@@ -169,16 +144,6 @@ class TsMachine(
             )
         }
 
-        val endReasonObserver = object : UMachineObserver<TsState> {
-            override fun onStateTerminated(state: TsState, stateReachable: Boolean) {
-                logger.warn {
-                    "State is terminated on ${state.currentStatement} in the method ${state.currentStatement.method}"
-                }
-            }
-        }
-
-        observers += endReasonObserver
-
         run(
             interpreter,
             pathSelector,

usvm-ts/src/main/kotlin/org/usvm/machine/expr/TsExprResolver.kt

@@ -1075,7 +1075,7 @@ class TsSimpleValueResolver(
                 return mkFieldLValue(ctx.addressSort, globalObject, local.name)
             }
 
-            logger.warn { "Cannot resolve local $local" }
+            logger.warn { "Cannot resolve local $local, creating a fake field of the global object" }
 
             globalObject.createFakeField(localName, scope)
             scope.doWithState {

usvm-ts/src/main/kotlin/org/usvm/machine/interpreter/TsInterpreter.kt

@@ -243,7 +243,7 @@ class TsInterpreter(
         val entryPoint = graph.entryPoints(stmt.callee).singleOrNull()
 
         if (entryPoint == null) {
-            logger.warn { "No entry point for method: ${stmt.callee}" }
+            logger.warn { "No entry point for method: ${stmt.callee}, mocking the call" }
             // If the method doesn't have entry points,
             // we go through it, we just mock the call
             mockMethodCall(scope, stmt.callee.signature)
@@ -355,8 +355,6 @@ class TsInterpreter(
 
         val (posStmt, negStmt) = graph.successors(stmt).take(2).toList()
 
-        logger.warn { "Forking on if stmt $stmt" }
-
         scope.forkWithBlackList(
             boolExpr,
             posStmt,
@@ -637,10 +635,7 @@ class TsInterpreter(
                         local.name to localIdx
                     }.toMap()
                 }
-                map[local.name] ?: run {
-                    logger.error("Local not declared: $local")
-                    return null
-                }
+                map[local.name]
             }
 
             // Note: 'this' has index 'n'