Attachment #209182 for bug #274771

View | Details | Raw Unified | Return to bug 274771
Collapse All | Expand All




   Char *objdirptr;
   Char *debugpath;
   Addr addr = 0;
   UInt si;
  
   if ((objdirptr = VG_(strrchr)(objdir, '/')) != NULL)
      *objdirptr = '\0';

   debugpath = ML_(dinfo_zalloc)(
                  "di.fdf.2",
                  VG_(strlen)(objdir) + VG_(strlen)(debugname) + 32);
   
   VG_(sprintf)(debugpath, "%s/%s", objdir, debugname);
   TRACE_SYMTAB("    trying debugpath %s\n",  debugpath);

   if ((addr = open_debug_file(debugpath, crc, size)) == 0) {
      VG_(sprintf)(debugpath, "%s/.debug/%s", objdir, debugname);
      TRACE_SYMTAB("    trying debugpath %s\n",  debugpath);
      if ((addr = open_debug_file(debugpath, crc, size)) == 0) {
         VG_(sprintf)(debugpath, "/usr/lib/debug%s/%s", objdir, debugname);
         TRACE_SYMTAB("    trying debugpath %s\n",  debugpath);
         if ((addr = open_debug_file(debugpath, crc, size)) == 0) {
            si = sizeof(void*)*8;
            VG_(sprintf)(debugpath, "/usr/lib/debug%s%u/%s", objdir, si, debugname);
            TRACE_SYMTAB("    trying debugpath %s\n",  debugpath);
            addr = open_debug_file(debugpath, crc, size);
         }
      }
   }


      TRACE_SYMTAB("\n");
      TRACE_SYMTAB("------ Found a debuginfo file: %s\n", debugpath);
   }
   else
   {
      TRACE_SYMTAB("------ No debuginfo file found\n");
   }

   ML_(dinfo_free)(debugpath);
   ML_(dinfo_free)(objdir);

Return to bug 274771

Lines 979-999 Link Here

(-)coregrind/m_debuginfo/readelf.c (-2 / +14 lines)
979	Char *objdirptr;	979	Char *objdirptr;
980	Char *debugpath;	980	Char *debugpath;
981	Addr addr = 0;	981	Addr addr = 0;
		982	UInt si;
982		983
983	if ((objdirptr = VG_(strrchr)(objdir, '/')) != NULL)	984	if ((objdirptr = VG_(strrchr)(objdir, '/')) != NULL)
984	*objdirptr = '\0';	985	*objdirptr = '\0';
985
986	debugpath = ML_(dinfo_zalloc)(	986	debugpath = ML_(dinfo_zalloc)(
987	"di.fdf.2",	987	"di.fdf.2",
988	VG_(strlen)(objdir) + VG_(strlen)(debugname) + 32);	988	VG_(strlen)(objdir) + VG_(strlen)(debugname) + 32);
989		989
990	VG_(sprintf)(debugpath, "%s/%s", objdir, debugname);	990	VG_(sprintf)(debugpath, "%s/%s", objdir, debugname);
		991	TRACE_SYMTAB(" trying debugpath %s\n", debugpath);
991		992
992	if ((addr = open_debug_file(debugpath, crc, size)) == 0) {	993	if ((addr = open_debug_file(debugpath, crc, size)) == 0) {
993	VG_(sprintf)(debugpath, "%s/.debug/%s", objdir, debugname);	994	VG_(sprintf)(debugpath, "%s/.debug/%s", objdir, debugname);
		995	TRACE_SYMTAB(" trying debugpath %s\n", debugpath);
994	if ((addr = open_debug_file(debugpath, crc, size)) == 0) {	996	if ((addr = open_debug_file(debugpath, crc, size)) == 0) {
995	VG_(sprintf)(debugpath, "/usr/lib/debug%s/%s", objdir, debugname);	997	VG_(sprintf)(debugpath, "/usr/lib/debug%s/%s", objdir, debugname);
996	addr = open_debug_file(debugpath, crc, size);	998	TRACE_SYMTAB(" trying debugpath %s\n", debugpath);
		999	if ((addr = open_debug_file(debugpath, crc, size)) == 0) {
		1000	si = sizeof(void)8;
		1001	VG_(sprintf)(debugpath, "/usr/lib/debug%s%u/%s", objdir, si, debugname);
		1002	TRACE_SYMTAB(" trying debugpath %s\n", debugpath);
		1003	addr = open_debug_file(debugpath, crc, size);
		1004	}
997	}	1005	}
998	}	1006	}
999		1007
Lines 1001-1006 Link Here
1001	TRACE_SYMTAB("\n");	1009	TRACE_SYMTAB("\n");
1002	TRACE_SYMTAB("------ Found a debuginfo file: %s\n", debugpath);	1010	TRACE_SYMTAB("------ Found a debuginfo file: %s\n", debugpath);
1003	}	1011	}
		1012	else
		1013	{
		1014	TRACE_SYMTAB("------ No debuginfo file found\n");
		1015	}
1004		1016
1005	ML_(dinfo_free)(debugpath);	1017	ML_(dinfo_free)(debugpath);
1006	ML_(dinfo_free)(objdir);	1018	ML_(dinfo_free)(objdir);