diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-09-14 20:34:17 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-09-16 12:50:08 -0700 |
| commit | 2cbaccb67e22c0b313a9785bfc65bcb4b25d0676 (patch) | |
| tree | daeb766e19880b651fd9c4a719c9a07dd7d4bd0e /disassembler/disassembler_arm64.cc | |
| parent | bace0378d720a1d2938ec7f6be17e2814671d20a (diff) | |
| download | art-2cbaccb67e22c0b313a9785bfc65bcb4b25d0676.zip art-2cbaccb67e22c0b313a9785bfc65bcb4b25d0676.tar.gz art-2cbaccb67e22c0b313a9785bfc65bcb4b25d0676.tar.bz2 | |
Avoid printing absolute addresses in oatdump
- Added printing of OatClass offsets.
- Added printing of OatMethod offsets.
- Added bounds checks for code size size, code size, mapping table, gc map, vmap table.
- Added sanity check of 100k for code size.
- Added partial disassembly of questionable code.
- Added --no-disassemble to disable disassembly.
- Added --no-dump:vmap to disable vmap dumping.
- Reordered OatMethod info to be in file order.
Bug: 15567083
(cherry picked from commit 34fa79ece5b3a1940d412cd94dbdcc4225aae72f)
Change-Id: I2c368f3b81af53b735149a866f3e491c9ac33fb8
Diffstat (limited to 'disassembler/disassembler_arm64.cc')
| -rw-r--r-- | disassembler/disassembler_arm64.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/disassembler/disassembler_arm64.cc b/disassembler/disassembler_arm64.cc index 864d22d..5d0c218 100644 --- a/disassembler/disassembler_arm64.cc +++ b/disassembler/disassembler_arm64.cc @@ -34,7 +34,8 @@ static uint32_t ReadU32(const uint8_t* ptr) { size_t DisassemblerArm64::Dump(std::ostream& os, const uint8_t* begin) { uint32_t instruction = ReadU32(begin); decoder.Decode(reinterpret_cast<vixl::Instruction*>(&instruction)); - os << StringPrintf("%p: %08x\t%s\n", begin, instruction, disasm.GetOutput()); + os << FormatInstructionPointer(begin) + << StringPrintf(": %08x\t%s\n", instruction, disasm.GetOutput()); return vixl::kInstructionSize; } |