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

2 files changed, 0 insertions, 122 deletions

diff --git a/src/arch/arm/insts/mem.cc b/src/arch/arm/insts/mem.cc
index f62786979..4d56b80f8 100644
--- a/src/arch/arm/insts/mem.cc
+++ b/src/arch/arm/insts/mem.cc
@@ -67,23 +67,4 @@ MemoryNew::printInst(std::ostream &os, AddrMode addrMode) const
     }
 }
 
-std::string
-Memory::generateDisassembly(Addr pc, const SymbolTable *symtab) const
-{
-    std::stringstream ss;
-    printMnemonic(ss);
-    printReg(ss, machInst.rd);
-    ss << ", [";
-    printReg(ss, machInst.rn);
-    ss << ", ";
-    if (machInst.puswl.prepost == 1)
-        printOffset(ss);
-    ss << "]";
-    if (machInst.puswl.prepost == 0)
-        printOffset(ss);
-    else if (machInst.puswl.writeback)
-        ss << "!";
-    return ss.str();
-}
-
 }
diff --git a/src/arch/arm/insts/mem.hh b/src/arch/arm/insts/mem.hh
index 3c7a50505..dd6526fe1 100644
--- a/src/arch/arm/insts/mem.hh
+++ b/src/arch/arm/insts/mem.hh
@@ -229,109 +229,6 @@ class MemoryNewPostIndex : public Base
         return ss.str();
     }
 };
-
-/**
- * Base class for general Arm memory-format instructions.
- */
-class Memory : public PredOp
-{
-  protected:
-
-    /// Memory request flags.  See mem_req_base.hh.
-    unsigned memAccessFlags;
-
-    /// Displacement for EA calculation (signed).
-    int32_t disp;
-    int32_t disp8;
-    int32_t up;
-    int32_t hilo,
-            shift_size,
-            shift;
-
-    /// Constructor
-    Memory(const char *mnem, ExtMachInst _machInst, OpClass __opClass)
-        : PredOp(mnem, _machInst, __opClass),
-                 memAccessFlags(0),
-                 disp(machInst.immed11_0),
-                 disp8(machInst.immed7_0 << 2),
-                 up(machInst.puswl.up),
-                 hilo((machInst.immedHi11_8 << 4) | machInst.immedLo3_0),
-                 shift_size(machInst.shiftSize), shift(machInst.shift)
-    {
-    }
-
-    std::string
-    generateDisassembly(Addr pc, const SymbolTable *symtab) const;
-
-    virtual void
-    printOffset(std::ostream &os) const
-    {}
-};
-
-class MemoryDisp : public Memory
-{
-  protected:
-    /// Constructor
-    MemoryDisp(const char *mnem, ExtMachInst _machInst, OpClass __opClass)
-        : Memory(mnem, _machInst, __opClass)
-    {
-    }
-
-    void
-    printOffset(std::ostream &os) const
-    {
-        ccprintf(os, "#%#x", (machInst.puswl.up ? disp : -disp));
-    }
-};
-
-class MemoryHilo : public Memory
-{
-  protected:
-    /// Constructor
-    MemoryHilo(const char *mnem, ExtMachInst _machInst, OpClass __opClass)
-        : Memory(mnem, _machInst, __opClass)
-    {
-    }
-
-    void
-    printOffset(std::ostream &os) const
-    {
-        ccprintf(os, "#%#x", (machInst.puswl.up ? hilo : -hilo));
-    }
-};
-
-class MemoryShift : public Memory
-{
-  protected:
-    /// Constructor
-    MemoryShift(const char *mnem, ExtMachInst _machInst, OpClass __opClass)
-        : Memory(mnem, _machInst, __opClass)
-    {
-    }
-
-    void
-    printOffset(std::ostream &os) const
-    {
-        printShiftOperand(os);
-    }
-};
-
-class MemoryReg : public Memory
-{
-  protected:
-    /// Constructor
-    MemoryReg(const char *mnem, ExtMachInst _machInst, OpClass __opClass)
-        : Memory(mnem, _machInst, __opClass)
-    {
-    }
-
-    void
-    printOffset(std::ostream &os) const
-    {
-        os << (machInst.puswl.up ? "+ " : "- ");
-        printReg(os, machInst.rm);
-    }
-};
 }
 
 #endif //__ARCH_ARM_INSTS_MEM_HH__