Gabe Black has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/56332 )
Change subject: arch:arch-x86: Fix style of some classes in the ucode
assembler.
......................................................................
arch:arch-x86: Fix style of some classes in the ucode assembler.
Change-Id: I13091707f4e44980ad9a3df022fbbfbafb1d0969
---
M src/arch/micro_asm.py
M src/arch/micro_asm_test.py
M src/arch/x86/isa/macroop.isa
M src/arch/x86/isa/microasm.isa
4 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/src/arch/micro_asm.py b/src/arch/micro_asm.py
index 1841853..b169f96 100644
--- a/src/arch/micro_asm.py
+++ b/src/arch/micro_asm.py
@@ -40,7 +40,7 @@
#
##########################################################################
-class Micro_Container(object):
+class MicroContainer:
def __init__(self, name):
self.microops = []
self.name = name
@@ -59,10 +59,10 @@
string += " %s\n" % microop
return string
-class Combinational_Macroop(Micro_Container):
+class CombinationalMacroop(MicroContainer):
pass
-class Rom_Macroop(object):
+class RomMacroop:
def __init__(self, name, target):
self.name = name
self.target = target
@@ -70,7 +70,7 @@
def __str__(self):
return "%s: %s\n" % (self.name, self.target)
-class Rom(Micro_Container):
+class Rom(MicroContainer):
def __init__(self, name):
super().__init__(name)
self.externs = {}
diff --git a/src/arch/micro_asm_test.py b/src/arch/micro_asm_test.py
index d3ad420..08c2412 100755
--- a/src/arch/micro_asm_test.py
+++ b/src/arch/micro_asm_test.py
@@ -24,7 +24,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-from micro_asm import MicroAssembler, Combinational_Macroop, Rom_Macroop,
Rom
+from micro_asm import MicroAssembler, CombinationalMacroop, RomMacroop, Rom
class Bah(object):
def __init__(self):
@@ -50,7 +50,7 @@
"dah": Dah
}
-class TestMacroop(Combinational_Macroop):
+class TestMacroop(CombinationalMacroop):
def tweak(self):
microops["bah"] = Bah_Tweaked
def untweak(self):
@@ -66,7 +66,7 @@
"print": self.print_debug
}
-assembler = MicroAssembler(TestMacroop, microops, Rom('main ROM'),
Rom_Macroop)
+assembler = MicroAssembler(TestMacroop, microops, Rom('main ROM'),
RomMacroop)
testAssembly = '''
# Single line comment
diff --git a/src/arch/x86/isa/macroop.isa b/src/arch/x86/isa/macroop.isa
index 1cbdc85..8bd3b7e 100644
--- a/src/arch/x86/isa/macroop.isa
+++ b/src/arch/x86/isa/macroop.isa
@@ -131,8 +131,8 @@
}};
let {{
- from micro_asm import Combinational_Macroop, Rom_Macroop
- class X86Macroop(Combinational_Macroop):
+ from micro_asm import CombinationalMacroop, RomMacroop
+ class X86Macroop(CombinationalMacroop):
def setAdjustEnv(self, val):
self.adjust_env = val
def adjustImm(self, val):
diff --git a/src/arch/x86/isa/microasm.isa b/src/arch/x86/isa/microasm.isa
index 4d4409a..7d621b7 100644
--- a/src/arch/x86/isa/microasm.isa
+++ b/src/arch/x86/isa/microasm.isa
@@ -52,9 +52,9 @@
sys.path[0:0] = ["src/arch/x86/isa/"]
from insts import microcode
# print microcode
- from micro_asm import MicroAssembler, Rom_Macroop
+ from micro_asm import MicroAssembler, RomMacroop
mainRom = X86MicrocodeRom('main ROM')
- assembler = MicroAssembler(X86Macroop, microopClasses, mainRom,
Rom_Macroop)
+ assembler = MicroAssembler(X86Macroop, microopClasses, mainRom,
RomMacroop)
def gpRegIdx(idx):
return "X86ISA::GpRegIndex(%s)" % idx
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/56332
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I13091707f4e44980ad9a3df022fbbfbafb1d0969
Gerrit-Change-Number: 56332
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <gabe.bl...@gmail.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
