Fixed Small Bugs

UQ-PAC · Aug 13, 2024 · f607fdf · f607fdf
1 parent 834f34e
commit f607fdf
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/main/scala/analysis/RegionInjector.scala b/src/main/scala/analysis/RegionInjector.scala
@@ -210,6 +210,9 @@ class RegionInjector(domain: mutable.Set[CFGPosition],
       case literal: Literal => literal // ignore literals
       case Extract(end, start, body) =>
         Extract(end, start, eval(body, cmd))
+      case UninterpretedFunction(name, params, returnType) =>
+        val newParams = params.map { p => eval(p, cmd) }
+        UninterpretedFunction(name, newParams, returnType)
       case Repeat(repeats, body) =>
         Repeat(repeats, eval(body, cmd))
       case ZeroExtend(extension, body) =>
@@ -233,19 +236,19 @@ class RegionInjector(domain: mutable.Set[CFGPosition],
       Logger.warn(s"Region found for mem: ${regions.head}")
       regions.head match {
         case stackRegion: StackRegion =>
-          StackMemory(stackRegion.regionIdentifier, mem.addressSize, mem.valueSize)
+          return StackMemory(stackRegion.regionIdentifier, mem.addressSize, mem.valueSize)
         case dataRegion: DataRegion =>
-          SharedMemory(dataRegion.regionIdentifier, mem.addressSize, mem.valueSize)
+          return SharedMemory(dataRegion.regionIdentifier, mem.addressSize, mem.valueSize)
         case _ =>
       }
     } else if (regions.size > 1) {
       Logger.warn(s"Mem CMD is: ${cmd}")
       Logger.warn(s"Multiple regions found for mem: ${regions}")
       mmm.mergeRegions(regions) match {
         case stackRegion: StackRegion =>
-          StackMemory(stackRegion.regionIdentifier, mem.addressSize, mem.valueSize)
+          return StackMemory(stackRegion.regionIdentifier, mem.addressSize, mem.valueSize)
         case dataRegion: DataRegion =>
-          SharedMemory(dataRegion.regionIdentifier, mem.addressSize, mem.valueSize)
+          return SharedMemory(dataRegion.regionIdentifier, mem.addressSize, mem.valueSize)
         case _ =>
       }
     } else {
@@ -293,7 +296,7 @@ class RegionInjector(domain: mutable.Set[CFGPosition],
             newArrayBuffer += mem
             Logger.warn(s"No region found for memory section ${mem.address}")
           }
-        case _ =>
+        case null =>
       }
     }
     newArrayBuffer