Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/56330 )
(
9 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: arch,arch-x86: Consolidate the add_microop method.
......................................................................
arch,arch-x86: Consolidate the add_microop method.
This was defined in the Micro_Container base class, and then again in
each subclass. The base definition was different and less complete than
the others, but the others were identical. Replace the base class
definition with the definition in the subclasses, and delete the ones in
the subclasses.
Change-Id: Ib2d1ce72958ec299115efb6efced2bd14c08467c
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/56330
Reviewed-by: Matt Sinclair <mattdsincl...@gmail.com>
Maintainer: Gabe Black <gabe.bl...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M src/arch/micro_asm.py
M src/arch/x86/isa/macroop.isa
M src/arch/x86/isa/rom.isa
3 files changed, 21 insertions(+), 10 deletions(-)
Approvals:
Matt Sinclair: Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/micro_asm.py b/src/arch/micro_asm.py
index 1eb82b5..d85bd8f 100644
--- a/src/arch/micro_asm.py
+++ b/src/arch/micro_asm.py
@@ -49,6 +49,8 @@
self.labels = {}
def add_microop(self, mnemonic, microop):
+ microop.mnemonic = mnemonic
+ microop.micropc = len(self.microops)
self.microops.append(microop)
def __str__(self):
diff --git a/src/arch/x86/isa/macroop.isa b/src/arch/x86/isa/macroop.isa
index 3710cf4..1cbdc85 100644
--- a/src/arch/x86/isa/macroop.isa
+++ b/src/arch/x86/isa/macroop.isa
@@ -133,10 +133,6 @@
let {{
from micro_asm import Combinational_Macroop, Rom_Macroop
class X86Macroop(Combinational_Macroop):
- def add_microop(self, mnemonic, microop):
- microop.mnemonic = mnemonic
- microop.micropc = len(self.microops)
- self.microops.append(microop)
def setAdjustEnv(self, val):
self.adjust_env = val
def adjustImm(self, val):
diff --git a/src/arch/x86/isa/rom.isa b/src/arch/x86/isa/rom.isa
index c7ba675..9aef3ba 100644
--- a/src/arch/x86/isa/rom.isa
+++ b/src/arch/x86/isa/rom.isa
@@ -41,12 +41,6 @@
from micro_asm import Rom
class X86MicrocodeRom(Rom):
- def add_microop(self, mnemonic, microop):
- microop.mnemonic = mnemonic
- microop.micropc = len(self.microops)
- self.microops.append(microop)
-
-
def getDeclaration(self):
declareLabels = \
"GEM5_DEPRECATED_NAMESPACE(RomLabels, rom_labels);\n"
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/56330
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: Ib2d1ce72958ec299115efb6efced2bd14c08467c
Gerrit-Change-Number: 56330
Gerrit-PatchSet: 11
Gerrit-Owner: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Matt Sinclair <mattdsincl...@gmail.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
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
