luo980/cpptrace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix symbol lookup bug for subprogram cache

Browse Source
This commit is contained in:
Jeremy 2023-09-17 19:42:03 -04:00
parent eb86ae2131
commit 734c84400c
No known key found for this signature in database
GPG Key ID: 19AA8270105E8EB4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/symbols/symbols_with_libdwarf.cpp
View File

@ -769,11 +769,13 @@ namespace libdwarf {
std::sort(vec.begin(), vec.end(), [] (const subprogram_entry& a, const subprogram_entry& b) { std::sort(vec.begin(), vec.end(), [] (const subprogram_entry& a, const subprogram_entry& b) {
return a.low < b.low; return a.low < b.low;
}); });
//for(const auto& entry : vec) {
// fprintf(stderr, "vec -> %llx %llx %s\n", entry.low, entry.high, entry.die.get_name().c_str());
//}
subprograms_cache.emplace(off, std::move(vec)); subprograms_cache.emplace(off, std::move(vec));
it = subprograms_cache.find(off); it = subprograms_cache.find(off);
} }
auto& vec = it->second; auto& vec = it->second;
//fprintf(stderr, "%llu\n", vec.size());
auto vec_it = std::lower_bound( auto vec_it = std::lower_bound(
vec.begin(), vec.begin(),
vec.end(), vec.end(),
@ -783,14 +785,13 @@ namespace libdwarf {
return entry.low < pc; return entry.low < pc;
} }
); );
//fprintf(stderr, "retrieve_symbol %llx\n", pc);
// vec_it is first >= pc // vec_it is first >= pc
// we want first <= pc // we want first <= pc
if(vec_it == vec.end()) {
return;
}
if(vec_it != vec.begin()) { if(vec_it != vec.begin()) {
vec_it--; vec_it--;
} }
//vec_it->die.print();
if(vec_it->die.pc_in_die(dwversion, pc)) { if(vec_it->die.pc_in_die(dwversion, pc)) {
retrieve_symbol_for_subprogram(vec_it->die, pc, dwversion, frame); retrieve_symbol_for_subprogram(vec_it->die, pc, dwversion, frame);
} }