If a function crashes by jumping into unexecutable code, the old method could not unwind through that. Add a fallback method to set the pc from the default return address location. In addition, add a new finished check for steps. This will provide a method to indicate that this step is the last step. This prevents cases where the fallback method might be triggered incorrectly. Update the libbacktrace code to unwind using the new methodology. Update the unwind tool to use the new unwind methodology. Add a new option to crasher that calls through a null function. Create a new object, Unwinder, that encapsulates the a basic unwind. For now, libbacktrace will still use the custom code. Added new unit tests to cover the new cases. Also add a test that crashes calling a nullptr as a function, and then has call frames in the signal stack. Bug: 65842173 Test: Pass all unit tests, verify crasher dumps properly. Change-Id: Ia18430ab107e9f7bdf0e14a9b74710b1280bd7f4
78 lines
1.9 KiB
C++
78 lines
1.9 KiB
C++
/*
|
|
* Copyright (C) 2017 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_UNWINDER_H
|
|
#define _LIBUNWINDSTACK_UNWINDER_H
|
|
|
|
#include <stdint.h>
|
|
#include <sys/types.h>
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include <unwindstack/Maps.h>
|
|
#include <unwindstack/Memory.h>
|
|
#include <unwindstack/Regs.h>
|
|
|
|
namespace unwindstack {
|
|
|
|
struct FrameData {
|
|
size_t num;
|
|
|
|
uint64_t rel_pc;
|
|
uint64_t pc;
|
|
uint64_t sp;
|
|
|
|
std::string function_name;
|
|
uint64_t function_offset;
|
|
|
|
std::string map_name;
|
|
uint64_t map_offset;
|
|
uint64_t map_start;
|
|
uint64_t map_end;
|
|
};
|
|
|
|
class Unwinder {
|
|
public:
|
|
Unwinder(size_t max_frames, Maps* maps, Regs* regs, std::shared_ptr<Memory> process_memory)
|
|
: max_frames_(max_frames), maps_(maps), regs_(regs), process_memory_(process_memory) {
|
|
frames_.reserve(max_frames);
|
|
}
|
|
~Unwinder() = default;
|
|
|
|
void Unwind();
|
|
|
|
size_t NumFrames() { return frames_.size(); }
|
|
|
|
const std::vector<FrameData>& frames() { return frames_; }
|
|
|
|
std::string FormatFrame(size_t frame_num);
|
|
static std::string FormatFrame(const FrameData& frame, bool bits32);
|
|
|
|
private:
|
|
void FillInFrame(MapInfo* map_info, uint64_t* rel_pc);
|
|
|
|
size_t max_frames_;
|
|
Maps* maps_;
|
|
Regs* regs_;
|
|
std::vector<FrameData> frames_;
|
|
std::shared_ptr<Memory> process_memory_;
|
|
};
|
|
|
|
} // namespace unwindstack
|
|
|
|
#endif // _LIBUNWINDSTACK_UNWINDER_H
|