mirror/pstrace
4
0
Fork 0
Code Activity

small refactoring and bug-fixing

Browse Source
This commit is contained in:
nnosov
2020-02-04 19:55:51 +04:00
parent 813fe52bf1
commit 0d06b02747
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/allocator.h
+5 -1
View File
@@ -16,10 +16,14 @@
#define CAT(a, ...) CAT2(a, __VA_ARGS__) #define CAT(a, ...) CAT2(a, __VA_ARGS__)
#define CAT2(a, ...) a ## __VA_ARGS__ #define CAT2(a, ...) a ## __VA_ARGS__
// declaration with initialization // declaration with initialization and parameters of initialization
#define pst_decl(TYPE, NAME, ...) \ #define pst_decl(TYPE, NAME, ...) \
TYPE NAME; CAT2(TYPE, _init) (&NAME, __VA_ARGS__); TYPE NAME; CAT2(TYPE, _init) (&NAME, __VA_ARGS__);
// declaration with initialization
#define pst_decl0(TYPE, NAME) \
TYPE NAME; CAT2(TYPE, _init) (&NAME);
// allocation with initialization // allocation with initialization
#define pst_new(TYPE, NAME, ...) \ #define pst_new(TYPE, NAME, ...) \
TYPE* NAME; NAME = CAT2(TYPE, _new) (__VA_ARGS__); TYPE* NAME; NAME = CAT2(TYPE, _new) (__VA_ARGS__);
framework/dwarf_call_site.cpp
+18 -9
View File
@@ -90,7 +90,7 @@ pst_call_site_param* pst_call_site_find(pst_call_site* site, pst_dwarf_expr* exp
return NULL; return NULL;
} }
bool handle_dwarf(pst_call_site* site, Dwarf_Die* child) bool call_site_handle_dwarf(pst_call_site* site, Dwarf_Die* child)
{ {
Dwarf_Attribute attr_mem; Dwarf_Attribute attr_mem;
Dwarf_Attribute* attr; Dwarf_Attribute* attr;
@@ -112,20 +112,22 @@ bool handle_dwarf(pst_call_site* site, Dwarf_Die* child)
del_param(site, param); del_param(site, param);
return false; return false;
} }
pst_log(SEVERITY_DEBUG, " DW_AT_location: %s", site->ctx->buff);
} }
// expression represents call parameter's value // expression represents call parameter's value
if(dwarf_hasattr(child, DW_AT_GNU_call_site_value)) { if(dwarf_hasattr(child, DW_AT_GNU_call_site_value)) {
// handle value expression here // handle value expression here
attr = dwarf_attr(child, DW_AT_GNU_call_site_value, &attr_mem); attr = dwarf_attr(child, DW_AT_GNU_call_site_value, &attr_mem);
pst_dwarf_expr loc; pst_decl0(pst_dwarf_expr, loc);
pst_dwarf_expr_init(&loc);
if(handle_location(site->ctx, attr, &loc, pc, NULL)) { if(handle_location(site->ctx, attr, &loc, pc, NULL)) {
param->value = loc.value; param->value = loc.value;
pst_log(SEVERITY_DEBUG, "\tDW_AT_GNU_call_site_value:\"%s\" ==> 0x%lX", site->ctx->buff, param->value); pst_dwarf_expr_fini(&loc);
pst_log(SEVERITY_DEBUG, " DW_AT_GNU_call_site_value:\"%s\" ==> 0x%lX", site->ctx->buff, param->value);
} else { } else {
pst_log(SEVERITY_ERROR, "Failed to calculate DW_AT_location expression: %s", site->ctx->buff); pst_log(SEVERITY_ERROR, "Failed to calculate DW_AT_location expression: %s", site->ctx->buff);
del_param(site, param); del_param(site, param);
pst_dwarf_expr_fini(&loc);
return false; return false;
} }
} }
@@ -204,7 +206,7 @@ bool pst_call_site_storage_handle_dwarf(pst_call_site_storage* storage, Dwarf_Di
const char* oname = NULL; const char* oname = NULL;
if(dwarf_hasattr (result, DW_AT_abstract_origin) && dwarf_formref_die (dwarf_attr (result, DW_AT_abstract_origin, &attr_mem), &origin) != NULL) { if(dwarf_hasattr (result, DW_AT_abstract_origin) && dwarf_formref_die (dwarf_attr (result, DW_AT_abstract_origin, &attr_mem), &origin) != NULL) {
oname = dwarf_diename(&origin); oname = dwarf_diename(&origin);
pst_log(SEVERITY_DEBUG, "\tDW_AT_abstract_origin: '%s'", oname); pst_log(SEVERITY_DEBUG, "DW_AT_abstract_origin: '%s'", oname);
} }
// The call site may have a DW_AT_call_site_target attribute which is a DWARF expression. For indirect calls or jumps where it is unknown at // The call site may have a DW_AT_call_site_target attribute which is a DWARF expression. For indirect calls or jumps where it is unknown at
@@ -213,16 +215,23 @@ bool pst_call_site_storage_handle_dwarf(pst_call_site_storage* storage, Dwarf_Di
if(dwarf_hasattr (result, DW_AT_GNU_call_site_target)) { if(dwarf_hasattr (result, DW_AT_GNU_call_site_target)) {
attr = dwarf_attr(result, DW_AT_GNU_call_site_target, &attr_mem); attr = dwarf_attr(result, DW_AT_GNU_call_site_target, &attr_mem);
if(attr) { if(attr) {
pst_dwarf_expr expr; pst_decl0(pst_dwarf_expr, expr);
pst_dwarf_expr_init(&expr);
if(handle_location(storage->ctx, &attr_mem, &expr, info->pc, info)) { if(handle_location(storage->ctx, &attr_mem, &expr, info->pc, info)) {
target = expr.value; target = expr.value;
pst_log(SEVERITY_DEBUG, "\tDW_AT_GNU_call_site_target: %#lX", target); pst_log(SEVERITY_DEBUG, "DW_AT_GNU_call_site_target: %#lX", target);
} }
pst_dwarf_expr_fini(&expr); pst_dwarf_expr_fini(&expr);
} }
} }
// if attribute is specified, then it's value is actually PC in caller's frame (address of invocation of callee)
if(dwarf_hasattr (result, DW_AT_low_pc) && dwarf_attr(result, DW_AT_low_pc, &attr_mem)) {
Dwarf_Addr low_pc;
if(!dwarf_formaddr(&attr_mem, &low_pc)) {
pst_log(SEVERITY_DEBUG, "DW_AT_low_pc: %#lX", low_pc);
}
}
if(target == 0 && oname == NULL) { if(target == 0 && oname == NULL) {
pst_log(SEVERITY_ERROR, "Cannot determine both call-site target and origin"); pst_log(SEVERITY_ERROR, "Cannot determine both call-site target and origin");
return false; return false;
@@ -231,7 +240,7 @@ bool pst_call_site_storage_handle_dwarf(pst_call_site_storage* storage, Dwarf_Di
Dwarf_Die child; Dwarf_Die child;
if(dwarf_child (result, &child) == 0) { if(dwarf_child (result, &child) == 0) {
pst_call_site* st = pst_call_site_storage_add(storage, target, oname); pst_call_site* st = pst_call_site_storage_add(storage, target, oname);
if(!handle_dwarf(st, &child)) { if(!call_site_handle_dwarf(st, &child)) {
pst_call_site_storage_del(storage, st); pst_call_site_storage_del(storage, st);
return false; return false;
} }