kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Use symtab if there's no .dSYM file

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65537 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2018-11-04 15:14:42 +00:00
parent ef94a94d7d
commit e6d63ac606
1 changed files with 38 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
addr2line.c
View file

@ -8,12 +8,6 @@
**********************************************************************/ **********************************************************************/
#if defined(__clang__)
#pragma clang diagnostic ignored "-Wpedantic"
#elif defined(__GNUC__)
#pragma GCC diagnostic ignored "-Wpedantic"
#endif
#include "ruby/config.h" #include "ruby/config.h"
#include "ruby/defines.h" #include "ruby/defines.h"
#include "ruby/missing.h" #include "ruby/missing.h"
@ -66,6 +60,8 @@ void *alloca();
#ifdef HAVE_MACH_O_LOADER_H #ifdef HAVE_MACH_O_LOADER_H
# include <mach-o/loader.h> # include <mach-o/loader.h>
# include <mach-o/nlist.h>
# include <mach-o/stab.h>
#endif #endif
#ifdef USE_ELF #ifdef USE_ELF
@ -1834,6 +1830,7 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
size_t basesize = size - (base - binary_filename); size_t basesize = size - (base - binary_filename);
s += size; s += size;
max -= size; max -= size;
p = s;
size = strlcpy(s, ".dSYM/Contents/Resources/DWARF/", max); size = strlcpy(s, ".dSYM/Contents/Resources/DWARF/", max);
if (size == 0) goto fail; if (size == 0) goto fail;
s += size; s += size;
@ -1841,12 +1838,17 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
if (max <= basesize) goto fail; if (max <= basesize) goto fail;
memcpy(s, base, basesize); memcpy(s, base, basesize);
s[basesize] = 0; s[basesize] = 0;
fd = open(binary_filename, O_RDONLY);
if (fd < 0) {
*p = 0; /* binary_filename becomes original file name */
fd = open(binary_filename, O_RDONLY);
if (fd < 0) {
goto fail;
}
}
} }
fd = open(binary_filename, O_RDONLY);
if (fd < 0) {
goto fail;
}
filesize = lseek(fd, 0, SEEK_END); filesize = lseek(fd, 0, SEEK_END);
if (filesize < 0) { if (filesize < 0) {
int e = errno; int e = errno;
@ -1924,23 +1926,38 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
} }
break; break;
#if 0
case LC_SYMTAB: case LC_SYMTAB:
{ {
struct symtab_command *c = (struct symtab_command *)lcmd; struct symtab_command *cmd = (struct symtab_command *)lcmd;
struct nlist_64 *nl = (struct nlist *)(file + c->symoff); struct nlist_64 *nl = (struct nlist_64 *)(file + cmd->symoff);
char *strtab = file + c->stroff; char *strtab = file + cmd->stroff, *sname;
uint32_t j; uint32_t j;
kprintf("[%2d]: %x/symtab %lx\n", i, c->cmd, p); uintptr_t saddr;
for (j = 0; j < c->nsyms; j++) { /* kprintf("[%2d]: %x/symtab %p\n", i, cmd->cmd, p); */
for (j = 0; j < cmd->nsyms; j++) {
uintptr_t symsize, d;
struct nlist_64 *e = &nl[j]; struct nlist_64 *e = &nl[j];
if (!(e->n_type & N_STAB)) continue; if (e->n_type != N_FUN) continue;
/* if (e->n_type != N_FUN) continue; */ if (e->n_sect) {
kprintf("[%2d][%4d]: %02x/%x/%x: %s %lx\n", i, j, saddr = (uintptr_t)e->n_value + obj->base_addr - obj->vmaddr;
e->n_type,e->n_sect,e->n_desc,strtab+e->n_un.n_strx,e->n_value); sname = strtab + e->n_un.n_strx;
continue;
}
/* kprintf("[%2d][%4d]: %02x/%x/%x: %s %llx\n", i, j, e->n_type,e->n_sect,e->n_desc,strtab+e->n_un.n_strx,e->n_value); */
for (int k = offset; k < num_traces; k++) {
d = (uintptr_t)traces[k] - saddr;
symsize = e->n_value;
/* kprintf("%lx %lx %lx\n",saddr,symsize,traces[k]); */
if (lines[k].line > 0 || d > (uintptr_t)symsize)
continue;
/* fill symbol name and addr from .symtab */
if (!lines[k].sname) lines[k].sname = sname;
lines[k].saddr = saddr;
lines[k].path = obj->path;
lines[k].base_addr = obj->base_addr;
}
} }
} }
#endif
} }
p += lcmd->cmdsize; p += lcmd->cmdsize;
} }