Read the name out of the file instead of out of the struct.

2006-08-20  Soren Sandmann  <sandmann@redhat.com>

	* elfparser.c (elf_sym_get_name): Read the name out of the file
	instead of out of the struct.

	* elfparser.c (struct ElfSym): Store an offset instead of the
	name.

	* elfparser.c (all_elf_parsers): Keep track of all elf parsers
	created.

ChangeLog

@@ -1,3 +1,14 @@
+2006-08-20  Soren Sandmann  <sandmann@redhat.com>
+
+	* elfparser.c (elf_sym_get_name): Read the name out of the file
+	instead of out of the struct.
+
+	* elfparser.c (struct ElfSym): Store an offset instead of the
+	name. 
+
+	* elfparser.c (all_elf_parsers): Keep track of all elf parsers
+	created.
+	
 2006-08-20  Soren Sandmann  <sandmann@redhat.com>
 
 	* Makefile.am, demangle.c: New file, made out of files from

binparser.c

@@ -324,6 +324,15 @@ bin_parser_index (BinParser *parser,
     parser->frame->index = index;
 }
 
+gsize
+bin_parser_get_offset (BinParser *parser)
+{
+    g_return_val_if_fail (parser != NULL, 0);
+    g_return_val_if_fail (parser->frame != NULL, 0);
+
+    return parser->frame->offset;
+}
+
 BinField *
 bin_field_new_fixed_array (int n_elements,
 		  int element_size)

binparser.h

@@ -8,6 +8,7 @@ BinParser *bin_parser_new (const guchar	*data,
 BinFormat *bin_format_new (gboolean big_endian,
 			   const char *name, BinField *field,
 			   ...);
+gsize bin_parser_get_offset (BinParser *parser);
 gsize bin_format_get_size (BinFormat *format);
 void bin_parser_index (BinParser *parser, int index);
 void bin_parser_begin (BinParser *parser,

demangle.c

@@ -14,6 +14,12 @@
  * in sysprof were made static or removed.
  *
  * Let's hope that no bugs are ever found in this file!
+ *
+ *	Maybe someday look at what can be deleted from this file
+ *
+ *	 - "mini string library" can be replaced with GString
+ *	 - "option" parameter to cplus_demangle can be deleted
+ *	 - demangling is always "auto"
  */
 
 /* Copyright notices:

elfparser.c

@@ -13,7 +13,7 @@ struct SymbolTable
 
 struct ElfSym
 {
-    const char *name;
+    gulong offset;
     gulong address;
 };
 
@@ -38,6 +38,7 @@ struct ElfParser
 
     int		n_symbols;
     ElfSym *	symbols;
+    gsize	sym_strings;
 };
 
 static gboolean parse_elf_signature (const guchar *data, gsize length,
@@ -102,6 +103,8 @@ find_section (ElfParser *parser,
     return NULL;
 }
 
+static GList *all_elf_parsers = NULL;
+
 ElfParser *
 elf_parser_new (const guchar *data, gsize length)
 {
@@ -150,6 +153,8 @@ elf_parser_new (const guchar *data, gsize length)
     
     bin_parser_end (parser->parser);
 
+    all_elf_parsers = g_list_prepend (all_elf_parsers, parser);
+    
     return parser;
 }
 
@@ -158,6 +163,8 @@ elf_parser_free (ElfParser *parser)
 {
     int i;
 
+    all_elf_parsers = g_list_remove (all_elf_parsers, parser);
+    
     for (i = 0; i < parser->n_sections; ++i)
 	section_free (parser->sections[i]);
     g_free (parser->sections);
@@ -218,8 +225,8 @@ read_table (ElfParser *parser,
     parser->n_symbols = sym_table->size / sym_size;
     parser->symbols = g_new (ElfSym, parser->n_symbols);
     
-    g_print ("\nreading %d symbols from %s\n",
+    g_print ("\nreading %d symbols (@%d bytes) from %s\n",
-	     parser->n_symbols, sym_table->name);
+	     parser->n_symbols, sym_size, sym_table->name);
     
     bin_parser_begin (parser->parser, parser->sym_format, sym_table->offset);
 
@@ -229,20 +236,22 @@ read_table (ElfParser *parser,
 	guint info;
 	gulong addr;
 	const char *name;
+	gulong offset;
 	
 	bin_parser_index (parser->parser, i);
 	
 	info = bin_parser_get_uint (parser->parser, "st_info");
 	addr = bin_parser_get_uint (parser->parser, "st_value");
 	name = get_string (parser->parser, str_table->offset, "st_name");
+	offset = bin_parser_get_offset (parser->parser);
 	
 	if (addr != 0				&&
 	    (info & 0xf) == STT_FUNC		&&
 	    ((info >> 4) == STB_GLOBAL ||
 	     (info >> 4) == STB_LOCAL))
 	{
-	    parser->symbols[n_functions].name = name;
 	    parser->symbols[n_functions].address = addr;
+	    parser->symbols[n_functions].offset = offset;
 	    
 	    n_functions++;
 	}
@@ -252,6 +261,7 @@ read_table (ElfParser *parser,
 
     g_print ("found %d functions\n", n_functions);
 
+    parser->sym_strings = str_table->offset;
     parser->n_symbols = n_functions;
     parser->symbols = g_renew (ElfSym, parser->symbols, parser->n_symbols);
     
@@ -331,10 +341,43 @@ elf_parser_lookup_symbol (ElfParser *parser,
     return do_lookup (parser->symbols, address, 0, parser->n_symbols - 1);
 }
 
+static ElfParser *
+parser_from_sym (const ElfSym *sym)
+{
+    GList *list;
+    
+    /* FIXME: This is  gross, but the alternatives I can think of
+     * are all worse.
+     */
+    for (list = all_elf_parsers; list != NULL; list = list->next)
+    {
+	ElfParser *parser = list->data;
+
+	if (sym >= parser->symbols &&
+	    sym < parser->symbols + parser->n_symbols)
+	{
+	    return parser;
+	}
+    }
+
+    return NULL;
+}
+
 const char *
 elf_sym_get_name (const ElfSym *sym)
 {
-    return sym->name;
+    ElfParser *parser = parser_from_sym (sym);
+    const char *result;
+
+    g_return_val_if_fail (parser != NULL, NULL);
+
+    bin_parser_begin (parser->parser, parser->sym_format, sym->offset);
+
+    result = get_string (parser->parser, parser->sym_strings, "st_name");
+    
+    bin_parser_end (parser->parser);
+    
+    return result;
 }
 
 gulong

elfparser.h

@@ -5,6 +5,7 @@ typedef struct ElfParser ElfParser;
 
 ElfParser *elf_parser_new (const guchar *data,
 			   gsize length);
+void       elf_parser_free (ElfParser *parser);
 
 /* Lookup a symbol in the file.
  *

testelf.c

@@ -1,22 +1,31 @@
 #include <glib.h>
 #include "elfparser.h"
 
+const char *n;
+
 static void
 check (ElfParser *elf, gulong addr)
 {
     const ElfSym *sym = elf_parser_lookup_symbol (elf, addr);
+    n = elf_sym_get_name (sym);
     
-    g_print ("%p  =>    ", addr);
+#if 0
+    g_print ("%p  =>    ", (void *)addr);
+#endif
 
     if (sym)
     {
+#if 0
 	g_print ("found: %s (%p)\n",
 		 elf_sym_get_name (sym),
-		 elf_sym_get_address (sym));
+		 (void *)elf_sym_get_address (sym));
+#endif
     }
     else
     {
-	g_print ("not found\n");
+#if 0
+ 	g_print ("not found\n");
+#endif
     }
 }
 
@@ -29,9 +38,13 @@ main ()
 	g_mapped_file_get_contents (libgtk),
 	g_mapped_file_get_length (libgtk));
 
-    check (elf, 0x3e7ef20); /* gtk_handle_box_end_drag */
+    int i;
-    check (elf, 0x3e7ef25); /* same */
 
+    for (i = 0; i < 5000000; ++i)
+    {
+	check (elf, 0x3e7ef20); /* gtk_handle_box_end_drag */
+	check (elf, 0x3e7ef25); /* same (but in the middle of the function */
+    }
     return 0;
 }