4cc36d2b43
It turns out that for the dwarf information, if a FDE indicates it's pc relative, then pc has to be incremented by the load bias. If not, then it should not be incremented. Previously, the code always subtracted load bias values from pcs, and assumed that all fdes were incremented by load bias values. The new code actually reads the fdes and adjusted the pcs in the fde and in the eh frame hdr so that load bias values are already handled properly. In addition, add dumping of arm exidx values in unwind_reg_info. This allowed verifying that the debug frame in those elf files was being handled properly. Added a new unit test that only has a debug frame that has a non-zero load bias and has fde entries that do not have pc relative encoding. Fix a couple of other small bugs. Bug: 109824792 Test: All libbacktrace/libunwindstack unit tests pass. Test: Ran ART 137-cfi test and 004-ThreadStress. Test: Verify that displaying the fde start and end pc actually match the Test: real data for fde that have pc relative set, and that don't. Test: Verified that the unwind information for arm exidx matches the Test: debug frame data. Change-Id: I707555286b5cb05df9f25489e8c5ede753cfe0fb
79 lines
2.3 KiB
C++
79 lines
2.3 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_WITH_HDR_H
|
|
#define _LIBUNWINDSTACK_DWARF_EH_FRAME_WITH_HDR_H
|
|
|
|
#include <stdint.h>
|
|
|
|
#include <unordered_map>
|
|
|
|
#include "DwarfEhFrame.h"
|
|
|
|
namespace unwindstack {
|
|
|
|
// Forward declarations.
|
|
class Memory;
|
|
|
|
template <typename AddressType>
|
|
class DwarfEhFrameWithHdr : public DwarfEhFrame<AddressType> {
|
|
public:
|
|
// Add these so that the protected members of DwarfSectionImpl
|
|
// can be accessed without needing a this->.
|
|
using DwarfSectionImpl<AddressType>::memory_;
|
|
using DwarfSectionImpl<AddressType>::fde_count_;
|
|
using DwarfSectionImpl<AddressType>::entries_offset_;
|
|
using DwarfSectionImpl<AddressType>::entries_end_;
|
|
using DwarfSectionImpl<AddressType>::last_error_;
|
|
using DwarfSectionImpl<AddressType>::load_bias_;
|
|
|
|
struct FdeInfo {
|
|
AddressType pc;
|
|
uint64_t offset;
|
|
};
|
|
|
|
DwarfEhFrameWithHdr(Memory* memory) : DwarfEhFrame<AddressType>(memory) {}
|
|
virtual ~DwarfEhFrameWithHdr() = default;
|
|
|
|
bool Init(uint64_t offset, uint64_t size, uint64_t load_bias) override;
|
|
|
|
bool GetFdeOffsetFromPc(uint64_t pc, uint64_t* fde_offset) override;
|
|
|
|
const DwarfFde* GetFdeFromIndex(size_t index) override;
|
|
|
|
const FdeInfo* GetFdeInfoFromIndex(size_t index);
|
|
|
|
bool GetFdeOffsetSequential(uint64_t pc, uint64_t* fde_offset);
|
|
|
|
bool GetFdeOffsetBinary(uint64_t pc, uint64_t* fde_offset, uint64_t total_entries);
|
|
|
|
protected:
|
|
uint8_t version_;
|
|
uint8_t ptr_encoding_;
|
|
uint8_t table_encoding_;
|
|
size_t table_entry_size_;
|
|
|
|
uint64_t ptr_offset_;
|
|
|
|
uint64_t entries_data_offset_;
|
|
uint64_t cur_entries_offset_ = 0;
|
|
|
|
std::unordered_map<uint64_t, FdeInfo> fde_info_;
|
|
};
|
|
|
|
} // namespace unwindstack
|
|
|
|
#endif // _LIBUNWINDSTACK_DWARF_EH_FRAME_WITH_HDR_H
|