In struct _SegInfo, rename field 'offset' to 'text_bias'.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@6507

diff --git a/coregrind/m_debuginfo/debuginfo.c b/coregrind/m_debuginfo/debuginfo.c
index 153bc23723549348cea83a18b2e5ffdbc3712f81..829e199c918560490ee3724459e1b846f1b5543e 100644 (file)
--- a/coregrind/m_debuginfo/debuginfo.c
+++ b/coregrind/m_debuginfo/debuginfo.c
@@ -1104,7 +1104,7 @@ const UChar* VG_(seginfo_filename)(const SegInfo* si)
 
 ULong VG_(seginfo_sym_offset)(const SegInfo* si)
 {
-   return si->offset;
+   return si->text_bias;
 }
 
 VgSectKind VG_(seginfo_sect_kind)(Addr a)

diff --git a/coregrind/m_debuginfo/priv_storage.h b/coregrind/m_debuginfo/priv_storage.h
index fed610e5f059596427dc60823f688c95bd1722f4..7ee4ce25d4e3cef4b9b35621d06ba02c2f53e5b8 100644 (file)
--- a/coregrind/m_debuginfo/priv_storage.h
+++ b/coregrind/m_debuginfo/priv_storage.h
@@ -146,7 +146,7 @@ struct _SegInfo {
    UInt   size;
    UChar* filename; /* in mallocville */
    UChar* memname;  /* malloc'd.  AIX5 only: .a member name */
-   OffT   foffset;
+   OffT   foffset;  /* file offset for mapped text section - UNUSED */
    UChar* soname;
 
    /* An expandable array of symbols. */
@@ -174,11 +174,12 @@ struct _SegInfo {
       UChar  strtab[SEGINFO_STRCHUNKSIZE];
    } *strchunks;
 
-   /* 'offset' is what needs to be added to an address in the address
-      space of the library as stored on disk (which is not 0-based for
-      executables or prelinked libraries) to get an address in memory
-      for the object loaded at 'start' */
-   OffT   offset;
+   /* 'text_bias' is what needs to be added to an address in the
+      address space of the library as stored on disk [a so-called
+      stated VMA] (which is not 0-based for executables or prelinked
+      libraries) to get an address in memory for the object loaded at
+      'text_start_avma'.  At least for text symbols. */
+   OffT   text_bias;
 
    /* Bounds of data, BSS, PLT, GOT and OPD (for ppc64-linux) so that
       tools can see what section an address is in.  In the running

diff --git a/coregrind/m_debuginfo/readelf.c b/coregrind/m_debuginfo/readelf.c
index 5529e410a296cd00f6e7c727ceed46ceb62b89cc..bf66362a88fe5799adaa1d5ee3e3f54e4f50ed84 100644 (file)
--- a/coregrind/m_debuginfo/readelf.c
+++ b/coregrind/m_debuginfo/readelf.c
@@ -979,7 +979,7 @@ Bool ML_(read_elf_debug_info) ( struct _SegInfo* si )
       }
    }
 
-   si->offset = offset_oimage;
+   si->text_bias = offset_oimage;
 
    /* If, after looking at all the program headers, we still didn't 
       find a soname, add a fake one. */