From 5253d016b8ea5a35927fdfe72340a0561b7f2cb7 Mon Sep 17 00:00:00 2001 From: Dmitry Selyutin Date: Sat, 3 Jun 2023 17:58:41 +0300 Subject: [PATCH] insndb: rename types into core --- src/openpower/decoder/isa/caller.py | 2 +- src/openpower/decoder/power_table.py | 2 +- src/openpower/insndb/asm.py | 8 ++++---- src/openpower/insndb/{types.py => core.py} | 0 src/openpower/insndb/db.py | 2 +- src/openpower/insndb/dis.py | 2 +- src/openpower/sv/sv_binutils.py | 4 ++-- src/openpower/sv/sv_binutils_fptrans.py | 2 +- src/openpower/sv/trans/test_pysvp64dis.py | 2 +- src/openpower/sv/trans/test_pysvp64dis_branch.py | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) rename src/openpower/insndb/{types.py => core.py} (100%) diff --git a/src/openpower/decoder/isa/caller.py b/src/openpower/decoder/isa/caller.py index 29691b92..308dc9bd 100644 --- a/src/openpower/decoder/isa/caller.py +++ b/src/openpower/decoder/isa/caller.py @@ -35,7 +35,7 @@ from openpower.decoder.power_enums import (FPTRANS_INSNS, CRInSel, CROutSel, SVP64RMMode, SVPType, XER_bits, insns, spr_byname, spr_dict, BFP_FLAG_NAMES) -from openpower.insndb.types import SVP64Instruction +from openpower.insndb.core import SVP64Instruction from openpower.decoder.power_svp64 import SVP64RM, decode_extra from openpower.decoder.selectable_int import (FieldSelectableInt, SelectableInt, selectconcat, diff --git a/src/openpower/decoder/power_table.py b/src/openpower/decoder/power_table.py index 7b83ba50..008cb946 100644 --- a/src/openpower/decoder/power_table.py +++ b/src/openpower/decoder/power_table.py @@ -1,6 +1,6 @@ import collections from openpower.decoder.power_enums import find_wiki_dir -from openpower.insndb.types import Database +from openpower.insndb.core import Database from openpower.util import log sections = {} diff --git a/src/openpower/insndb/asm.py b/src/openpower/insndb/asm.py index 8ed34b8d..0d7f8c06 100644 --- a/src/openpower/insndb/asm.py +++ b/src/openpower/insndb/asm.py @@ -28,10 +28,10 @@ from openpower.decoder.pseudo.pagereader import ISA from openpower.decoder.power_svp64 import SVP64RM, get_regtype, decode_extra from openpower.decoder.selectable_int import SelectableInt from openpower.consts import SVP64MODE -from openpower.insndb.types import SVP64Instruction -from openpower.insndb.types import Database -from openpower.insndb.types import Style -from openpower.insndb.types import WordInstruction +from openpower.insndb.core import SVP64Instruction +from openpower.insndb.core import Database +from openpower.insndb.core import Style +from openpower.insndb.core import WordInstruction from openpower.decoder.power_enums import find_wiki_dir # for debug logging diff --git a/src/openpower/insndb/types.py b/src/openpower/insndb/core.py similarity index 100% rename from src/openpower/insndb/types.py rename to src/openpower/insndb/core.py diff --git a/src/openpower/insndb/db.py b/src/openpower/insndb/db.py index 753ab626..ac65a31a 100644 --- a/src/openpower/insndb/db.py +++ b/src/openpower/insndb/db.py @@ -5,7 +5,7 @@ import sys from openpower.decoder.power_enums import ( find_wiki_dir, ) -from openpower.insndb.types import ( +from openpower.insndb.core import ( Database, Visitor, ) diff --git a/src/openpower/insndb/dis.py b/src/openpower/insndb/dis.py index 720963ba..a9fd3490 100644 --- a/src/openpower/insndb/dis.py +++ b/src/openpower/insndb/dis.py @@ -6,7 +6,7 @@ import os from openpower.decoder.power_enums import ( find_wiki_dir, ) -from openpower.insndb.types import ( +from openpower.insndb.core import ( Style, Database, WordInstruction, diff --git a/src/openpower/sv/sv_binutils.py b/src/openpower/sv/sv_binutils.py index f08f70c6..a6a7f109 100644 --- 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.insndb.types import Database as _Database -from openpower.insndb.types import SVP64Instruction as _SVP64Instruction +from openpower.insndb.core import Database as _Database +from openpower.insndb.core import SVP64Instruction as _SVP64Instruction DISCLAIMER = """\ diff --git a/src/openpower/sv/sv_binutils_fptrans.py b/src/openpower/sv/sv_binutils_fptrans.py index ac26657b..5627476c 100644 --- a/src/openpower/sv/sv_binutils_fptrans.py +++ b/src/openpower/sv/sv_binutils_fptrans.py @@ -8,7 +8,7 @@ from openpower.decoder.power_enums import ( FPTRANS_INSNS as _FPTRANS_INSNS, find_wiki_dir as _find_wiki_dir, ) -from openpower.insndb.types import ( +from openpower.insndb.core import ( Database as _Database, StaticOperand as _StaticOperand, WordInstruction as _WordInstruction, diff --git a/src/openpower/sv/trans/test_pysvp64dis.py b/src/openpower/sv/trans/test_pysvp64dis.py index d8af280a..c17117eb 100644 --- a/src/openpower/sv/trans/test_pysvp64dis.py +++ b/src/openpower/sv/trans/test_pysvp64dis.py @@ -1,7 +1,7 @@ from openpower.simulator.program import Program from openpower.insndb.dis import load, dump from openpower.insndb.asm import SVP64Asm -from openpower.insndb.types import Database, Style +from openpower.insndb.core import Database, Style from openpower.decoder.power_enums import find_wiki_dir from openpower.sv import sv_binutils_fptrans import unittest diff --git a/src/openpower/sv/trans/test_pysvp64dis_branch.py b/src/openpower/sv/trans/test_pysvp64dis_branch.py index 99bb0990..34d94a43 100644 --- a/src/openpower/sv/trans/test_pysvp64dis_branch.py +++ b/src/openpower/sv/trans/test_pysvp64dis_branch.py @@ -1,7 +1,7 @@ from openpower.simulator.program import Program from openpower.insndb.dis import load, dump from openpower.insndb.asm import SVP64Asm -from openpower.insndb.types import Database, Style +from openpower.insndb.core import Database, Style from openpower.decoder.power_enums import find_wiki_dir from openpower.sv import sv_binutils_fptrans import unittest -- 2.30.2