From 28eb57114d05dd100d9b4a56e0a00be85cd09e3b Mon Sep 17 00:00:00 2001 From: Jim Ingham Date: Fri, 12 Oct 2012 17:34:26 +0000 Subject: Bunch of cleanups for warnings found by the llvm static analyzer. llvm-svn: 165808 --- lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp') diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp index fd091fe8c57..378d9c5638a 100644 --- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp +++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp @@ -178,11 +178,15 @@ InstructionLLVM::CalculateMnemonicOperandsAndComment (const ExecutionContext* ex uint32_t addr_nibble_size = 8; addr_t base_addr = LLDB_INVALID_ADDRESS; Target *target = exe_ctx ? exe_ctx->GetTargetPtr() : NULL; - if (target && !target->GetSectionLoadList().IsEmpty()) - base_addr = GetAddress().GetLoadAddress (target); + if (target) + { + addr_nibble_size = target->GetArchitecture().GetAddressByteSize() * 2; + if (!target->GetSectionLoadList().IsEmpty()) + base_addr = GetAddress().GetLoadAddress (target); + } + if (base_addr == LLDB_INVALID_ADDRESS) base_addr = GetAddress().GetFileAddress (); - addr_nibble_size = target->GetArchitecture().GetAddressByteSize() * 2; lldb::addr_t PC = base_addr + EDInstByteSize(m_inst); -- cgit v1.2.3