change --pc argument to an enum

Author: katrinafyi

src/main/scala/Main.scala

@@ -153,8 +153,11 @@ object Main {
     generateRelyGuarantees: Flag,
     @arg(name = "simplify", doc = "Partial evaluate / simplify BASIL IR before output (implies --parameter-form)")
     simplify: Flag,
-    @arg(name = "keep-pc", doc = "Keep PC assignments and assertions in loaded BASIL IR (currently GTIRB-only)")
-    keepPC: Flag,
+    @arg(
+      name = "pc",
+      doc = "EXPERIMENTAL IN DEVELOPMENT: Program counter mode. (options: none | keep | assert) (default: none)"
+    )
+    pcTracking: Option[String],
     @arg(
       name = "validate-simplify",
       doc = "Emit SMT2 check for validation of simplification expression rewrites 'rewrites.smt2'"
@@ -292,7 +295,7 @@ object Main {
         procedureTrimDepth = conf.procedureDepth,
         parameterForm = conf.parameterForm.value,
         trimEarly = conf.trimEarly.value,
-        keepPC = conf.keepPC.value
+        pcTracking = PCTrackingOption.valueOf(conf.pcTracking.getOrElse("none").capitalize)
       ),
       runInterpret = conf.interpret.value,
       simplify = conf.simplify.value,

src/main/scala/util/BASILConfig.scala

@@ -4,6 +4,10 @@ enum ProcRelyVersion {
   case Function, IfCommandContradiction
 }
 
+enum PCTrackingOption {
+  case None, Keep, Assert
+}
+
 case class BoogieGeneratorConfig(
   memoryFunctionType: BoogieMemoryAccessMode = BoogieMemoryAccessMode.SuccessiveStoreSelect,
   coalesceConstantMemory: Boolean = true,
@@ -21,7 +25,7 @@ case class ILLoadingConfig(
   procedureTrimDepth: Int = Int.MaxValue,
   parameterForm: Boolean = false,
   trimEarly: Boolean = false,
-  keepPC: Boolean = false
+  pcTracking: PCTrackingOption = PCTrackingOption.None
 )
 
 case class StaticAnalysisConfig(

src/main/scala/util/RunUtils.scala

@@ -136,7 +136,7 @@ object IRLoading {
 
     val specification = IRLoading.loadSpecification(q.specFile, program, globals)
 
-    if (!q.keepPC) {
+    if (q.pcTracking == PCTrackingOption.None) {
       visit_prog(transforms.RemovePCStatements(), program)
       Logger.info(s"[!] Removed PC-related statements")
     }

src/test/scala/RemovePCTest.scala

@@ -2,7 +2,7 @@ import org.scalatest.funsuite.AnyFunSuite
 
 import ir.*
 import test_util.{BASILTest, CaptureOutput}
-import util.{BASILConfig, IRContext, BoogieGeneratorConfig, ILLoadingConfig, StaticAnalysisConfig}
+import util.{BASILConfig, IRContext, BoogieGeneratorConfig, ILLoadingConfig, StaticAnalysisConfig, PCTrackingOption}
 
 import java.nio.file.{Path, Files}
 import java.io.{BufferedWriter, FileWriter}
@@ -18,7 +18,7 @@ class RemovePCTest extends AnyFunSuite with CaptureOutput {
           relfFile = s"${BASILTest.rootDirectory}/src/test/correct/$name/$variation/$name.relf",
           specFile = None,
           dumpIL = None,
-          keepPC = keepPC
+          pcTracking = if keepPC then PCTrackingOption.Assert else PCTrackingOption.None
         ),
         staticAnalysis = Some(StaticAnalysisConfig(None)),
         boogieTranslation = BoogieGeneratorConfig(),