4ca98e18a4
Due to a bug, an elf can have FDEs with a length of zero, while still having another FDE for the same pc with a non-zero length. The eh_frame_hdr can sometimes point to the zero length FDE, but it should have pointed to the non-zero length FDE. In order to fix this, if the eh_frame_hdr points at the zero length FDE then try and find the real FDE directly from eh_frame. The change cleans up and removes unused variables from DwarfEhFrameWithHdr and changes the objects so that all of the DwarfSection objects and DwarfEhFrameWithHdr object inherit from the same class. Add new unit tests to verify this functionality. Bug: 142483624 Test: Unit tests all pass. Change-Id: I128a916e3ba378931de7d44ee15e57e24d4073df
49 lines
1.5 KiB
C++
49 lines
1.5 KiB
C++
/*
|
|
* Copyright (C) 2016 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef _LIBUNWINDSTACK_DWARF_EH_FRAME_H
|
|
#define _LIBUNWINDSTACK_DWARF_EH_FRAME_H
|
|
|
|
#include <stdint.h>
|
|
|
|
#include <unwindstack/DwarfSection.h>
|
|
#include <unwindstack/Memory.h>
|
|
|
|
namespace unwindstack {
|
|
|
|
template <typename AddressType>
|
|
class DwarfEhFrame : public DwarfSectionImpl<AddressType> {
|
|
public:
|
|
DwarfEhFrame(Memory* memory) : DwarfSectionImpl<AddressType>(memory) {}
|
|
virtual ~DwarfEhFrame() = default;
|
|
|
|
uint64_t GetCieOffsetFromFde32(uint32_t pointer) override {
|
|
return this->memory_.cur_offset() - pointer - 4;
|
|
}
|
|
|
|
uint64_t GetCieOffsetFromFde64(uint64_t pointer) override {
|
|
return this->memory_.cur_offset() - pointer - 8;
|
|
}
|
|
|
|
uint64_t AdjustPcFromFde(uint64_t pc) override {
|
|
// The eh_frame uses relative pcs.
|
|
return pc + this->memory_.cur_offset() - 4;
|
|
}
|
|
};
|
|
|
|
} // namespace unwindstack
|
|
|
|
#endif // _LIBUNWINDSTACK_DWARF_EH_FRAME_H
|