1 files changed, 102 insertions, 41 deletions

diff --git a/tests/line2addr.c b/tests/line2addr.c
index d2017fba..73c57f49 100644
--- a/tests/line2addr.c
+++ b/tests/line2addr.c
@@ -1,64 +1,125 @@
-#include <fcntl.h>
 #include <inttypes.h>
-#include <libdw.h>
+#include <assert.h>
+#include <libdwfl.h>
+#include <argp.h>
 #include <stdio.h>
+#include <locale.h>
 #include <stdlib.h>
-#include <unistd.h>
+#include <string.h>
+#include <error.h>
 
 
+static void
+print_address (Dwfl_Module *mod, Dwarf_Addr address)
+{
+  int n = dwfl_module_relocations (mod);
+  if (n < 0)
+    error (0, 0, "dwfl_module_relocations: %s", dwfl_errmsg (-1));
+  else if (n > 0)
+    {
+      int i = dwfl_module_relocate_address (mod, &address);
+      if (i < 0)
+	error (0, 0, "dwfl_module_relocate_address: %s", dwfl_errmsg (-1));
+      else
+	{
+	  const char *modname = dwfl_module_info (mod, NULL, NULL, NULL,
+						  NULL, NULL, NULL, NULL);
+	  const char *secname = dwfl_module_relocation_info (mod, i, NULL);
+	  if (n > 1 || secname[0] != '\0')
+	    printf ("%s(%s)+%#" PRIx64, modname, secname, address);
+	  else
+	    printf ("%s(%s)+%#" PRIx64, modname, secname, address);
+	  return;
+	}
+    }
+
+  printf ("%#" PRIx64, address);
+}
+
+
+struct args
+{
+  const char *arg;
+  char *file;
+  int line;
+};
+
+static int
+handle_module (Dwfl_Module *mod __attribute__ ((unused)),
+	       void **udata __attribute__ ((unused)),
+	       const char *modname, Dwarf_Addr base __attribute__ ((unused)),
+	       Dwarf *dbg __attribute__ ((unused)),
+	       Dwarf_Addr bias __attribute__ ((unused)), void *arg)
+{
+  const struct args *const a = arg;
+
+  Dwfl_Line **lines = NULL;
+  size_t nlines = 0;
+
+  if (dwfl_module_getsrc_file (mod, a->file, a->line, 0, &lines, &nlines) == 0)
+    {
+      for (size_t inner = 0; inner < nlines; ++inner)
+	{
+	  Dwarf_Addr addr;
+	  int line = a->line, col = 0;
+	  const char *file = dwfl_lineinfo (lines[inner], &addr, &line, &col,
+					    NULL, NULL);
+	  if (file != NULL)
+	    {
+	      printf ("%s -> ", a->arg);
+	      print_address (mod, addr);
+	      if (modname[0] != '\0')
+		printf (" (%s:", modname);
+	      if (strcmp (file, a->file) || line != a->line || col != 0)
+		printf (" %s%s:%d", modname[0] != '\0' ? "" : "(",
+			file, line);
+	      if (col != 0)
+		printf (":%d");
+	      if (modname[0] != '\0'
+		  || strcmp (file, a->file) || line != a->line || col != 0)
+		puts (")");
+	      else
+		puts ("");
+	    }
+	}
+      free (lines);
+    }
+
+  return DWARF_CB_OK;
+}
+
 int
 main (int argc, char *argv[])
 {
-  for (int cnt = 1; cnt < argc; ++cnt)
+  int cnt;
+
+  /* Set locale.  */
+  (void) setlocale (LC_ALL, "");
+
+  Dwfl *dwfl = NULL;
+  (void) argp_parse (dwfl_standard_argp (), argc, argv, 0, &cnt, &dwfl);
+  assert (dwfl != NULL);
+
+  for (; cnt < argc; ++cnt)
     {
-      char *fname;
-      char *file;
-      int line;
+      struct args a = { .arg = argv[cnt] };
 
-      switch (sscanf (argv[cnt], "%a[^:]:%a[^:]:%d",
-			 &fname, &file, &line))
+      switch (sscanf (a.arg, "%a[^:]:%d", &a.file, &a.line))
 	{
 	default:
 	case 0:
-	case 1:
 	  printf ("ignored %s\n", argv[cnt]);
 	  continue;
-	case 2:
-	  line = 0;
+	case 1:
+	  a.line = 0;
 	  break;
-	case 3:
+	case 2:
 	  break;
 	}
 
-      int fd = open (fname, O_RDONLY);
-      if (fd == -1)
-	continue;
-
-      Dwarf *dbg = dwarf_begin (fd, DWARF_C_READ);
-      if (dbg != NULL)
-	{
-	  Dwarf_Line **lines = NULL;
-	  size_t nlines = 0;
-
-	  if (dwarf_getsrc_file (dbg, file, line, 0, &lines, &nlines) == 0)
-	    {
-	      for (size_t inner = 0; inner < nlines; ++inner)
-		{
-		  Dwarf_Addr addr;
-		  if (dwarf_lineaddr (lines[inner], &addr) == 0)
-		    printf ("%s -> %#" PRIxMAX "\n",
-			    argv[cnt], (uintmax_t) addr);
-		}
-
-	      free (lines);
-	    }
-
-	  dwarf_end (dbg);
-	}
+      (void) dwfl_getdwarf (dwfl, &handle_module, &a, 0);
 
-      close (fd);
-      free (fname);
-      free (file);
+      free (a.file);
     }
 
   return 0;