oppc/pseudocode: always use keywords for emit calls
[openpower-isa.git] / src / openpower / oppc / pc_code.py
index 7b37a2944a13ed3fdeace1e3571225c9510684f2..62063a1fb0452691363938113da14c5fd30b3938 100644 (file)
@@ -7,14 +7,20 @@ import openpower.oppc.pc_pseudocode as pc_pseudocode
 
 
 class Transient(pc_ast.Node):
-    def __init__(self, value="UINT64_C(0)", bits="(uint8_t)ctx->XLEN"):
+    def __init__(self, value="UINT64_C(0)", bits="(uint8_t)OPPC_XLEN"):
         self.__value = value
         self.__bits = bits
 
         return super().__init__()
 
     def __str__(self):
-        return f"oppc_transient(&(struct oppc_int){{}}, {self.__value}, {self.__bits})"
+        return f"oppc_transient(&(struct oppc_value){{}}, {self.__value}, {self.__bits})"
+
+
+class CCall(pc_ast.Dataclass):
+    name: str
+    code: tuple
+    stmt: bool
 
 
 class CodeVisitor(pc_util.Visitor):
@@ -34,7 +40,7 @@ class CodeVisitor(pc_util.Visitor):
         self.__code[self.__header].emit(stmt=f"oppc_{name}(void) {{")
         with self.__code[self.__header]:
             for decl in self.__decls:
-                self.__code[self.__header].emit(stmt=f"struct oppc_int {decl};")
+                self.__code[self.__header].emit(stmt=f"struct oppc_value {decl};")
         self.__code[self.__footer].emit(stmt=f"}}")
 
     def __iter__(self):
@@ -45,35 +51,50 @@ class CodeVisitor(pc_util.Visitor):
     def __getitem__(self, node):
         return self.__code[node]
 
-    def transient(self, node, value="UINT64_C(0)", bits="(uint8_t)ctx->XLEN"):
+    def transient(self, node,
+            value="UINT64_C(0)",
+            bits="(uint8_t)OPPC_XLEN"):
         transient = Transient(value=value, bits=bits)
-        with self.pseudocode(node=node):
-            self.traverse(root=transient)
+        self.traverse(root=transient)
         return transient
 
+    def ccall(self, node, name, code, stmt=False):
+        def validate(item):
+            def validate(item):
+                (level, stmt) = item
+                if not isinstance(level, int):
+                    raise ValueError(level)
+                if not isinstance(stmt, str):
+                    raise ValueError(stmt)
+                return (level, stmt)
+
+            return tuple(map(validate, item))
+
+        code = tuple(map(validate, code))
+        ccall = CCall(name=name, code=code, stmt=stmt)
+        self.traverse(root=ccall)
+        return ccall
+
+    def ternary(self, node):
+        self[node].clear()
+        self[node].emit(stmt="(")
+        with self[node]:
+            for (level, stmt) in self[node.test]:
+                self[node].emit(stmt=stmt, level=level)
+            self[node].emit(stmt="?")
+            for (level, stmt) in self[node.body]:
+                self[node].emit(stmt=stmt, level=level)
+            self[node].emit(stmt=":")
+            for (level, stmt) in self[node.orelse]:
+                self[node].emit(stmt=stmt, level=level)
+        self[node].emit(stmt=")")
+
     @contextlib.contextmanager
     def pseudocode(self, node):
         for (level, stmt) in self.__pseudocode[node]:
             self[node].emit(stmt=f"/* {stmt} */", level=level)
         yield
 
-    def call(self, node, code, prefix="", suffix=""):
-        with self.pseudocode(node=node):
-            self[node].emit(stmt=f"{prefix}(")
-            with self[node]:
-                for chunk in code[:-1]:
-                    for (level, stmt) in chunk:
-                        if not (not stmt or
-                                stmt.startswith("/*") or
-                                stmt.endswith((",", "(", "{", "*/"))):
-                            stmt = (stmt + ",")
-                        self[node].emit(stmt=stmt, level=level)
-                if len(code) > 0:
-                    for (level, stmt) in code[-1]:
-                        if stmt:
-                            self[node].emit(stmt=stmt, level=level)
-            self[node].emit(stmt=f"){suffix}")
-
     @pc_util.Hook(pc_ast.Scope)
     def Scope(self, node):
         yield node
@@ -90,34 +111,30 @@ class CodeVisitor(pc_util.Visitor):
         if isinstance(node.rvalue, (pc_ast.GPR, pc_ast.FPR)):
             self.__regfetch[str(node.rvalue)].append(node.rvalue)
 
-        rvalue = self[node.rvalue]
         if isinstance(node.rvalue, pc_ast.IfExpr):
-            rvalue = [(0, " ".join([
-                str(self[node.rvalue.test]),
-                "?",
-                str(self[node.rvalue.body[0]]),
-                ":",
-                str(self[node.rvalue.orelse[0]]),
-            ]))]
+            self.ternary(node=node.rvalue)
 
         if isinstance(node.lvalue, pc_ast.SubscriptExpr):
-            self.call(prefix="oppc_subscript_assign", suffix=";", node=node, code=[
+            ccall = self.ccall(name="oppc_subscript_assign", node=node, stmt=True, code=[
                 self[node.lvalue.subject],
                 self[node.lvalue.index],
-                rvalue,
+                self[node.rvalue],
             ])
         elif isinstance(node.lvalue, pc_ast.RangeSubscriptExpr):
-            self.call(prefix="oppc_range_subscript_assign", suffix=";", node=node, code=[
+            ccall = self.ccall(name="oppc_range_subscript_assign", node=node, stmt=True, code=[
                 self[node.lvalue.subject],
                 self[node.lvalue.start],
                 self[node.lvalue.end],
-                rvalue,
+                self[node.rvalue],
             ])
         else:
-            self.call(prefix="oppc_assign", suffix=";", node=node, code=[
+            ccall = self.ccall(name="oppc_assign", stmt=True, node=node, code=[
                 self[node.lvalue],
-                rvalue,
+                self[node.rvalue],
             ])
+        with self.pseudocode(node=node):
+            for (level, stmt) in self[ccall]:
+                self[node].emit(stmt=stmt, level=level)
 
     @pc_util.Hook(pc_ast.BinaryExpr)
     def BinaryExpr(self, node):
@@ -131,26 +148,40 @@ class CodeVisitor(pc_util.Visitor):
             pc_ast.Lt, pc_ast.Le,
             pc_ast.Eq, pc_ast.NotEq,
             pc_ast.Ge, pc_ast.Gt,
+            pc_ast.LtU, pc_ast.GtU,
         )
+        if isinstance(node.left, pc_ast.IfExpr):
+            self.ternary(node=node.left)
+        if isinstance(node.right, pc_ast.IfExpr):
+            self.ternary(node=node.right)
+
         if isinstance(node.op, comparison):
-            self.call(prefix=str(self[node.op]), node=node, code=[
+            ccall = self.ccall(name=str(self[node.op]), node=node, code=[
                 self[node.left],
                 self[node.right],
             ])
         else:
             transient = self.transient(node=node)
-            self.call(prefix=str(self[node.op]), node=node, code=[
+            ccall = self.ccall(name=str(self[node.op]), node=node, code=[
                 self[transient],
                 self[node.left],
                 self[node.right],
             ])
+        with self.pseudocode(node=node):
+            for (level, stmt) in self[ccall]:
+                self[node].emit(stmt=stmt, level=level)
 
     @pc_util.Hook(pc_ast.UnaryExpr)
     def UnaryExpr(self, node):
         yield node
-        self.call(prefix=str(self[node.op]), node=node, code=[
+        if isinstance(node.value, pc_ast.IfExpr):
+            self.ternary(node=node.value)
+        ccall = self.ccall(name=str(self[node.op]), node=node, code=[
             self[node.value],
         ])
+        with self.pseudocode(node=node):
+            for (level, stmt) in self[ccall]:
+                self[node].emit(stmt=stmt, level=level)
 
     @pc_util.Hook(
             pc_ast.Not, pc_ast.Add, pc_ast.Sub,
@@ -158,8 +189,10 @@ class CodeVisitor(pc_util.Visitor):
             pc_ast.Lt, pc_ast.Le,
             pc_ast.Eq, pc_ast.NotEq,
             pc_ast.Ge, pc_ast.Gt,
+            pc_ast.LtU, pc_ast.GtU,
             pc_ast.LShift, pc_ast.RShift,
             pc_ast.BitAnd, pc_ast.BitOr, pc_ast.BitXor,
+            pc_ast.BitConcat,
         )
     def Op(self, node):
         yield node
@@ -173,6 +206,8 @@ class CodeVisitor(pc_util.Visitor):
             pc_ast.Lt: "oppc_lt",
             pc_ast.Le: "oppc_le",
             pc_ast.Eq: "oppc_eq",
+            pc_ast.LtU: "oppc_ltu",
+            pc_ast.GtU: "oppc_gtu",
             pc_ast.NotEq: "oppc_noteq",
             pc_ast.Ge: "oppc_ge",
             pc_ast.Gt: "oppc_gt",
@@ -181,6 +216,7 @@ class CodeVisitor(pc_util.Visitor):
             pc_ast.BitAnd: "oppc_and",
             pc_ast.BitOr: "oppc_or",
             pc_ast.BitXor: "oppc_xor",
+            pc_ast.BitConcat: "oppc_concat",
         }[node.__class__]
         self[node].emit(stmt=op)
 
@@ -196,67 +232,98 @@ class CodeVisitor(pc_util.Visitor):
             bits = f"UINT8_C({str(len(value[2:]) * 4)})"
             value = int(value, 16)
         else:
-            bits = "ctx->XLEN"
+            bits = "(uint8_t)OPPC_XLEN"
             value = int(value)
             fmt = str
         if (value > ((2**64) - 1)):
             raise NotImplementedError()
         value = f"UINT64_C({fmt(value)})"
         transient = self.transient(node=node, value=value, bits=bits)
-        for (level, stmt) in self[transient]:
-            self[node].emit(stmt=stmt, level=level)
+        with self.pseudocode(node=node):
+            for (level, stmt) in self[transient]:
+                self[node].emit(stmt=stmt, level=level)
 
     @pc_util.Hook(Transient)
     def Transient(self, node):
         yield node
         self[node].emit(stmt=str(node))
 
+    @pc_util.Hook(CCall)
+    def CCall(self, node):
+        yield node
+        end = (";" if node.stmt else "")
+        if len(node.code) == 0:
+            self[node].emit(stmt=f"{str(node.name)}(){end}")
+        else:
+            self[node].emit(stmt=f"{str(node.name)}(")
+            with self[node]:
+                (*head, tail) = node.code
+                for code in head:
+                    for (level, stmt) in code:
+                        self[node].emit(stmt=stmt, level=level)
+                    (level, stmt) = self[node][-1]
+                    if not (not stmt or
+                            stmt.startswith("/*") or
+                            stmt.endswith((",", "(", "{", "*/"))):
+                        stmt = (stmt + ",")
+                    self[node][-1] = (level, stmt)
+                for (level, stmt) in tail:
+                    self[node].emit(stmt=stmt, level=level)
+            self[node].emit(stmt=f"){end}")
+
     @pc_util.Hook(pc_ast.GPR)
     def GPR(self, node):
         yield node
         with self.pseudocode(node=node):
-            self[node].emit(stmt=f"&ctx->gpr[OPPC_GPR_{str(node)}]")
+            self[node].emit(stmt=f"&OPPC_GPR[OPPC_GPR_{str(node)}]")
 
     @pc_util.Hook(pc_ast.FPR)
     def FPR(self, node):
         yield node
         with self.pseudocode(node=node):
-            self[node].emit(stmt=f"&ctx->fpr[OPPC_FPR_{str(node)}]")
+            self[node].emit(stmt=f"&OPPC_FPR[OPPC_FPR_{str(node)}]")
 
     @pc_util.Hook(pc_ast.RepeatExpr)
     def RepeatExpr(self, node):
         yield node
         transient = self.transient(node=node)
-        self.call(prefix="oppc_repeat", node=node, code=[
+        ccall = self.ccall(name="oppc_repeat", node=node, code=[
             self[transient],
             self[node.subject],
             self[node.times],
         ])
+        for (level, stmt) in self[ccall]:
+            self[node].emit(stmt=stmt, level=level)
 
     @pc_util.Hook(pc_ast.XLEN)
     def XLEN(self, node):
         yield node
-        (value, bits) = ("ctx->XLEN", "(uint8_t)ctx->XLEN")
+        (value, bits) = ("OPPC_XLEN", "(uint8_t)OPPC_XLEN")
         transient = self.transient(node=node, value=value, bits=bits)
-        for (level, stmt) in self[transient]:
-            self[node].emit(stmt=stmt, level=level)
+        with self.pseudocode(node=node):
+            for (level, stmt) in self[transient]:
+                self[node].emit(stmt=stmt, level=level)
 
     @pc_util.Hook(pc_ast.SubscriptExpr)
     def SubscriptExpr(self, node):
         yield node
-        self.call(prefix="oppc_subscript", node=node, code=[
+        ccall = self.ccall(name="oppc_subscript", node=node, code=[
             self[node.subject],
             self[node.index],
         ])
+        for (level, stmt) in self[ccall]:
+            self[node].emit(stmt=stmt, level=level)
 
     @pc_util.Hook(pc_ast.RangeSubscriptExpr)
     def RangeSubscriptExpr(self, node):
         yield node
-        self.call(prefix="oppc_subscript", node=node, code=[
+        ccall = self.ccall(name="oppc_subscript", node=node, code=[
             self[node.subject],
             self[node.start],
             self[node.end],
         ])
+        for (level, stmt) in self[ccall]:
+            self[node].emit(stmt=stmt, level=level)
 
     @pc_util.Hook(pc_ast.ForExpr)
     def ForExpr(self, node):
@@ -353,13 +420,16 @@ class CodeVisitor(pc_util.Visitor):
     def Call(self, node):
         yield node
         code = tuple(map(lambda arg: self[arg], node.args))
-        self.call(prefix=str(node.name), node=node, code=code)
+        ccall = self.ccall(name=str(node.name), node=node, code=code)
+        for (level, stmt) in self[ccall]:
+            self[node].emit(stmt=stmt, level=level)
 
     @pc_util.Hook(pc_ast.Symbol)
     def Symbol(self, node):
         yield node
         self.__decls[str(node)].append(node)
-        self[node].emit(stmt=f"&{str(node)}")
+        with self.pseudocode(node=node):
+            self[node].emit(stmt=f"&{str(node)}")
 
     @pc_util.Hook(pc_ast.Node)
     def Node(self, node):