Get rid of the second argument ("PtrdiffT debug_offset") to

ML_(read_debuginfo_stabs) since it's always equal to di->text_bias.

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

diff --git a/coregrind/m_debuginfo/priv_readstabs.h b/coregrind/m_debuginfo/priv_readstabs.h
index 3028099f5e006bf7785d9d932ea5326e60be57a0..887247899f7c969a3e9af5dc812f3e9115c273ba 100644 (file)
--- a/coregrind/m_debuginfo/priv_readstabs.h
+++ b/coregrind/m_debuginfo/priv_readstabs.h
@@ -41,7 +41,7 @@
    Stabs reader
    -------------------- */
 extern
-void ML_(read_debuginfo_stabs) ( struct _DebugInfo* di, PtrdiffT debug_offset,
+void ML_(read_debuginfo_stabs) ( struct _DebugInfo* di,
                                  UChar* stabC,   Int stab_sz,
                                  UChar* stabstr, Int stabstr_sz );
 

diff --git a/coregrind/m_debuginfo/readelf.c b/coregrind/m_debuginfo/readelf.c
index 12f4ab9329ad96dc35d04793a34fe5c3124e5fdb..158cd318860d98d9fa62e32c81b1179e64cb0c87 100644 (file)
--- a/coregrind/m_debuginfo/readelf.c
+++ b/coregrind/m_debuginfo/readelf.c
@@ -1896,7 +1896,7 @@ Bool ML_(read_elf_debug_info) ( struct _DebugInfo* di )
          we ignore it. */
 #     if !defined(VGP_amd64_linux)
       if (stab_img && stabstr_img) {
-         ML_(read_debuginfo_stabs) ( di, di->text_bias, stab_img, stab_sz, 
+         ML_(read_debuginfo_stabs) ( di, stab_img, stab_sz, 
                                          stabstr_img, stabstr_sz );
       }
 #     endif

diff --git a/coregrind/m_debuginfo/readstabs.c b/coregrind/m_debuginfo/readstabs.c
index 85a779fe35776f584cc39314fce49c8175d7a882..4ad1956ecff9e349f048a0de883233adc81a3c94 100644 (file)
--- a/coregrind/m_debuginfo/readstabs.c
+++ b/coregrind/m_debuginfo/readstabs.c
@@ -80,7 +80,7 @@ typedef enum { N_UNDEF = 0,   /* undefined symbol, new stringtab  */
 /* Read stabs-format debug info.  This is all rather horrible because
    stabs is a underspecified, kludgy hack.
 */
-void ML_(read_debuginfo_stabs) ( DebugInfo* di,  PtrdiffT debug_offset,
+void ML_(read_debuginfo_stabs) ( DebugInfo* di,
                                  UChar* stabC,   Int stab_sz, 
                                  UChar* stabstr, Int stabstr_sz )
 {
@@ -336,7 +336,7 @@ void ML_(read_debuginfo_stabs) ( DebugInfo* di,  PtrdiffT debug_offset,
                line.first = True;
 
                /* line ends at start of next function */
-               addr = debug_offset + st->n_value;
+               addr = di->text_bias + st->n_value;
 
                func.start = addr;
             }