Merge branch 'smt_refactor' into main

costa-group · Jun 19, 2023 · 33af1bc · 33af1bc
2 parents b558c59 + c094d2d
commit 33af1bc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/bin/z3 b/bin/z3
diff --git a/sfs_generator/asm_bytecode.py b/sfs_generator/asm_bytecode.py
@@ -46,7 +46,7 @@ def to_plain(self) -> str:
         by the corresponding value or jump Type in hexadecimal if any
         :return: a string containing the representation
         """
-        return f"{self.disasm} {str(self.value)}" if self.value is not None else f"{self.disasm} {self.jump_type}" \
+        return f"{self.disasm} {str(self.value)}" if self.value is not None and self.disasm == "PUSH" else f"{self.disasm} {self.jump_type}" \
             if self.jump_type is not None else self.disasm
 
     def to_plain_with_byte_number(self) -> str:

diff --git a/sfs_generator/parser_asm.py b/sfs_generator/parser_asm.py
@@ -177,7 +177,7 @@ def plain_instructions_to_asm_representation(raw_instruction_str : str) -> [ASM_
             # This case refers to PUSHx opcodes, that are allowed in the plain representation
             elif op.startswith("PUSH0"):
                 val_representation = "0"
-                final_op = {"name": "PUSH", "value": val_representation}
+                final_op = {"name": "PUSH0", "value": val_representation}
 
             elif re.fullmatch("PUSH([0-9]+)", op) is not None:
                 val = ops[i + 1]