diff --git a/src/arch/micro_asm.py b/src/arch/micro_asm.py
index 1eb82b53dc..d85bd8f503 100644
--- a/src/arch/micro_asm.py
+++ b/src/arch/micro_asm.py
@@ -49,6 +49,8 @@ class Micro_Container(object):
         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 3710cf4d7a..1cbdc85def 100644
--- a/src/arch/x86/isa/macroop.isa
+++ b/src/arch/x86/isa/macroop.isa
@@ -133,10 +133,6 @@ def template MacroConstructor {{
 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 c7ba67574a..9aef3ba3eb 100644
--- a/src/arch/x86/isa/rom.isa
+++ b/src/arch/x86/isa/rom.isa
@@ -41,12 +41,6 @@ let {{
     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"