[Lldb-commits] [lldb] r131236 - /lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp

[Johnny Chen]

Author: johnny
Date: Thu May 12 13:48:11 2011
New Revision: 131236

URL: http://llvm.org/viewvc/llvm-project?rev=131236&view=rev
Log:
Construction of the RegisterReaderArg instance should happen after we have a valid base_addr, not before.

Modified:
    lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp

Modified: lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp?rev=131236&r1=131235&r2=131236&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp (original)
+++ lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp Thu May 12 13:48:11 2011
@@ -168,13 +168,13 @@
     {
         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.