x86-64: do not modify Constant objects passed as instruction operands

malfet · Oct 19, 2015 · 9d5c541 · 9d5c541
1 parent 8ef5818
commit 9d5c541
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/peachpy/x86_64/function.py b/peachpy/x86_64/function.py
@@ -84,6 +84,9 @@ def __init__(self, name, arguments, result_type=None,
 
         # This set is only used to ensure that all labels references in branches are defined
         self._label_names = set()
+        # Map from id of Name objects to their copies.
+        # This ensures that Name objects without name can be compared for equality using id
+        self._names_memo = dict()
         self._scope = peachpy.name.Namespace(None)
 
         self._local_variables_count = 0

diff --git a/peachpy/x86_64/operand.py b/peachpy/x86_64/operand.py
@@ -27,6 +27,11 @@ def check_operand(operand):
             raise ValueError("Memory operands must be represented by a list with only one element")
         return MemoryOperand(operand[0])
     elif isinstance(operand, Constant):
+        from copy import copy, deepcopy
+        operand = copy(operand)
+        import peachpy.x86_64.function
+        if peachpy.x86_64.function.active_function:
+            operand.name = deepcopy(operand.name, peachpy.x86_64.function.active_function._names_memo)
         return MemoryOperand(operand)
     elif isinstance(operand, LocalVariable):
         return MemoryOperand(operand)