diff options
Diffstat (limited to 'lldb/source/Target')
| -rw-r--r-- | lldb/source/Target/Target.cpp | 10 | ||||
| -rw-r--r-- | lldb/source/Target/ThreadPlanTracer.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp index 3dc11049f6c..0b734c53446 100644 --- a/lldb/source/Target/Target.cpp +++ b/lldb/source/Target/Target.cpp @@ -587,18 +587,16 @@ Target::ReadMemory (const Address& addr, bool prefer_file_cache, void *dst, size bool process_is_valid = m_process_sp && m_process_sp->IsAlive(); size_t bytes_read = 0; - Address resolved_addr(addr); - if (!resolved_addr.IsSectionOffset()) + Address resolved_addr; + if (!addr.IsSectionOffset()) { if (process_is_valid) - { m_section_load_list.ResolveLoadAddress (addr.GetOffset(), resolved_addr); - } else - { m_images.ResolveFileAddress(addr.GetOffset(), resolved_addr); - } } + if (!resolved_addr.IsValid()) + resolved_addr = addr; if (prefer_file_cache) { diff --git a/lldb/source/Target/ThreadPlanTracer.cpp b/lldb/source/Target/ThreadPlanTracer.cpp index 578a160251e..fe95b9a5a9a 100644 --- a/lldb/source/Target/ThreadPlanTracer.cpp +++ b/lldb/source/Target/ThreadPlanTracer.cpp @@ -209,11 +209,13 @@ ThreadPlanAssemblyTracer::Log () m_disassembler->DecodeInstructions (Address (NULL, pc), extractor, 0, 1, false); InstructionList &instruction_list = m_disassembler->GetInstructionList(); - + const uint32_t max_opcode_byte_size = instruction_list.GetMaxOpcocdeByteSize(); + if (instruction_list.GetSize()) { Instruction *instruction = instruction_list.GetInstructionAtIndex(0).get(); instruction->Dump (&desc, + max_opcode_byte_size, false, false, NULL, |
