oppc: pass insndb record

diff --git a/src/openpower/oppc/__main__.py b/src/openpower/oppc/__main__.py
index d8bcec71bb72002154feb3df3488f6bc5d686db4..ecf6aa0b67c593181dc030205811a6769722507a 100644 (file)
--- a/src/openpower/oppc/__main__.py
+++ b/src/openpower/oppc/__main__.py
@@ -19,31 +19,19 @@ db = Database(find_wiki_dir())
 for insn in db:
     try:
         tree = parser.parse(code="\n".join(insn.pcode))
-        for (level, line) in pc_code.code(name=insn.name, root=tree):
+        for (level, line) in pc_code.code(insn=insn, root=tree):
             print(f"{' ' * 4 * level}{line}")
     except Exception as exc:
         print(insn.name)
         print(insn.pcode)
         raise exc
 
-code = """
-src <- [0]*64
-src[64-XLEN:63] <- (RS)
-result <- [0]*64
-do i = 0 to 1
-    n <- i * 32
-    result[n+0:n+7] <- 0
-    result[n+8:n+19] <- DPD_TO_BCD(src[n+12:n+21])
-    result[n+20:n+31] <- DPD_TO_BCD(src[n+22:n+31])
-RA <- result[64-XLEN:63]
-RA <- (C ? A : B)
-if a < b then RT <- (RA)
-else          RT <- (RB)
-"""
+insn = db["tdi"]
+code = "\n".join(insn.pcode)
 tree = parser.parse(code=code)
 print(tree)
 for (level, line) in pc_pseudocode.pseudocode(tree):
     print(f"{' ' * 4 * level}{line}")
 
-for (level, line) in pc_code.code(name="cdtbcd", root=tree):
+for (level, line) in pc_code.code(insn=insn, root=tree):
     print(f"{' ' * 4 * level}{line}")

diff --git a/src/openpower/oppc/pc_code.py b/src/openpower/oppc/pc_code.py
index 6ac371cb1c5dff381f023ab0209f9b2523a6d9db..cfc3ddfc834d662de82bfce52883686796fde18b 100644 (file)
--- a/src/openpower/oppc/pc_code.py
+++ b/src/openpower/oppc/pc_code.py
@@ -24,8 +24,9 @@ class Call(pc_ast.Dataclass):
 
 
 class CodeVisitor(pc_util.Visitor):
-    def __init__(self, name, root):
+    def __init__(self, insn, root):
         self.__root = root
+        self.__insn = insn
         self.__attrs = {}
         self.__header = object()
         self.__footer = object()
@@ -38,7 +39,7 @@ class CodeVisitor(pc_util.Visitor):
         super().__init__(root=root)
 
         self.__code[self.__header].emit(stmt="void")
-        self.__code[self.__header].emit(stmt=f"oppc_{name}(void) {{")
+        self.__code[self.__header].emit(stmt=f"oppc_{insn.name}(void) {{")
         with self.__code[self.__header]:
             for decl in self.__decls:
                 self.__code[self.__header].emit(stmt=f"struct oppc_value {decl};")
@@ -594,5 +595,5 @@ class CodeVisitor(pc_util.Visitor):
         raise NotImplementedError(type(node))
 
 
-def code(name, root):
-    yield from CodeVisitor(name=name, root=root)
+def code(insn, root):
+    yield from CodeVisitor(insn=insn, root=root)