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

If high_pc uses DW_FORM_addr, it's not size but address

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65101 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2018-10-16 23:52:26 +00:00
parent 08a2464687
commit f60c2d396d
1 changed files with 23 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
addr2line.c
View file

@ -937,14 +937,12 @@ di_read_cu(DebugInfoReader *reader)
reader->q0 = reader->obj->debug_abbrev.ptr + hdr->debug_abbrev_offset; reader->q0 = reader->obj->debug_abbrev.ptr + hdr->debug_abbrev_offset;
reader->address_size = hdr->address_size; reader->address_size = hdr->address_size;
reader->format = 64; reader->format = 64;
if (hdr->version != 4) return -1;
} else { } else {
DW_CompilationUnitHeader32 *hdr = hdr32; DW_CompilationUnitHeader32 *hdr = hdr32;
reader->p += 11; reader->p += 11;
reader->q0 = reader->obj->debug_abbrev.ptr + hdr->debug_abbrev_offset; reader->q0 = reader->obj->debug_abbrev.ptr + hdr->debug_abbrev_offset;
reader->address_size = hdr->address_size; reader->address_size = hdr->address_size;
reader->format = 32; reader->format = 32;
if (hdr->version != 4) return -1;
} }
reader->level = 0; reader->level = 0;
di_read_debug_abbrev_cu(reader); di_read_debug_abbrev_cu(reader);
@ -1318,24 +1316,27 @@ typedef struct {
} ranges_t; } ranges_t;
static void static void
ranges_set_low_pc(ranges_t *ptr, uint64_t low_pc) ranges_set(ranges_t *ptr, DebugInfoValue *v)
{ {
ptr->low_pc = low_pc; switch (v->at) {
case DW_AT_low_pc:
ptr->low_pc = v->as.uint64;
ptr->low_pc_set = true; ptr->low_pc_set = true;
break;
case DW_AT_high_pc:
if (v->form == DW_FORM_addr) {
ptr->high_pc = v->as.uint64;
}
else {
ptr->high_pc = ptr->low_pc + v->as.uint64;
} }
static void
ranges_set_high_pc(ranges_t *ptr, uint64_t high_pc)
{
ptr->high_pc = high_pc;
ptr->high_pc_set = true; ptr->high_pc_set = true;
} break;
case DW_AT_ranges:
static void ptr->ranges = v->as.uint64;
ranges_set_ranges(ranges_t *ptr, uint64_t ranges)
{
ptr->ranges = ranges;
ptr->ranges_set = true; ptr->ranges_set = true;
break;
}
} }
static uintptr_t static uintptr_t
@ -1345,7 +1346,7 @@ ranges_include(DebugInfoReader *reader, ranges_t *ptr, uint64_t addr)
if (ptr->ranges_set || !ptr->low_pc_set) { if (ptr->ranges_set || !ptr->low_pc_set) {
exit(1); exit(1);
} }
if (ptr->low_pc <= addr && addr <= ptr->low_pc + ptr->high_pc) { if (ptr->low_pc <= addr && addr <= ptr->high_pc) {
return ptr->low_pc; return ptr->low_pc;
} }
} }
@ -1463,10 +1464,9 @@ debug_info_read(DebugInfoReader *reader, int num_traces, void **traces,
line.line = (int)v.as.uint64; line.line = (int)v.as.uint64;
break; break;
case DW_AT_low_pc: case DW_AT_low_pc:
ranges_set_low_pc(&ranges, v.as.uint64);
break;
case DW_AT_high_pc: case DW_AT_high_pc:
ranges_set_high_pc(&ranges, v.as.uint64); case DW_AT_ranges:
ranges_set(&ranges, &v);
break; break;
case DW_AT_declaration: case DW_AT_declaration:
goto skip_die; goto skip_die;
@ -1476,9 +1476,6 @@ debug_info_read(DebugInfoReader *reader, int num_traces, void **traces,
case DW_AT_abstract_origin: case DW_AT_abstract_origin:
read_abstract_origin(reader, v.as.uint64, &line); read_abstract_origin(reader, v.as.uint64, &line);
break; //goto skip_die; break; //goto skip_die;
case DW_AT_ranges:
ranges_set_ranges(&ranges, v.as.uint64);
break;
} }
} }
/* ranges_inspect(reader, &ranges); */ /* ranges_inspect(reader, &ranges); */