ld64-128.2.tar.gz

[apple/ld64.git] / src / ld / LinkEdit.hpp

diff --git a/src/ld/LinkEdit.hpp b/src/ld/LinkEdit.hpp
index d905a3d7caa0ead85c3a95470d5dff0a4c80c051..7bca2e309a0f69ddc87905f168eddb6332e0d745 100644 (file)
--- a/src/ld/LinkEdit.hpp
+++ b/src/ld/LinkEdit.hpp
@@ -1058,12 +1058,15 @@ private:
        typedef typename A::P::E                                        E;
        typedef typename A::P::uint_t                           pint_t;
 
        typedef typename A::P::E                                        E;
        typedef typename A::P::uint_t                           pint_t;
 

-       void                                                                            addSplitSegInfo(uint64_t address, ld::Fixup::Kind k) const;
+       void                                                                            addSplitSegInfo(uint64_t address, ld::Fixup::Kind k, uint32_t) const;

        void                                                                            uleb128EncodeAddresses(const std::vector<uint64_t>& locations) const;
 
        mutable std::vector<uint64_t>                           _32bitPointerLocations;
        mutable std::vector<uint64_t>                           _64bitPointerLocations;
        void                                                                            uleb128EncodeAddresses(const std::vector<uint64_t>& locations) const;
 
        mutable std::vector<uint64_t>                           _32bitPointerLocations;
        mutable std::vector<uint64_t>                           _64bitPointerLocations;

-       mutable std::vector<uint64_t>                           _ppcHi16Locations;
+       mutable std::vector<uint64_t>                           _thumbLo16Locations;
+       mutable std::vector<uint64_t>                           _thumbHi16Locations[16];
+       mutable std::vector<uint64_t>                           _armLo16Locations;
+       mutable std::vector<uint64_t>                           _armHi16Locations[16];

 
 
        static ld::Section                      _s_section;
 
 
        static ld::Section                      _s_section;


@@ -1073,7 +1076,7 @@ template <typename A>
 ld::Section SplitSegInfoAtom<A>::_s_section("__LINKEDIT", "__splitSegInfo", ld::Section::typeLinkEdit, true);
 
 template <>
 ld::Section SplitSegInfoAtom<A>::_s_section("__LINKEDIT", "__splitSegInfo", ld::Section::typeLinkEdit, true);
 
 template <>

-void SplitSegInfoAtom<x86_64>::addSplitSegInfo(uint64_t address, ld::Fixup::Kind kind) const
+void SplitSegInfoAtom<x86_64>::addSplitSegInfo(uint64_t address, ld::Fixup::Kind kind, uint32_t extra) const

 {
        switch (kind) {
                case ld::Fixup::kindStoreX86PCRel32:
 {
        switch (kind) {
                case ld::Fixup::kindStoreX86PCRel32:


@@ -1101,7 +1104,7 @@ void SplitSegInfoAtom<x86_64>::addSplitSegInfo(uint64_t address, ld::Fixup::Kind
 }
 
 template <>
 }
 
 template <>

-void SplitSegInfoAtom<x86>::addSplitSegInfo(uint64_t address, ld::Fixup::Kind kind) const
+void SplitSegInfoAtom<x86>::addSplitSegInfo(uint64_t address, ld::Fixup::Kind kind, uint32_t extra) const

 {
        switch (kind) {
                case ld::Fixup::kindStoreLittleEndian32:
 {
        switch (kind) {
                case ld::Fixup::kindStoreLittleEndian32:


@@ -1115,42 +1118,25 @@ void SplitSegInfoAtom<x86>::addSplitSegInfo(uint64_t address, ld::Fixup::Kind ki
 }
 
 template <>
 }
 
 template <>

-void SplitSegInfoAtom<arm>::addSplitSegInfo(uint64_t address, ld::Fixup::Kind kind) const
+void SplitSegInfoAtom<arm>::addSplitSegInfo(uint64_t address, ld::Fixup::Kind kind, uint32_t extra) const

 {
        switch (kind) {
                case ld::Fixup::kindStoreLittleEndian32:
                        _32bitPointerLocations.push_back(address);
                        break;
 {
        switch (kind) {
                case ld::Fixup::kindStoreLittleEndian32:
                        _32bitPointerLocations.push_back(address);
                        break;

-               default:
-                       warning("codegen at address 0x%08llX prevents image from working in dyld shared cache", address);
+        case ld::Fixup::kindStoreARMLow16:
+                       _armLo16Locations.push_back(address);

                        break;
                        break;

-       }
-}
-
-
-template <>
-void SplitSegInfoAtom<ppc>::addSplitSegInfo(uint64_t address, ld::Fixup::Kind kind) const
-{
-       switch (kind) {
-               case ld::Fixup::kindStorePPCPicHigh16AddLow:
-                       _ppcHi16Locations.push_back(address);
+       case ld::Fixup::kindStoreThumbLow16: 
+                       _thumbLo16Locations.push_back(address);

                        break;
                        break;

-               case ld::Fixup::kindStoreBigEndian32:
-                       _32bitPointerLocations.push_back(address);
+        case ld::Fixup::kindStoreARMHigh16: 
+            assert(extra < 16);
+                       _armHi16Locations[extra].push_back(address);

                        break;
                        break;

-               default:
-                       warning("codegen at address 0x%08llX prevents image from working in dyld shared cache", address);
-                       break;
-       }
-}
-
-
-template <>
-void SplitSegInfoAtom<ppc64>::addSplitSegInfo(uint64_t address, ld::Fixup::Kind kind) const
-{
-       switch (kind) {
-               case ld::Fixup::kindStorePPCPicHigh16AddLow:
-                       _ppcHi16Locations.push_back(address);
+        case ld::Fixup::kindStoreThumbHigh16: 
+            assert(extra < 16);
+                       _thumbHi16Locations[extra].push_back(address);

                        break;
                default:
                        warning("codegen at address 0x%08llX prevents image from working in dyld shared cache", address);
                        break;
                default:
                        warning("codegen at address 0x%08llX prevents image from working in dyld shared cache", address);


@@ -1159,6 +1145,7 @@ void SplitSegInfoAtom<ppc64>::addSplitSegInfo(uint64_t address, ld::Fixup::Kind
 }
 
 
 }
 
 

+

 template <typename A>
 void SplitSegInfoAtom<A>::uleb128EncodeAddresses(const std::vector<uint64_t>& locations) const
 {
 template <typename A>
 void SplitSegInfoAtom<A>::uleb128EncodeAddresses(const std::vector<uint64_t>& locations) const
 {


@@ -1192,7 +1179,7 @@ void SplitSegInfoAtom<A>::encode() const
        // sort into group by pointer adjustment kind
        std::vector<OutputFile::SplitSegInfoEntry>& info = this->_writer._splitSegInfos;
        for (std::vector<OutputFile::SplitSegInfoEntry>::const_iterator it = info.begin(); it != info.end(); ++it) {
        // sort into group by pointer adjustment kind
        std::vector<OutputFile::SplitSegInfoEntry>& info = this->_writer._splitSegInfos;
        for (std::vector<OutputFile::SplitSegInfoEntry>::const_iterator it = info.begin(); it != info.end(); ++it) {

-               this->addSplitSegInfo(it->address, it->kind);
+               this->addSplitSegInfo(it->address, it->kind, it->extra);

        }
 
        // delta compress runs of addresses
        }
 
        // delta compress runs of addresses


@@ -1213,14 +1200,42 @@ void SplitSegInfoAtom<A>::encode() const
                this->_encodedData.append_byte(0); // terminator
        }
 
                this->_encodedData.append_byte(0); // terminator
        }
 

-       if ( _ppcHi16Locations.size() != 0 ) {
-               this->_encodedData.append_byte(3);
-               //fprintf(stderr, "type 3:\n");
-               std::sort(_ppcHi16Locations.begin(), _ppcHi16Locations.end());
-               this->uleb128EncodeAddresses(_ppcHi16Locations);
+       if ( _thumbLo16Locations.size() != 0 ) {
+               this->_encodedData.append_byte(5);
+               //fprintf(stderr, "type 5:\n");
+               std::sort(_thumbLo16Locations.begin(), _thumbLo16Locations.end());
+               this->uleb128EncodeAddresses(_thumbLo16Locations);

                this->_encodedData.append_byte(0); // terminator
        }
 
                this->_encodedData.append_byte(0); // terminator
        }
 

+       if ( _armLo16Locations.size() != 0 ) {
+               this->_encodedData.append_byte(6);
+               //fprintf(stderr, "type 6:\n");
+               std::sort(_armLo16Locations.begin(), _armLo16Locations.end());
+               this->uleb128EncodeAddresses(_armLo16Locations);
+               this->_encodedData.append_byte(0); // terminator
+       }
+
+       for (uint32_t i=0; i < 16; ++i) {
+               if ( _thumbHi16Locations[i].size() != 0 ) {
+                       this->_encodedData.append_byte(16+i);
+                       //fprintf(stderr, "type 16+%d:\n", i);
+                       std::sort(_thumbHi16Locations[i].begin(), _thumbHi16Locations[i].end());
+                       this->uleb128EncodeAddresses(_thumbHi16Locations[i]);
+                       this->_encodedData.append_byte(0); // terminator
+               }
+       }
+
+       for (uint32_t i=0; i < 16; ++i) {
+               if ( _armHi16Locations[i].size() != 0 ) {
+                       this->_encodedData.append_byte(32+i);
+                       //fprintf(stderr, "type 32+%d:\n", i);
+                       std::sort(_armHi16Locations[i].begin(), _armHi16Locations[i].end());
+                       this->uleb128EncodeAddresses(_armHi16Locations[i]);
+                       this->_encodedData.append_byte(0); // terminator
+               }
+       }
+

        // always add zero byte to mark end
        this->_encodedData.append_byte(0);
 
        // always add zero byte to mark end
        this->_encodedData.append_byte(0);
 


@@ -1232,7 +1247,6 @@ void SplitSegInfoAtom<A>::encode() const
        // clean up temporaries
        _32bitPointerLocations.clear();
        _64bitPointerLocations.clear();
        // clean up temporaries
        _32bitPointerLocations.clear();
        _64bitPointerLocations.clear();

-       _ppcHi16Locations.clear();

 }
 
 
 }