[lld] r203400 - [Mips] Remove redundant 'mips' prefix from names of MipsTargetHandler

[Simon Atanasyan]

Author: atanasyan
Date: Sun Mar  9 08:04:56 2014
New Revision: 203400

URL: http://llvm.org/viewvc/llvm-project?rev=203400&view=rev
Log:
[Mips] Remove redundant 'mips' prefix from names of MipsTargetHandler
and MipsDynamicSymbolTable classes fields.

Modified:
    lld/trunk/lib/ReaderWriter/ELF/Mips/MipsTargetHandler.cpp
    lld/trunk/lib/ReaderWriter/ELF/Mips/MipsTargetHandler.h

Modified: lld/trunk/lib/ReaderWriter/ELF/Mips/MipsTargetHandler.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Mips/MipsTargetHandler.cpp?rev=203400&r1=203399&r2=203400&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/Mips/MipsTargetHandler.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/Mips/MipsTargetHandler.cpp Sun Mar  9 08:04:56 2014
@@ -19,22 +19,21 @@ using namespace elf;
 typedef llvm::object::ELFType<llvm::support::little, 2, false> Mips32ElELFType;
 
 MipsTargetHandler::MipsTargetHandler(MipsLinkingContext &context)
-    : DefaultTargetHandler(context), _mipsLinkingContext(context),
-      _mipsRuntimeFile(new MipsRuntimeFile<Mips32ElELFType>(context)),
-      _mipsTargetLayout(new MipsTargetLayout<Mips32ElELFType>(context)),
-      _mipsRelocationHandler(
-          new MipsTargetRelocationHandler(*_mipsTargetLayout)) {}
+    : DefaultTargetHandler(context), _context(context),
+      _runtimeFile(new MipsRuntimeFile<Mips32ElELFType>(context)),
+      _targetLayout(new MipsTargetLayout<Mips32ElELFType>(context)),
+      _relocationHandler(new MipsTargetRelocationHandler(*_targetLayout)) {}
 
 std::unique_ptr<Writer> MipsTargetHandler::getWriter() {
-  switch (_mipsLinkingContext.getOutputELFType()) {
+  switch (_context.getOutputELFType()) {
   case llvm::ELF::ET_EXEC:
     return std::unique_ptr<Writer>(
-        new elf::MipsExecutableWriter<Mips32ElELFType>(
-            _mipsLinkingContext, *_mipsTargetLayout));
+        new elf::MipsExecutableWriter<Mips32ElELFType>(_context,
+                                                       *_targetLayout));
   case llvm::ELF::ET_DYN:
     return std::unique_ptr<Writer>(
-        new elf::MipsDynamicLibraryWriter<Mips32ElELFType>(
-            _mipsLinkingContext, *_mipsTargetLayout));
+        new elf::MipsDynamicLibraryWriter<Mips32ElELFType>(_context,
+                                                           *_targetLayout));
   case llvm::ELF::ET_REL:
     llvm_unreachable("TODO: support -r mode");
   default:

Modified: lld/trunk/lib/ReaderWriter/ELF/Mips/MipsTargetHandler.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Mips/MipsTargetHandler.h?rev=203400&r1=203399&r2=203400&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/Mips/MipsTargetHandler.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/Mips/MipsTargetHandler.h Sun Mar  9 08:04:56 2014
@@ -73,11 +73,11 @@ public:
   MipsTargetHandler(MipsLinkingContext &context);
 
   MipsTargetLayout<Mips32ElELFType> &getTargetLayout() override {
-    return *_mipsTargetLayout;
+    return *_targetLayout;
   }
 
   const MipsTargetRelocationHandler &getRelocationHandler() const override {
-    return *_mipsRelocationHandler;
+    return *_relocationHandler;
   }
 
   std::unique_ptr<Writer> getWriter() override;
@@ -86,10 +86,10 @@ public:
 
 private:
   static const Registry::KindStrings kindStrings[];
-  MipsLinkingContext &_mipsLinkingContext;
-  std::unique_ptr<MipsRuntimeFile<Mips32ElELFType>> _mipsRuntimeFile;
-  std::unique_ptr<MipsTargetLayout<Mips32ElELFType>> _mipsTargetLayout;
-  std::unique_ptr<MipsTargetRelocationHandler> _mipsRelocationHandler;
+  MipsLinkingContext &_context;
+  std::unique_ptr<MipsRuntimeFile<Mips32ElELFType>> _runtimeFile;
+  std::unique_ptr<MipsTargetLayout<Mips32ElELFType>> _targetLayout;
+  std::unique_ptr<MipsTargetRelocationHandler> _relocationHandler;
 };
 
 class MipsDynamicSymbolTable : public DynamicSymbolTable<Mips32ElELFType> {
@@ -99,7 +99,7 @@ public:
       : DynamicSymbolTable<Mips32ElELFType>(
             context, layout, ".dynsym",
             DefaultLayout<Mips32ElELFType>::ORDER_DYNAMIC_SYMBOLS),
-        _mipsTargetLayout(layout) {}
+        _targetLayout(layout) {}
 
   void sortSymbols() override {
     std::stable_sort(_symbolTable.begin(), _symbolTable.end(),
@@ -108,12 +108,12 @@ public:
           B._symbol.getBinding() != STB_GLOBAL)
         return A._symbol.getBinding() < B._symbol.getBinding();
 
-      return _mipsTargetLayout.getGOTSection().compare(A._atom, B._atom);
+      return _targetLayout.getGOTSection().compare(A._atom, B._atom);
     });
   }
 
 private:
-  MipsTargetLayout<Mips32ElELFType> &_mipsTargetLayout;
+  MipsTargetLayout<Mips32ElELFType> &_targetLayout;
 };
 
 } // end namespace elf