Revert "flail"

This reverts commit 1765045.

Author: katrinafyi

src/main/scala/translating/GTIRBLoader.scala

@@ -28,8 +28,6 @@ class GTIRBLoader(parserMap: immutable.Map[String, List[InsnSemantics]]) {
 
   private val opcodeSize = 4
 
-  private val branchTakenVar = LocalVar("__BranchTaken", BoolType)
-
   def visitBlock(blockUUID: ByteString, blockCountIn: Int, blockAddress: Option[BigInt]): ArrayBuffer[Statement] = {
     blockCount = blockCountIn
     instructionCount = 0
@@ -56,14 +54,7 @@ class GTIRBLoader(parserMap: immutable.Map[String, List[InsnSemantics]]) {
             }
 
             statements.appendAll(try {
-              val basilStmts = visitStmt(s, label)
-              println(basilStmts)
-              val assignedVars = basilStmts.flatMap(ir.allVarsPos)
-              if (assignedVars.contains(branchTakenVar)) {
-                println(assignedVars)
-              } else {
-              }
-              basilStmts
+              visitStmt(s, label)
             } catch {
               case e => {
                 Logger.error(s"Failed to load insn: $e\n${e.getStackTrace.mkString("\n")}")
@@ -307,7 +298,7 @@ class GTIRBLoader(parserMap: immutable.Map[String, List[InsnSemantics]]) {
       case "FALSE" => Some(FalseLiteral)
       case "FPCR" => Some(Register("FPCR", 32))
       // ignore the following
-      // case "__BranchTaken" => None
+      case "__BranchTaken" => None
       case "BTypeNext" => None
       case "BTypeCompatible" => None
       case "TPIDR_EL0" => Some(Register(name, 64))
@@ -691,7 +682,7 @@ class GTIRBLoader(parserMap: immutable.Map[String, List[InsnSemantics]]) {
       // ignore the following
       case "TRUE" => throw Exception(s"Boolean literal $name in LExpr ${ctx.getText}")
       case "FALSE" => throw Exception(s"Boolean literal $name in LExpr ${ctx.getText}")
-      case "__BranchTaken" => Some(branchTakenVar)
+      case "__BranchTaken" => None
       case "BTypeNext" => None
       case "BTypeCompatible" => None
       case "TPIDR_EL0" => Some(Register(name, 64))

src/main/scala/translating/GTIRBToIR.scala

@@ -41,9 +41,7 @@ class TempIf(
   val thenStmts: mutable.Buffer[Statement],
   val elseStmts: mutable.Buffer[Statement],
   override val label: Option[String] = None
-) extends NOP(label) {
-  override def toString = s"TempIf(${cond}, ${thenStmts}, ${elseStmts}, ${label})"
-}
+) extends NOP(label)
 
 /** GTIRBToIR class. Forms an IR as close as possible to the one produced by BAP by using GTIRB instead
   *
@@ -242,7 +240,7 @@ class GTIRBToIR(
     block.statements.last match {
       case last @ LocalAssign(lhs: Register, _, _) if lhs.name == "_PC" =>
         val label = last.label
-        // block.statements.remove(last)
+        block.statements.remove(last)
         label
       case _ => throw Exception(s"expected block ${block.label} to have a program counter assignment at its end")
     }
@@ -783,8 +781,7 @@ class GTIRBToIR(
 
     val newBlocks = ArrayBuffer(trueBlock, falseBlock)
     procedure.addBlocks(newBlocks)
-    // block.statements.remove(tempIf)
-    println(tempIf)
+    block.statements.remove(tempIf)
 
     GoTo(newBlocks)
   }