correct ssa naming for phi-function

src/callconv.py

@@ -24,7 +24,7 @@ def __init__(self, flow):
   def is_correct_step(self, loc):
     return isinstance(loc, assignable_t)
 
-  def tag_tethas(self, context, block):
+  def tag_phis(self, context, block):
     return
 
   def tag_uses(self, context, block, expr):
@@ -114,7 +114,7 @@ def process(self, flow, ssa_tagger, block, stmt, call):
       if newloc:
         regs.append(newloc.copy())
       elif ssa_tagger.has_contextual_definition(stmt, loc):
-        newloc = self.insert_theta(stmt, loc)
+        newloc = self.insert_phi(stmt, loc)
         regs.append(newloc.copy())
       else:
         break

src/decompiler.py

@@ -170,8 +170,8 @@ def rename_with(self, op):
 
 class stack_propagator_t(propagator.propagator_t):
   def replace_with(self, defn, value, use):
-    if isinstance(use.parent, theta_t) or \
-        isinstance(value, theta_t) or \
+    if isinstance(use.parent, phi_t) or \
+        isinstance(value, phi_t) or \
         not isinstance(value, replaceable_t):
       return
     if self.flow.arch.is_stackreg(defn) or \
@@ -184,7 +184,7 @@ def is_stack_location(self, expr):
 
 class registers_propagator_t(propagator.propagator_t):
   def replace_with(self, defn, value, use):
-    if isinstance(use, regloc_t) and not isinstance(use.parent, theta_t):
+    if isinstance(use, regloc_t) and not isinstance(use.parent, phi_t):
       return value
 
 class call_arguments_propagator_t(propagator.propagator_t):

src/expressions.py

@@ -468,13 +468,13 @@ def __repr__(self):
   def copy(self, **kwargs):
     return self.__class__(*[op.copy(**kwargs) for op in self.operands])
 
-class theta_t(expr_t):
+class phi_t(expr_t):
   def __init__(self, *operands):
     expr_t.__init__(self, *operands)
     return
 
   def __repr__(self):
-    return '<theta %s>' % ([repr(op) for op in self.operands])
+    return '<phi %s>' % ([repr(op) for op in self.operands])
 
   def copy(self, **kwargs):
     return self.__class__(*[op.copy(**kwargs) for op in self.operands])

src/output/c.py

@@ -1,3 +1,4 @@
+# coding=utf-8
 
 from expressions import *
 from statements import *
@@ -336,8 +337,8 @@ def expression_tokens(self, obj):
       yield r
       return
 
-    if type(obj) == theta_t:
-      yield token_keyword('THETA')
+    if type(obj) == phi_t:
+      yield token_keyword('Φ')
       l, r = self.matching('(', ')')
       yield l
       for op in obj.operands:

src/ssa.py

@@ -95,8 +95,8 @@ def __init__(self, flow):
     self.exit_contexts = {}
 
     # dict of `flowblock_t` : [`expr_t`, ...]
-    # contains each block and a list of thier theta assignments.
-    self.block_thetas = {}
+    # contains each block and a list of thier phi assignments.
+    self.block_phis = {}
 
     return
 
@@ -140,10 +140,10 @@ def tag_uninitialized(self, expr):
     self.uninitialized.append(expr)
     return
 
-  def insert_theta(self, block, lastdef, thisdef):
+  def insert_phi(self, block, lastdef, thisdef):
 
     newuse = lastdef.copy(with_definition=True)
-    stmt = statement_t(assign_t(thisdef.copy(), theta_t(newuse)))
+    stmt = statement_t(assign_t(thisdef.copy(), phi_t(newuse)))
 
     block.container.insert(thisdef.parent_statement.index(), stmt)
 
@@ -152,19 +152,19 @@ def insert_theta(self, block, lastdef, thisdef):
 
     return stmt
 
-  def need_tetha(self, context, block, expr):
+  def need_phi(self, context, block, expr):
     obj = context.get_definition_object(expr)
     return obj and obj.block != block
 
   def tag_use(self, context, block, expr):
-    if self.need_tetha(context, block, expr):
+    if self.need_phi(context, block, expr):
       # expr is defined in another block.
 
       lastdef = context.get_definition(expr)
       if lastdef:
-        stmt = self.insert_theta(block, lastdef, expr)
+        stmt = self.insert_phi(block, lastdef, expr)
 
-        self.block_thetas[block].append(stmt)
+        self.block_phis[block].append(stmt)
 
         context.assign(block, stmt.expr.op1)
         stmt.expr.op1.index = self.index
@@ -196,10 +196,10 @@ def clean_du(self, loc):
       use.definition = None
     return loc
 
-  def tag_tethas(self, context, block):
+  def tag_phis(self, context, block):
     """ insert new locations from the current context in all
-        theta-functions present in the target block. """
-    for stmt in self.block_thetas[block]:
+        phi-functions present in the target block. """
+    for stmt in self.block_phis[block]:
       loc = stmt.expr.op1
       lastdef = context.get_definition(loc)
       if lastdef and lastdef != loc:
@@ -231,11 +231,11 @@ def statement(self, context, stmt):
   def tag_block(self, context, block):
 
     if block in self.done_blocks:
-      self.tag_tethas(context, block)
+      self.tag_phis(context, block)
       return
 
     self.done_blocks.append(block)
-    self.block_thetas[block] = []
+    self.block_phis[block] = []
 
     for stmt in list(block.container.statements):
       for expr in stmt.expressions:
@@ -291,7 +291,7 @@ def is_restored(self, expr):
       current = start.pop(0)
       checked.append(current)
       rvalue = current.parent_statement.expr.op2
-      if isinstance(rvalue, theta_t):
+      if isinstance(rvalue, phi_t):
         for t in rvalue:
           if t.definition:
             if t.definition not in checked:
@@ -358,23 +358,23 @@ def spoiled_locations(self):
     return
 
   def simplify(self):
-    """ propagate theta groups that only have one item in them
+    """ propagate phi groups that only have one item in them
         while keeping the ssa form. """
-    p = theta_propagator_t(self)
+    p = phi_propagator_t(self)
     p.propagate()
     self.verify()
     return
 
-  def has_theta_expressions(self):
+  def has_phi_expressions(self):
     for op in iterators.operand_iterator_t(self.flow):
-      if isinstance(op, theta_t):
+      if isinstance(op, phi_t):
         return True
     return False
 
   def remove_ssa_form(self):
     """ transform the flow out of ssa form. """
 
-    if not self.has_theta_expressions():
+    if not self.has_phi_expressions():
       for op in iterators.operand_iterator_t(self.flow):
         if isinstance(op, assignable_t):
           op.index = None
@@ -407,27 +407,27 @@ def verify(self):
         assert use.parent_statement.container, "%s: has a use (%s) which is unlinked from the tree" % (repr(op), repr(use))
     return
 
-class theta_propagator_t(propagator.propagator_t):
+class phi_propagator_t(propagator.propagator_t):
   def __init__(self, ssa):
     propagator.propagator_t.__init__(self, ssa.flow)
     self.ssa = ssa
 
   def replace_with(self, defn, value, use):
-    if isinstance(value, theta_t) and len(value) == 1:
+    if isinstance(value, phi_t) and len(value) == 1:
       return value[0]
 
   def replace(self, defn, value, use):
-    for block, tethas in self.ssa.block_thetas.iteritems():
+    for block, phis in self.ssa.block_phis.iteritems():
       stmt = defn.parent_statement
-      if stmt in tethas:
-        tethas.remove(stmt)
-    theta = use.parent
-    if isinstance(theta, theta_t) and value in list(theta.operands):
+      if stmt in phis:
+        phis.remove(stmt)
+    phi = use.parent
+    if isinstance(phi, phi_t) and value in list(phi.operands):
       use.definition = None
       if len(defn.uses) == 0:
         defn.parent_statement.expr.unlink()
         defn.parent_statement.remove()
-      theta.remove(use)
+      phi.remove(use)
       new = None
     else:
       new = propagator.propagator_t.replace(self, defn, value, use)

tests/run.py

@@ -1,3 +1,5 @@
+# coding=utf-8
+
 import unittest
 import sys
 

tests/unit/__init__.py

@@ -1,3 +1,5 @@
+# coding=utf-8
+
 import os
 import sys
 

tests/unit/test_args.py

@@ -1,3 +1,5 @@
+# coding=utf-8
+
 import unittest
 
 import test_helper

tests/unit/test_capstone.py

@@ -1,3 +1,5 @@
+# coding=utf-8
+
 import unittest
 import sys
 

tests/unit/test_conditionals.py

@@ -1,3 +1,5 @@
+# coding=utf-8
+
 import unittest
 import re
 import binascii
@@ -154,7 +156,7 @@ def test_if6_x86(self):
         else {
           eax@77 = 0;
         }
-        return THETA(eax@61, eax@77, eax@78, eax@79, eax@80, eax@81, );
+        return Φ(eax@61, eax@77, eax@78, eax@79, eax@80, eax@81, );
       }
       """)
     return
@@ -186,7 +188,7 @@ def test_if7_x86(self):
         else {
           eax@77 = 0;
         }
-        return THETA(eax@61, eax@77, eax@78, eax@79, eax@80, eax@81, );
+        return Φ(eax@61, eax@77, eax@78, eax@79, eax@80, eax@81, );
       }
       """)
     return

tests/unit/test_flow.py

@@ -1,3 +1,5 @@
+# coding=utf-8
+
 import unittest
 
 import test_helper

tests/unit/test_helper.py

@@ -1,3 +1,5 @@
+# coding=utf-8
+
 import re
 import unittest
 import sys

tests/unit/test_ir.py

@@ -1,3 +1,5 @@
+# coding=utf-8
+
 import unittest
 
 import test_helper

tests/unit/test_prune.py

@@ -1,3 +1,5 @@
+# coding=utf-8
+
 import unittest
 
 import test_helper