diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2010-06-02 12:58:02 -0500 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2010-06-02 12:58:02 -0500 |
commit | bf903ec9a111bab252744696dc83ecf8d8922505 (patch) | |
tree | 83cff9539121f760ea814ec323c14bf306ec21ab /src/arch/arm/insts | |
parent | 36ca0658a412671ee18cde40b8d264e319fb4710 (diff) | |
download | gem5-bf903ec9a111bab252744696dc83ecf8d8922505.tar.xz |
ARM: Get rid of the unused Jump format.
Diffstat (limited to 'src/arch/arm/insts')
-rw-r--r-- | src/arch/arm/insts/branch.cc | 16 | ||||
-rw-r--r-- | src/arch/arm/insts/branch.hh | 27 |
2 files changed, 0 insertions, 43 deletions
diff --git a/src/arch/arm/insts/branch.cc b/src/arch/arm/insts/branch.cc index 3deb380f8..5e08b069d 100644 --- a/src/arch/arm/insts/branch.cc +++ b/src/arch/arm/insts/branch.cc @@ -38,14 +38,6 @@ Branch::branchTarget(Addr branchPC) const return branchPC + 8 + disp; } -Addr -Jump::branchTarget(ThreadContext *tc) const -{ - Addr NPC = tc->readPC() + 8; - uint64_t Rb = tc->readIntReg(_srcRegIdx[0]); - return (Rb & ~3) | (NPC & 1); -} - const std::string & PCDependentDisassembly::disassemble(Addr pc, const SymbolTable *symtab) const @@ -90,12 +82,4 @@ BranchExchange::generateDisassembly(Addr pc, const SymbolTable *symtab) const } return ss.str(); } - -std::string -Jump::generateDisassembly(Addr pc, const SymbolTable *symtab) const -{ - std::stringstream ss; - printMnemonic(ss); - return ss.str(); -} } diff --git a/src/arch/arm/insts/branch.hh b/src/arch/arm/insts/branch.hh index c9a4eaf40..db626f28f 100644 --- a/src/arch/arm/insts/branch.hh +++ b/src/arch/arm/insts/branch.hh @@ -107,33 +107,6 @@ class BranchExchange : public PredOp generateDisassembly(Addr pc, const SymbolTable *symtab) const; }; - -/** - * Base class for jumps (register-indirect control transfers). In - * the Arm ISA, these are always unconditional. - */ -class Jump : public PCDependentDisassembly -{ - protected: - - /// Displacement to target address (signed). - int32_t disp; - - uint32_t target; - - public: - /// Constructor - Jump(const char *mnem, ExtMachInst _machInst, OpClass __opClass) - : PCDependentDisassembly(mnem, _machInst, __opClass), - disp(machInst.offset << 2) - { - } - - Addr branchTarget(ThreadContext *tc) const; - - std::string - generateDisassembly(Addr pc, const SymbolTable *symtab) const; -}; } #endif //__ARCH_ARM_INSTS_BRANCH_HH__ |