c3d79f7c07
When stepping, it's necessary to use both the unaltered relative pc and the adjusted relative pc. If the adjusted pc is not used, the wrong unwind information can be used. Added new offline unit tests that take real data and verifies that it unwinds properly. Fix a bug in the map code that would not properly parse map data for a 64 bit process when done in a 32 bit process. Fix bug in eh_frame processing that didn't adjust the pc correctly. Fix unit tests related to the pc adjustment. Bug: 69475565 Test: Passes libbacktrace/libunwindstack unit tests. Test: Run debuggerd -b on processes on a hikey. Change-Id: Ic501a1c4549c5f61d2742a7105c42a960f2c892b
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_WITH_HDR_H
|