More fixes for real applications

buildSrc/src/main/kotlin/Dependencies.kt

@@ -6,7 +6,7 @@ object Versions {
     const val clikt = "5.0.0"
     const val detekt = "1.23.7"
     const val ini4j = "0.5.4"
-    const val jacodb = "4ff7243d3a"
+    const val jacodb = "5889d3c784"
     const val juliet = "1.3.2"
     const val junit = "5.9.3"
     const val kotlin = "2.1.0"

usvm-core/src/main/kotlin/org/usvm/StepScope.kt

@@ -56,7 +56,9 @@ class StepScope<T : UState<Type, *, Statement, Context, *, T>, Type, Statement,
         contract {
             callsInPlace(block, InvocationKind.EXACTLY_ONCE)
         }
-        check(canProcessFurtherOnCurrentStep) { "Caller should check before processing the current hop further" }
+        check(canProcessFurtherOnCurrentStep) {
+            "Caller should check before processing the current hop further"
+        }
         return originalState.block()
     }
 

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

@@ -6,6 +6,8 @@ import org.jacodb.ets.model.EtsAliasType
 import org.jacodb.ets.model.EtsAnyType
 import org.jacodb.ets.model.EtsArrayType
 import org.jacodb.ets.model.EtsBooleanType
+import org.jacodb.ets.model.EtsEnumValueType
+import org.jacodb.ets.model.EtsGenericType
 import org.jacodb.ets.model.EtsNullType
 import org.jacodb.ets.model.EtsNumberType
 import org.jacodb.ets.model.EtsRefType
@@ -76,7 +78,17 @@ class TsContext(
         is EtsAnyType -> unresolvedSort
         is EtsUnknownType -> unresolvedSort
         is EtsAliasType -> typeToSort(type.originalType)
-        else -> TODO("${type::class.simpleName} is not yet supported: $type")
+        is EtsGenericType -> {
+            if (type.constraint == null && type.defaultType == null) {
+                unresolvedSort
+            } else {
+                TODO("Not yet implemented")
+            }
+        }
+        is EtsEnumValueType -> unresolvedSort
+        else -> {
+            TODO("${type::class.simpleName} is not yet supported: $type")
+        }
     }
 
     fun arrayDescriptorOf(type: EtsArrayType): EtsType {

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

@@ -24,7 +24,7 @@ interface TsInterpreterObserver : UInterpreterObserver {
 
     fun onCallWithUnresolvedArguments(
         simpleValueResolver: TsSimpleValueResolver,
-        stmt: EtsCallExpr,
+        expr: EtsCallExpr,
         scope: TsStepScope,
     ) {
         // default empty implementation

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

@@ -26,7 +26,9 @@
 import org.usvm.statistics.constraints.SoftConstraintsObserver
 import org.usvm.statistics.distances.CfgStatisticsImpl
 import org.usvm.statistics.distances.PlainCallGraphStatistics
+import org.usvm.stopstrategies.StopStrategy
 import org.usvm.stopstrategies.createStopStrategy
+import org.usvm.util.TsStateVisualizer
 import org.usvm.util.humanReadableSignature
 import kotlin.time.Duration.Companion.seconds
 
@@ -79,7 +81,7 @@
             timeStatistics = timeStatistics,
             coverageStatisticsFactory = { coverageStatistics },
             cfgStatisticsFactory = { cfgStatistics },
-            callGraphStatisticsFactory = { callGraphStatistics },
+            callGraphStatisticsFactory = { callGraphStatistics }
         )
 
         val statesCollector =
@@ -95,20 +97,40 @@
         val observers = mutableListOf<UMachineObserver<TsState>>(coverageStatistics)
         observers.add(statesCollector)
 
+        if (tsOptions.enableVisualization) {
+            observers += TsStateVisualizer()
+        }
+
         if (options.useSoftConstraints) {
             observers.add(SoftConstraintsObserver())
         }
 
         val stepsStatistics = StepsStatistics<EtsMethod, TsState>()
 
-        val stopStrategy = createStopStrategy(
-            options,
-            targets,
-            timeStatisticsFactory = { timeStatistics },
-            stepsStatisticsFactory = { stepsStatistics },
-            coverageStatisticsFactory = { coverageStatistics },
-            getCollectedStatesCount = { statesCollector.collectedStates.size }
-        )
+        val stopStrategy = object : StopStrategy {
+            val strategy = createStopStrategy(
+                options,
+                targets,
+                timeStatisticsFactory =
+                    { timeStatistics },
+                stepsStatisticsFactory =
+                    { stepsStatistics },
+                coverageStatisticsFactory =
+                    { coverageStatistics },
+                getCollectedStatesCount =
+                    { statesCollector.collectedStates.size }
+            )
+
+            override fun shouldStop(): Boolean {
+                val result = strategy.shouldStop()
+
+                if (result) {
+                    logger.warn { "Stop strategy finished execution $strategy" }
+                }
+
+                return result
+            }
+        }
 
         observers.add(timeStatistics)
         observers.add(stepsStatistics)

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

@@ -2,4 +2,5 @@ package org.usvm.machine
 
 data class TsOptions(
     val interproceduralAnalysis: Boolean = true,
+    val enableVisualization: Boolean = false,
 )