Modified ObjectFile::SetLoadAddress() to now be:

ObjectFile::SetLoadAddress (Target &target,
                            lldb::addr_t value,
                            bool value_is_offset);

Now "value" is a slide if "value_is_offset" is true, and "value" is an image base address otherwise. All previous usage of this API was using slides.

Updated the ObjectFileELF and ObjectFileMachO SetLoadAddress methods to do the right thing.

Also updated the ObjectFileMachO::SetLoadAddress() function to not load __LINKEDIT when it isn't needed and to only load sections that belong to the executable object file.

llvm-svn: 201003

2 files changed, 4 insertions, 3 deletions

diff --git a/lldb/source/Core/DynamicLoader.cpp b/lldb/source/Core/DynamicLoader.cpp
index 0f53da8b97f..1f545b727a1 100644
--- a/lldb/source/Core/DynamicLoader.cpp
+++ b/lldb/source/Core/DynamicLoader.cpp
@@ -128,7 +128,8 @@ void
 DynamicLoader::UpdateLoadedSectionsCommon(ModuleSP module, addr_t base_addr)
 {
     bool changed;
-    module->SetLoadAddress(m_process->GetTarget(), base_addr, changed);
+    const bool base_addr_is_offset = true;
+    module->SetLoadAddress(m_process->GetTarget(), base_addr, base_addr_is_offset, changed);
 }
 
 void
diff --git a/lldb/source/Core/Module.cpp b/lldb/source/Core/Module.cpp
index ab4bcbbb0d0..d5758c09b1e 100644
--- a/lldb/source/Core/Module.cpp
+++ b/lldb/source/Core/Module.cpp
@@ -1500,12 +1500,12 @@ Module::SetArchitecture (const ArchSpec &new_arch)
 }
 
 bool 
-Module::SetLoadAddress (Target &target, lldb::addr_t offset, bool &changed)
+Module::SetLoadAddress (Target &target, lldb::addr_t value, bool value_is_offset, bool &changed)
 {
     ObjectFile *object_file = GetObjectFile();
     if (object_file)
     {
-        changed = object_file->SetLoadAddress(target, offset);
+        changed = object_file->SetLoadAddress(target, value, value_is_offset);
         return true;
     }
     else