diff options
| author | Johnny Chen <johnny.chen@apple.com> | 2011-05-12 18:48:11 +0000 |
|---|---|---|
| committer | Johnny Chen <johnny.chen@apple.com> | 2011-05-12 18:48:11 +0000 |
| commit | 3f125fe2eaab19eac991fbef562c85896b725e14 (patch) | |
| tree | 33c7bffc14a688740635246db6a54bcd3438586b | |
| parent | 33469b2cae0321879d7dcf836660ce20496a717c (diff) | |
| download | bcm5719-llvm-3f125fe2eaab19eac991fbef562c85896b725e14.tar.gz bcm5719-llvm-3f125fe2eaab19eac991fbef562c85896b725e14.zip | |
Construction of the RegisterReaderArg instance should happen after we have a valid base_addr, not before.
llvm-svn: 131236
| -rw-r--r-- | lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp index 23a788b16b5..9b28266b59d 100644 --- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp +++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp @@ -168,13 +168,13 @@ InstructionLLVM::Dump { addr_t base_addr = LLDB_INVALID_ADDRESS; - RegisterReaderArg rra(base_addr + EDInstByteSize(m_inst), m_disassembler); - if (exe_ctx && exe_ctx->target && !exe_ctx->target->GetSectionLoadList().IsEmpty()) base_addr = GetAddress().GetLoadAddress (exe_ctx->target); if (base_addr == LLDB_INVALID_ADDRESS) base_addr = GetAddress().GetFileAddress (); + RegisterReaderArg rra(base_addr + EDInstByteSize(m_inst), m_disassembler); + printTokenized = true; // Handle the opcode column. |
