[lld] r175997 - [ELF][Hexagon] add _SDA_BASE_(absolute symbol pointing to start of quickdata)

Shankar Easwaran shankare at codeaurora.org
Sun Feb 24 08:02:24 PST 2013


Author: shankare
Date: Sun Feb 24 10:02:24 2013
New Revision: 175997

URL: http://llvm.org/viewvc/llvm-project?rev=175997&view=rev
Log:
[ELF][Hexagon] add _SDA_BASE_(absolute symbol pointing to start of quickdata)

Added:
    lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonExecutableAtoms.h
    lld/trunk/test/elf/Hexagon/
    lld/trunk/test/elf/Hexagon/Inputs/
    lld/trunk/test/elf/Hexagon/Inputs/sda-base.o   (with props)
    lld/trunk/test/elf/Hexagon/sda-base.test
Modified:
    lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonSectionChunks.h
    lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.cpp
    lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h
    lld/trunk/lib/ReaderWriter/ELF/Writer.cpp

Added: lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonExecutableAtoms.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonExecutableAtoms.h?rev=175997&view=auto
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonExecutableAtoms.h (added)
+++ lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonExecutableAtoms.h Sun Feb 24 10:02:24 2013
@@ -0,0 +1,31 @@
+//===- lib/ReaderWriter/ELF/Hexagon/HexagonExecutableAtoms.h --------------===//
+//
+//                             The LLVM Linker
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLD_READER_WRITER_ELF_HEXAGON_EXECUTABLE_ATOM_H
+#define LLD_READER_WRITER_ELF_HEXAGON_EXECUTABLE_ATOM_H
+
+#include "ExecutableAtoms.h"
+
+namespace lld {
+namespace elf {
+typedef llvm::object::ELFType<llvm::support::little, 4, false> HexagonELFType;
+class HexagonTargetInfo;
+
+template <class HexagonELFType> class HexagonRuntimeFile 
+  : public CRuntimeFile<HexagonELFType> {
+public:
+  HexagonRuntimeFile(const HexagonTargetInfo &hti)
+    :CRuntimeFile<HexagonELFType>(hti, "Hexagon runtime file") 
+  {}
+
+};
+} // elf 
+} // lld
+
+#endif // LLD_READER_WRITER_ELF_HEXAGON_EXECUTABLE_ATOM_H

Modified: lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonSectionChunks.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonSectionChunks.h?rev=175997&r1=175996&r2=175997&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonSectionChunks.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonSectionChunks.h Sun Feb 24 10:02:24 2013
@@ -25,6 +25,7 @@ public:
             HexagonTargetLayout<HexagonELFType>::ORDER_SDATA) {
     this->_type = SHT_PROGBITS;
     this->_flags = SHF_ALLOC | SHF_WRITE;
+    this->_align2 = 4096;
   }
 
   /// \brief Finalize the section contents before writing

Modified: lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.cpp?rev=175997&r1=175996&r2=175997&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.cpp Sun Feb 24 10:02:24 2013
@@ -17,5 +17,5 @@ using namespace llvm::ELF;
 
 HexagonTargetHandler::HexagonTargetHandler(HexagonTargetInfo &targetInfo)
     : DefaultTargetHandler(targetInfo), _relocationHandler(targetInfo),
-      _targetLayout(targetInfo) {
+      _targetLayout(targetInfo), _hexagonRuntimeFile(targetInfo) {
 }

Modified: lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h?rev=175997&r1=175996&r2=175997&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h Sun Feb 24 10:02:24 2013
@@ -11,7 +11,7 @@
 #define LLD_READER_WRITER_ELF_HEXAGON_TARGET_HANDLER_H
 
 #include "DefaultTargetHandler.h"
-#include "ExecutableAtoms.h"
+#include "HexagonExecutableAtoms.h"
 #include "HexagonRelocationHandler.h"
 #include "HexagonSectionChunks.h"
 #include "TargetLayout.h"
@@ -132,6 +132,10 @@ public:
     return DefaultLayout<HexagonELFType>::getSegmentType(section);
   }
 
+  Section<HexagonELFType> *getSDataSection() const {
+    return _sdataSection;
+  }
+
 private:
   llvm::BumpPtrAllocator _alloc;
   SDataSection<HexagonELFType> *_sdataSection;
@@ -155,10 +159,26 @@ public:
     return _relocationHandler;
   }
 
+  void addDefaultAtoms() {
+    _hexagonRuntimeFile.addAbsoluteAtom("_SDA_BASE_");
+  }
+
+  virtual void addFiles(InputFiles &inputFiles) {
+    addDefaultAtoms();
+    inputFiles.prependFile(_hexagonRuntimeFile);
+  }
+
+  void finalizeSymbolValues() {
+    auto sdabaseAtomIter = _targetLayout.findAbsoluteAtom("_SDA_BASE_");
+    (*sdabaseAtomIter)->_virtualAddr = 
+      _targetLayout.getSDataSection()->virtualAddr();
+  }
+
 private:
   HexagonTargetRelocationHandler _relocationHandler;
   HexagonTargetLayout<HexagonELFType> _targetLayout;
   HexagonTargetAtomHandler<HexagonELFType> _targetAtomHandler;
+  HexagonRuntimeFile<HexagonELFType> _hexagonRuntimeFile; 
 };
 } // end namespace elf
 } // end namespace lld

Modified: lld/trunk/lib/ReaderWriter/ELF/Writer.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Writer.cpp?rev=175997&r1=175996&r2=175997&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/Writer.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/Writer.cpp Sun Feb 24 10:02:24 2013
@@ -229,6 +229,9 @@ void ExecutableWriter<ELFT>::finalizeDef
   (*bssEndAtomIter)->_virtualAddr = (*phe)->p_vaddr + (*phe)->p_memsz;
   (*underScoreEndAtomIter)->_virtualAddr = (*phe)->p_vaddr + (*phe)->p_memsz;
   (*endAtomIter)->_virtualAddr = (*phe)->p_vaddr + (*phe)->p_memsz;
+
+  // Give a chance for the target to finalize its atom values
+  _targetHandler.finalizeSymbolValues();
 }
 
 template <class ELFT>

Added: lld/trunk/test/elf/Hexagon/Inputs/sda-base.o
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Hexagon/Inputs/sda-base.o?rev=175997&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lld/trunk/test/elf/Hexagon/Inputs/sda-base.o
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lld/trunk/test/elf/Hexagon/sda-base.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Hexagon/sda-base.test?rev=175997&view=auto
==============================================================================
--- lld/trunk/test/elf/Hexagon/sda-base.test (added)
+++ lld/trunk/test/elf/Hexagon/sda-base.test Sun Feb 24 10:02:24 2013
@@ -0,0 +1,4 @@
+RUN: lld-core -arch hexagon -reader ELF %p/Inputs/sda-base.o -writer ELF -o %t1
+RUN: llvm-nm -n %t1 | FileCheck %s -check-prefix=sdabase
+
+sdabase: 00002000 A _SDA_BASE_





More information about the llvm-commits mailing list