#18 Modify validation for greedy with GET and SET pseudo-instructions

src/analysis/greedy_validation.py

@@ -7,9 +7,13 @@
 from typing import List, Dict, Tuple
 import sys
 from global_params.types import var_id_T, instr_id_T, instr_JSON_T
+import re
 
 DEBUG_MODE = False
 
+get_re = re.compile('GET\((.*)\)')
+set_re = re.compile('SET\((.*)\)')
+
 
 def extract_idx_from_id(instr_id: str) -> int:
     return int(instr_id.split('_')[-1])
@@ -35,6 +39,16 @@ def execute_instr_id(instr_id: str, cstack: List[var_id_T], user_instr: List[ins
         assert 0 <= idx < len(cstack), f"Duplicating index {idx} in a stack in {len(cstack)} elements: {cstack}"
         cstack.insert(0, cstack[idx])
 
+    # GET x: just inserts the corresponding element in the memory
+    elif (get_match := get_re.match(instr_id)) is not None:
+        cstack.insert(0, get_match.group(1))
+
+    # SET x: just pops the element from the stack (as if it was stored in memory)
+    elif (set_match := set_re.match(instr_id)) is not None:
+        stack_var = set_match.group(1)
+        popped_var = cstack.pop(0)
+        assert stack_var == popped_var, "Attempting to store an unexpected variable in memory"
+
     # Otherwise, the remaining uninterpreted instructions
     else:
         instr = [instr for instr in user_instr if instr['id'] == instr_id][0]
@@ -104,9 +118,15 @@ def check_execution_from_ids(sfs: Dict, instr_ids: List[instr_id_T]) -> bool:
     cstack, fstack = sfs['src_ws'].copy(), sfs['tgt_ws']
 
     for instr_id in instr_ids:
+        print(instr_id, cstack)
         execute_instr_id(instr_id, cstack, user_instr)
 
-    assert cstack == fstack, 'Ids - Stack do not match'
+    assert cstack == fstack, f"""
+                             Ids - Stack do not match. 
+                             Cstack {cstack}
+                             Fstack {fstack}
+                             """
+
     assert check_deps(instr_ids, dependencies), 'Dependencies are not coherent'
     for instr in user_instr:
         if any(instr_name in instr["disasm"] for instr_name in ["STORE"]):