whoops. mode-bits need to be put in MSB0 order. sigh

[openpower-isa.git] / src / openpower / sv / trans / pysvp64dis.py

diff --git a/src/openpower/sv/trans/pysvp64dis.py b/src/openpower/sv/trans/pysvp64dis.py
index 39d63ef5cd981cc8d40c02815a97ade781a8e52f..d5ddba91042557f3423d5093e085ea9809f2512f 100644 (file)
--- a/src/openpower/sv/trans/pysvp64dis.py
+++ b/src/openpower/sv/trans/pysvp64dis.py
@@ -1,11 +1,14 @@
 import argparse as _argparse
 import enum as _enum
 import sys as _sys
+import os
+from io import BytesIO
 
 from openpower.decoder.power_enums import (
     find_wiki_dir as _find_wiki_dir,
 )
 from openpower.decoder.power_insn import (
+    Verbosity as _Verbosity,
     Database as _Database,
     WordInstruction as _WordInstruction,
     PrefixedInstruction as _PrefixedInstruction,
@@ -21,43 +24,48 @@ class ByteOrder(_enum.Enum):
         return self.name.lower()
 
 
-def load(ifile, byteorder, **_):
+def load(ifile, byteorder=ByteOrder.LITTLE, **_):
     byteorder = str(byteorder)
 
-    while True:
-        prefix = ifile.read(4)
-        length = len(prefix)
-        if length == 0:
-            return
-        elif length < 4:
-            raise IOError(prefix)
-        prefix = _WordInstruction.integer(value=prefix, byteorder=byteorder)
+    # copy over to persistent binfile (BytesIO)
+    cpfile = BytesIO()
+    cpfile.write(ifile.read())
+    cpfile.seek(0)
 
-        suffix = ifile.read(4)
-        length = len(suffix)
+    while True:
+        insn = cpfile.read(4)
+        length = len(insn)
         if length == 0:
-            yield prefix
             return
         elif length < 4:
-            raise IOError(suffix)
-        suffix = _WordInstruction.integer(value=suffix, byteorder=byteorder)
-
-        if prefix.po == 0x1:
+            raise IOError(insn)
+        insn = _WordInstruction.integer(value=insn, byteorder=byteorder)
+        if insn.po == 0x1:
+            suffix = cpfile.read(4)
+            length = len(suffix)
+            if length == 0:
+                yield insn
+                return
+            elif length < 4:
+                raise IOError(suffix)
+
+            prefix = insn
+            suffix = _WordInstruction.integer(value=suffix, byteorder=byteorder)
             insn = _SVP64Instruction.pair(prefix=prefix, suffix=suffix)
             if insn.prefix.id != 0b11:
                 insn = _PrefixedInstruction.pair(prefix=prefix, suffix=suffix)
-            yield insn
-        else:
-            yield prefix
-            yield suffix
+        yield insn
 
+    cpfile.seek(0) # restore position so that generator can be reused
 
-def dump(insns, **_):
+
+def dump(insns, verbosity, **_):
     db = _Database(_find_wiki_dir())
     for insn in insns:
-        yield from insn.disassemble(db=db)
+        yield from insn.disassemble(db=db, verbosity=verbosity)
 
 
+# this is the entry-point for the console-script pysvp64dis
 def main():
     parser = _argparse.ArgumentParser()
     parser.add_argument("ifile", nargs="?",
@@ -66,16 +74,28 @@ def main():
         type=_argparse.FileType("w"), default=_sys.stdout)
     parser.add_argument("-b", "--byteorder",
         type=ByteOrder, default=ByteOrder.LITTLE)
+    parser.add_argument("-s", "--short",
+        dest="verbosity", default=_Verbosity.NORMAL,
+        action="store_const", const=_Verbosity.SHORT)
+    parser.add_argument("-v", "--verbose",
+        dest="verbosity", default=_Verbosity.NORMAL,
+        action="store_const", const=_Verbosity.VERBOSE)
+    parser.add_argument("-l", "--log",
+        action="store_true", default=False)
 
     args = dict(vars(parser.parse_args()))
-    ifile = args["ifile"]
-    ofile = args["ofile"]
-    byteorder = args["byteorder"]
 
-    insns = load(ifile, byteorder)
-    for line in dump(insns):
-        print(line, file=ofile)
+    # if logging requested do not disable it.
+    if not args['log']:
+        os.environ['SILENCELOG'] = '1'
+
+    # load instructions and dump them
+    insns = load(**args)
+    for line in dump(insns, **args):
+        print(line, file=args["ofile"])
 
 
+# still here but use "python3 setup.py develop" then run the
+# command "pysvp64dis" instead of "python3 src/openpower/sv/trans/pysvp64dis.py"
 if __name__ == "__main__":
     main()