[Lldb-commits] [lldb] r127205 - in /lldb/trunk: include/lldb/Symbol/ObjectFile.h source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp source/Plugins/ObjectFile/ELF/ObjectFileELF.h

[Jim Ingham]

Author: jingham
Date: Mon Mar  7 19:54:01 2011
New Revision: 127205

URL: http://llvm.org/viewvc/llvm-project?rev=127205&view=rev
Log:
I didn't notice there was already an ObjectFile::GetEntryPoint.  Move that over to GetEntryPointAddress 'cause that's more consistent with other functions in ObjectFile, do the mutatis mutandi and also in the ELF case I return a section offset address rather than a bare load address.

Modified:
    lldb/trunk/include/lldb/Symbol/ObjectFile.h
    lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
    lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.h

Modified: lldb/trunk/include/lldb/Symbol/ObjectFile.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/ObjectFile.h?rev=127205&r1=127204&r2=127205&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/ObjectFile.h (original)
+++ lldb/trunk/include/lldb/Symbol/ObjectFile.h Mon Mar  7 19:54:01 2011
@@ -176,17 +176,6 @@
     IsExecutable () const = 0;
 
     //------------------------------------------------------------------
-    /// Returns the virtual address of the entry point for this object 
-    /// file.
-    ///
-    /// @return
-    ///     The virtual address of the entry point or an invalid address
-    ///     if an entry point is not defined.
-    //------------------------------------------------------------------
-    virtual lldb_private::Address
-    GetEntryPoint () const { return Address(); }
-    
-    //------------------------------------------------------------------
     /// Returns the offset into a file at which this object resides.
     ///
     /// Some files contain many object files, and this function allows

Modified: lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp?rev=127205&r1=127204&r2=127205&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp (original)
+++ lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp Mon Mar  7 19:54:01 2011
@@ -158,15 +158,6 @@
     return m_header.e_entry != 0;
 }
 
-Address
-ObjectFileELF::GetEntryPoint() const
-{
-    if (m_header.e_entry)
-        return Address(NULL, m_header.e_entry);
-    else
-        return Address();
-}
-
 ByteOrder
 ObjectFileELF::GetByteOrder() const
 {

Modified: lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.h?rev=127205&r1=127204&r2=127205&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.h (original)
+++ lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.h Mon Mar  7 19:54:01 2011
@@ -89,9 +89,6 @@
     virtual bool
     IsExecutable () const;
 
-    virtual lldb_private::Address
-    GetEntryPoint() const;
-
     virtual size_t
     GetAddressByteSize() const;