98984b41da
Changes: - Change the register type from int16_t to uint32_t for the location data and the Eval processing. This is because the special dex pc is > 65535. - Add the ability for Dwarf register location information to point to a register that is itself a Dwarf location register. - Add dex_pc to the frame information. - Modify the unwind tool to print the dex pc if non-zero. This does not implement the printing of the dex information in anything but the unwind tool. It's not the final form of this printing. Bug: 72070049 Test: Ran new unit tests. Test: Dumped stack while in interpreter running 137-cfi art test and Test: verified dex pc is set to non-zero. Change-Id: I6ce8a6b577fb4f92abacbd433b1f68977e272542
45 lines
1.2 KiB
C++
45 lines
1.2 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_LOCATION_H
|
|
#define _LIBUNWINDSTACK_DWARF_LOCATION_H
|
|
|
|
#include <stdint.h>
|
|
|
|
#include <unordered_map>
|
|
|
|
namespace unwindstack {
|
|
|
|
enum DwarfLocationEnum : uint8_t {
|
|
DWARF_LOCATION_INVALID = 0,
|
|
DWARF_LOCATION_UNDEFINED,
|
|
DWARF_LOCATION_OFFSET,
|
|
DWARF_LOCATION_VAL_OFFSET,
|
|
DWARF_LOCATION_REGISTER,
|
|
DWARF_LOCATION_EXPRESSION,
|
|
DWARF_LOCATION_VAL_EXPRESSION,
|
|
};
|
|
|
|
struct DwarfLocation {
|
|
DwarfLocationEnum type;
|
|
uint64_t values[2];
|
|
};
|
|
|
|
typedef std::unordered_map<uint32_t, DwarfLocation> dwarf_loc_regs_t;
|
|
|
|
} // namespace unwindstack
|
|
|
|
#endif // _LIBUNWINDSTACK_DWARF_LOCATION_H
|