From ccd38b0746b0b5aeeefdd6e49f2c9d6cb66676f4 Mon Sep 17 00:00:00 2001
From: bd-912 <bdunahu@colostate.edu>
Date: Fri, 26 Apr 2024 16:19:39 -0600
Subject: Fix some issues in VCall+VMemRead Liveness

---
 vaporize/LIRVisitor.java      | 4 +++-
 vaporize/VaporizeVisitor.java | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/vaporize/LIRVisitor.java b/vaporize/LIRVisitor.java
index d336ffe..da6abb6 100644
--- a/vaporize/LIRVisitor.java
+++ b/vaporize/LIRVisitor.java
@@ -119,7 +119,8 @@ public class LIRVisitor extends VInstr.VisitorPR<ControlFlowGraph, String, Runti
         this.dot_format += cfg.addEdge(this.curr, curr);
         this.curr = curr;
 
-        cfg.addLiveness(curr, n.source.toString());
+        cfg.addLiveness(curr, ((VMemRef.Global) n.dest).base.toString());
+	cfg.addLiveness(curr, n.source.toString());
         ///////////////////////////////////////////////////////////////
         MinimalLogger.info(String.format("<-%s (\"%s\":%s)",
                                          n.getClass().getSimpleName(),
@@ -204,6 +205,7 @@ public class LIRVisitor extends VInstr.VisitorPR<ControlFlowGraph, String, Runti
         for (VOperand a : n.args) {
             cfg.addLiveness(curr, a.toString());
         }
+        cfg.addLiveness(curr, n.addr.toString());
         ///////////////////////////////////////////////////////////////
         MinimalLogger.info(String.format("<-%s (\"%s\":%s)",
                                          n.getClass().getSimpleName(),
diff --git a/vaporize/VaporizeVisitor.java b/vaporize/VaporizeVisitor.java
index 3562887..c8cee17 100644
--- a/vaporize/VaporizeVisitor.java
+++ b/vaporize/VaporizeVisitor.java
@@ -107,7 +107,7 @@ public class VaporizeVisitor extends VInstr.VisitorP<LIRDict, RuntimeException>
                 d.getInterval(n.args[i].toString()).getAssignedRegister()
                 : n.args[i].toString();
             MinimalLogger.info(String.format("Adding argument for %s",
-                                             n.args[i].toString));
+                                             n.args[i].toString()));
             this.addVaporm(String.format("  %s = %s",
                                          this.arg_pass[i],
                                          reg));
-- 
cgit v1.2.3