diff options
| author | 2014-03-14 01:25:11 +0000 | |
|---|---|---|
| committer | 2014-03-14 01:25:11 +0000 | |
| commit | 4ee5bd67c7dd1ba42f8187e038cee3f96cc77839 (patch) | |
| tree | 4758637f29101c0a5f18dd69d0f2442606558dfb /disassembler/disassembler_arm.cc | |
| parent | a4a8ea917cf7684dd7d319f309f2610293b7682f (diff) | |
| parent | c2687ef3ef95c9888af885ec3fa1516b218906ff (diff) | |
Merge "Avoid bus error from reading unaligned 64-bit literal"
Diffstat (limited to 'disassembler/disassembler_arm.cc')
| -rw-r--r-- | disassembler/disassembler_arm.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/disassembler/disassembler_arm.cc b/disassembler/disassembler_arm.cc index c35edbbcbf..2a966a3512 100644 --- a/disassembler/disassembler_arm.cc +++ b/disassembler/disassembler_arm.cc @@ -720,7 +720,8 @@ size_t DisassemblerArm::DumpThumb32(std::ostream& os, const uint8_t* instr_ptr) if (Rn.r == 15 && U == 1) { intptr_t lit_adr = reinterpret_cast<intptr_t>(instr_ptr); lit_adr = RoundDown(lit_adr, 4) + 4 + (imm8 << 2); - args << StringPrintf(" ; 0x%" PRIx64, *reinterpret_cast<int64_t*>(lit_adr)); + typedef const int64_t unaligned_int64_t __attribute__ ((aligned (2))); + args << StringPrintf(" ; 0x%" PRIx64, *reinterpret_cast<unaligned_int64_t*>(lit_adr)); } } else if (Rn.r == 13 && W == 1 && U == L) { // VPUSH/VPOP opcode << (L == 1 ? "vpop" : "vpush"); |