temporary hack-revert, the original is now in branch "paths"

[openpower-isa.git] / src / openpower / sv / sv_binutils.py

diff --git a/src/openpower/sv/sv_binutils.py b/src/openpower/sv/sv_binutils.py
index c2ba879689147107eca223d6ec65da8269f6cca4..a6a7f10922f7f865955d43ca1188f772b2109eb3 100644 (file)
--- a/src/openpower/sv/sv_binutils.py
+++ b/src/openpower/sv/sv_binutils.py
@@ -22,8 +22,8 @@ from openpower.decoder.power_enums import (
     find_wiki_dir as _find_wiki_dir,
 )
 from openpower.consts import SVP64MODE as _SVP64MODE
-from openpower.decoder.power_insn import Database as _Database
-from openpower.decoder.power_insn import SVP64Instruction as _SVP64Instruction
+from openpower.insndb.core import Database as _Database
+from openpower.insndb.core import SVP64Instruction as _SVP64Instruction
 
 
 DISCLAIMER = """\
@@ -664,12 +664,6 @@ def collect(db):
 
             if issubclass(cls, Boolean):
                 value = Boolean(value)
-            elif issubclass(cls, Extra):
-                value = tuple(value)
-                if not value:
-                    value = cls["NONE"]
-                else:
-                    value = cls[value[0].name]
             elif issubclass(cls, _enum.Enum):
                 value = cls[value.name]
             else: