ARM: Eliminate the old memory formats which are no longer used.

2 files changed, 0 insertions, 99 deletions

diff --git a/src/arch/arm/isa/formats/mem.isa b/src/arch/arm/isa/formats/mem.isa
index 648220884..13309ec9b 100644
--- a/src/arch/arm/isa/formats/mem.isa
+++ b/src/arch/arm/isa/formats/mem.isa
@@ -39,50 +39,6 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Authors: Gabe Black
-//          Stephen Hines
-
-////////////////////////////////////////////////////////////////////
-//
-// Memory-format instructions
-//
-
-def template LoadStoreDeclare {{
-    /**
-     * Static instruction class for "%(mnemonic)s".
-     */
-    class %(class_name)s : public %(base_class)s
-    {
-      public:
-
-        /// Constructor.
-        %(class_name)s(ExtMachInst machInst);
-
-        %(BasicExecDeclare)s
-
-        %(InitiateAccDeclare)s
-
-        %(CompleteAccDeclare)s
-    };
-}};
-
-
-def template InitiateAccDeclare {{
-    Fault initiateAcc(%(CPU_exec_context)s *, Trace::InstRecord *) const;
-}};
-
-
-def template CompleteAccDeclare {{
-    Fault completeAcc(PacketPtr,  %(CPU_exec_context)s *, Trace::InstRecord *) const;
-}};
-
-
-def template LoadStoreConstructor {{
-    inline %(class_name)s::%(class_name)s(ExtMachInst machInst)
-         : %(base_class)s("%(mnemonic)s", machInst, %(op_class)s)
-    {
-        %(constructor)s;
-    }
-}};
 
 def format AddrMode2(imm) {{
     if eval(imm):
@@ -514,22 +470,3 @@ def format Thumb16MemLit() {{
     ''' % loadImmClassName(False, True, False)
 }};
 
-def format ArmLoadMemory(memacc_code, ea_code = {{ EA = Rn + disp; }},
-                     mem_flags = [], inst_flags = []) {{
-    ea_code = ArmGenericCodeSubs(ea_code)
-    memacc_code = ArmGenericCodeSubs(memacc_code)
-    (header_output, decoder_output, decode_block, exec_output) = \
-        LoadStoreBase(name, Name, ea_code, memacc_code, mem_flags, inst_flags,
-                      decode_template = BasicDecode,
-                      exec_template_base = 'Load')
-}};
-
-def format ArmStoreMemory(memacc_code, ea_code = {{ EA = Rn + disp; }},
-                     mem_flags = [], inst_flags = []) {{
-    ea_code = ArmGenericCodeSubs(ea_code)
-    memacc_code = ArmGenericCodeSubs(memacc_code)
-    (header_output, decoder_output, decode_block, exec_output) = \
-        LoadStoreBase(name, Name, ea_code, memacc_code, mem_flags, inst_flags,
-                      exec_template_base = 'Store')
-}};
-
diff --git a/src/arch/arm/isa/formats/util.isa b/src/arch/arm/isa/formats/util.isa
index d4dd41d2b..286ce5ce5 100644
--- a/src/arch/arm/isa/formats/util.isa
+++ b/src/arch/arm/isa/formats/util.isa
@@ -38,42 +38,6 @@ def ArmGenericCodeSubs(code):
     new_code = re.sub(r'Rm_Rs',
             'shift_rm_rs(Rm, Rs, shift, CondCodes<29:>)', new_code)
     return new_code
-
-def LoadStoreBase(name, Name, ea_code, memacc_code, mem_flags, inst_flags,
-                  base_class = 'Memory',
-                  decode_template = BasicDecode, exec_template_base = ''):
-    # Make sure flags are in lists (convert to lists if not).
-    mem_flags = makeList(mem_flags)
-    inst_flags = makeList(inst_flags)
-
-    iop = InstObjParams(name, Name, base_class,
-                        {'ea_code': ea_code,
-                         'memacc_code': memacc_code,
-                         'predicate_test': predicateTest},
-                        inst_flags)
-
-    if mem_flags:
-        s = '\n\tmemAccessFlags = ' + string.join(mem_flags, '|') + ';'
-        iop.constructor += s
-        memacc_iop.constructor += s
-
-    # select templates
-
-    # The InitiateAcc template is the same for StoreCond templates as the
-    # corresponding Store template..
-    StoreCondInitiateAcc = StoreInitiateAcc
-
-    fullExecTemplate = eval(exec_template_base + 'Execute')
-    initiateAccTemplate = eval(exec_template_base + 'InitiateAcc')
-    completeAccTemplate = eval(exec_template_base + 'CompleteAcc')
-
-    # (header_output, decoder_output, decode_block, exec_output)
-    return (LoadStoreDeclare.subst(iop),
-            LoadStoreConstructor.subst(iop),
-            decode_template.subst(iop),
-            fullExecTemplate.subst(iop)
-            + initiateAccTemplate.subst(iop)
-            + completeAccTemplate.subst(iop))
 }};