mirror/pstrace
4
0
Fork 0
Code Activity

better debug messaging

Browse Source
This commit is contained in:
nnosov
2020-01-16 15:30:05 +04:00
parent 1cddd773bc
commit ab58889d93
3 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/common.cpp
+3 -3
View File
@@ -124,7 +124,7 @@ uint32_t __pst_context::print_expr_block (Dwarf_Op *exprs, int len, char* buff,
unw_get_reg(&cursor, regno, &ptr); unw_get_reg(&cursor, regno, &ptr);
//ptr += off; //ptr += off;
offset += snprintf(buff + offset, buff_size - offset, "%s(*%s%s%d) reg_value: 0x%lX ", map->op_name, unw_regname(regno), off >=0 ? "+" : "", off, ptr); offset += snprintf(buff + offset, buff_size - offset, "%s(*%s%s%d) reg_value: 0x%lX", map->op_name, unw_regname(regno), off >=0 ? "+" : "", off, ptr);
} else if(map->op_num >= DW_OP_reg0 && map->op_num <= DW_OP_reg16) { } else if(map->op_num >= DW_OP_reg0 && map->op_num <= DW_OP_reg16) {
unw_word_t value = 0; unw_word_t value = 0;
int regno = map->op_num - DW_OP_reg0; int regno = map->op_num - DW_OP_reg0;
@@ -168,10 +168,10 @@ uint32_t __pst_context::print_expr_block (Dwarf_Op *exprs, int len, char* buff,
} else if(map->op_num == DW_OP_addr) { } else if(map->op_num == DW_OP_addr) {
offset += snprintf(buff + offset, buff_size - offset, "%s value = %p", map->op_name, (void*)exprs[i].number); offset += snprintf(buff + offset, buff_size - offset, "%s value = %p", map->op_name, (void*)exprs[i].number);
} else { } else {
offset += snprintf(buff + offset, buff_size - offset, "%s(0x%lX, 0x%lx) ", map->op_name, exprs[i].number, exprs[i].number2); offset += snprintf(buff + offset, buff_size - offset, "%s(0x%lX, 0x%lx)", map->op_name, exprs[i].number, exprs[i].number2);
} }
} else { } else {
offset += snprintf(buff + offset, buff_size - offset, "0x%hhX(0x%lX, 0x%lx) ", exprs[i].atom, exprs[i].number, exprs[i].number2); offset += snprintf(buff + offset, buff_size - offset, "0x%hhX(0x%lX, 0x%lx)", exprs[i].atom, exprs[i].number, exprs[i].number2);
} }
} }
framework/dwarf_operations.cpp
+1 -1
View File
@@ -1098,7 +1098,7 @@ bool __dwarf_stack::calc_expression(Dwarf_Op *exprs, int expr_len, Dwarf_Attribu
v->replace(&value, sizeof(value), DWARF_TYPE_GENERIC); v->replace(&value, sizeof(value), DWARF_TYPE_GENERIC);
} }
// handle there because it contains sub-expression of Location // handle there because it contains sub-expression of a Location in callers frame
if(map->op_num == DW_OP_GNU_entry_value) { if(map->op_num == DW_OP_GNU_entry_value) {
// This opcode has two operands, the first one is uleb128 length and the second is block of that length, containing either a // This opcode has two operands, the first one is uleb128 length and the second is block of that length, containing either a
// simple register or DWARF expression // simple register or DWARF expression
framework/sysutils.cpp
+22 -29
View File
@@ -55,7 +55,6 @@ bool handle_location(pst_context* ctx, Dwarf_Attribute* attr, dwarf_stack& stack
{ {
str[0] = 0; str[0] = 0;
Dwarf_Addr offset = pc - ctx->base_addr; Dwarf_Addr offset = pc - ctx->base_addr;
uint64_t value;
if(dwarf_hasform(attr, DW_FORM_exprloc)) { if(dwarf_hasform(attr, DW_FORM_exprloc)) {
// Location expression (exprloc form of location in DWARF terms) // Location expression (exprloc form of location in DWARF terms)
@@ -64,14 +63,7 @@ bool handle_location(pst_context* ctx, Dwarf_Attribute* attr, dwarf_stack& stack
if(dwarf_getlocation(attr, &expr, &exprlen) == 0) { if(dwarf_getlocation(attr, &expr, &exprlen) == 0) {
ctx->print_expr_block (expr, exprlen, str, strsize, attr); ctx->print_expr_block (expr, exprlen, str, strsize, attr);
if(stack.calc_expression(expr, exprlen, attr)) { if(stack.calc_expression(expr, exprlen, attr)) {
if(stack.get_value(value)) {
ctx->log(SEVERITY_DEBUG, "DW_AT_location expression: \"%s\" ==> 0x%lX", str, value);
} else {
ctx->log(SEVERITY_ERROR, "Failed to get value of calculated DW_AT_location expression: %s", str);
}
return true; return true;
} else {
ctx->log(SEVERITY_ERROR, "Failed to calculate DW_AT_location expression: %s", str);
} }
} }
} else if(dwarf_hasform(attr, DW_FORM_sec_offset)) { } else if(dwarf_hasform(attr, DW_FORM_sec_offset)) {
@@ -87,19 +79,8 @@ bool handle_location(pst_context* ctx, Dwarf_Attribute* attr, dwarf_stack& stack
if(offset >= start && offset <= end) { if(offset >= start && offset <= end) {
// actual location, try to calculate Location expression and retrieve value of parameter // actual location, try to calculate Location expression and retrieve value of parameter
if(stack.calc_expression(expr, exprlen, attr)) { if(stack.calc_expression(expr, exprlen, attr)) {
if(stack.get_value(value)) {
ctx->log(SEVERITY_DEBUG, "Location list expression: [%d] (low_offset: 0x%" PRIx64 ", high_offset: 0x%" PRIx64"), \"%s\" ==> 0x%lX", i, start, end, str, value);
} else {
ctx->log(SEVERITY_DEBUG, "Failed to get value of calculated Location list expression: [%d] (low_offset: 0x%" PRIx64 ", high_offset: 0x%" PRIx64 "), \"%s\"",
i, start, end, str);
}
return true; return true;
} else {
ctx->log(SEVERITY_DEBUG, "Failed to calculate Location list expression: [%d] (low_offset: 0x%" PRIx64 ", high_offset: 0x%" PRIx64 "), \"%s\"",
i, start, end, str);
} }
} else { } else {
// Location skipped due to don't match current PC offset // Location skipped due to don't match current PC offset
ctx->log(SEVERITY_DEBUG, "Skip Location list expression: [%d] (low_offset: 0x%" PRIx64 ", high_offset: 0x%" PRIx64 "), \"%s\"", i, start, end, str); ctx->log(SEVERITY_DEBUG, "Skip Location list expression: [%d] (low_offset: 0x%" PRIx64 ", high_offset: 0x%" PRIx64 "), \"%s\"", i, start, end, str);
@@ -326,8 +307,13 @@ bool __pst_parameter::handle_dwarf(Dwarf_Die* result)
char str[1024]; char str[1024];
if(handle_location(ctx, attr, stack, pc, str, sizeof(str))) { if(handle_location(ctx, attr, stack, pc, str, sizeof(str))) {
if(stack.get_value(value)) { if(stack.get_value(value)) {
ctx->log(SEVERITY_DEBUG, "Parameter Location: %s ==> 0x%lX", str, value);
has_value = true; has_value = true;
} else {
ctx->log(SEVERITY_ERROR, "Failed to get value of calculated DW_AT_location expression: %s", str);
} }
} else {
ctx->log(SEVERITY_ERROR, "Failed to calculate DW_AT_location expression: %s", str);
} }
} else if(dwarf_hasattr(result, DW_AT_const_value)) { } else if(dwarf_hasattr(result, DW_AT_const_value)) {
// no locations definitions, value is constant, known by DWARF directly // no locations definitions, value is constant, known by DWARF directly
@@ -353,6 +339,9 @@ bool __pst_parameter::handle_dwarf(Dwarf_Die* result)
has_value = true; has_value = true;
break; break;
} }
if(has_value) {
ctx->log(SEVERITY_DEBUG, "Parameter constant value: 0x%lX", value);
}
} }
// handle DW_AT_default_value to get information about default value for DW_TAG_formal_parameter type of function // handle DW_AT_default_value to get information about default value for DW_TAG_formal_parameter type of function
@@ -397,7 +386,7 @@ pst_parameter* __pst_function::next_param(pst_parameter* p)
bool __pst_function::print_dwarf() bool __pst_function::print_dwarf()
{ {
char* at = NULL; char* at = NULL;
if(!asprintf(&at, " at %s:%d (%p)", file.c_str(), line, (void*)pc)) { if(!asprintf(&at, " at %s:%d, %p", file.c_str(), line, (void*)pc)) {
return false; return false;
} }
if(at[4] == ':' && at[5] == '-') { if(at[4] == ':' && at[5] == '-') {
@@ -483,7 +472,7 @@ bool __pst_function::handle_dwarf(Dwarf_Die* d)
unw_word_t sp; unw_word_t sp;
unw_get_reg(&cursor, UNW_REG_SP, &sp); unw_get_reg(&cursor, UNW_REG_SP, &sp);
ctx->log(SEVERITY_DEBUG, "Found function in debug info. name = %s(...), PC = 0x%lX, LOW_PC = 0x%lX, HIGH_PC = 0x%lX, offset from base address: 0x%lX, BASE_PC = 0x%lX, offset from start of function: 0x%lX, stack address: 0x%lX", ctx->log(SEVERITY_DEBUG, "=====> %s(...), PC = 0x%lX, LOW_PC = 0x%lX, HIGH_PC = 0x%lX, offset from base address: 0x%lX, BASE_PC = 0x%lX, offset from start of function: 0x%lX, stack address: 0x%lX",
dwarf_diename(d), pc, lowpc, highpc, pc - ctx->base_addr, info.start_ip, info.start_ip - ctx->base_addr, sp); dwarf_diename(d), pc, lowpc, highpc, pc - ctx->base_addr, info.start_ip, info.start_ip - ctx->base_addr, sp);
// determine function's stack frame base // determine function's stack frame base
@@ -499,7 +488,7 @@ bool __pst_function::handle_dwarf(Dwarf_Die* d)
if(stack.calc_expression(expr, exprlen, attr)) { if(stack.calc_expression(expr, exprlen, attr)) {
uint64_t value; uint64_t value;
if(stack.get_value(value)) { if(stack.get_value(value)) {
ctx->log(SEVERITY_DEBUG, "DW_AT_framebase expression: \"%s\"==> 0x%lX", str, value); ctx->log(SEVERITY_DEBUG, "DW_AT_framebase expression: \"%s\" ==> 0x%lX", str, value);
} else { } else {
ctx->log(SEVERITY_ERROR, "Failed to get value of calculated DW_AT_framebase expression: %s", str); ctx->log(SEVERITY_ERROR, "Failed to get value of calculated DW_AT_framebase expression: %s", str);
} }
@@ -586,10 +575,12 @@ bool __pst_function::handle_dwarf(Dwarf_Die* d)
attr = dwarf_attr(&child, DW_AT_location, &attr_mem); attr = dwarf_attr(&child, DW_AT_location, &attr_mem);
if(handle_location(ctx, attr, stack, pc, str, sizeof(str))) { if(handle_location(ctx, attr, stack, pc, str, sizeof(str))) {
if(stack.get_value(value)) { if(stack.get_value(value)) {
ctx->log(SEVERITY_DEBUG, "%s:%d", __PRETTY_FUNCTION__, __LINE__); ctx->log(SEVERITY_DEBUG, "DW_TAG_GNU_call_site_parameter Location: \"%s\" ==> 0x%lX", str, value);
ctx->log(SEVERITY_DEBUG, "Call site Location: %s ==> 0x%lX", str, value); } else {
ctx->log(SEVERITY_DEBUG, "%s:%d", __PRETTY_FUNCTION__, __LINE__); ctx->log(SEVERITY_ERROR, "Failed to get value of calculated DW_AT_location expression: %s", str);
} }
} else {
ctx->log(SEVERITY_ERROR, "Failed to calculate DW_AT_location expression: %s", str);
} }
} }
if(dwarf_hasattr(&child, DW_AT_GNU_call_site_value)) { if(dwarf_hasattr(&child, DW_AT_GNU_call_site_value)) {
@@ -597,8 +588,12 @@ bool __pst_function::handle_dwarf(Dwarf_Die* d)
attr = dwarf_attr(&child, DW_AT_GNU_call_site_value, &attr_mem); attr = dwarf_attr(&child, DW_AT_GNU_call_site_value, &attr_mem);
if(handle_location(ctx, attr, stack, pc, str, sizeof(str))) { if(handle_location(ctx, attr, stack, pc, str, sizeof(str))) {
if(stack.get_value(value)) { if(stack.get_value(value)) {
ctx->log(SEVERITY_DEBUG, "Call site Value Location: %s ==> 0x%lX", str, value); ctx->log(SEVERITY_DEBUG, "DW_AT_GNU_call_site_value Location:\"%s\" ==> 0x%lX", str, value);
} else {
ctx->log(SEVERITY_ERROR, "Failed to get value of calculated DW_AT_location expression: %s", str);
} }
} else {
ctx->log(SEVERITY_ERROR, "Failed to calculate DW_AT_location expression: %s", str);
} }
} }
break; break;
@@ -717,7 +712,7 @@ bool __pst_handler::get_frame()
result = dwarf_frame_cfa(frame, &cfa_ops, &cfa_nops); result = dwarf_frame_cfa(frame, &cfa_ops, &cfa_nops);
char str[1024]; str[0] = 0; char str[1024]; str[0] = 0;
ctx.print_expr_block (cfa_ops, cfa_nops, str, sizeof(str)); ctx.print_expr_block (cfa_ops, cfa_nops, str, sizeof(str));
ctx.log(SEVERITY_INFO, "Found CFA expression: %s", str); ctx.log(SEVERITY_INFO, "CFA expression: \"%s\"", str);
//print_detail (result, cfa_ops, cfa_nops, mod_bias, "\tCFA "); //print_detail (result, cfa_ops, cfa_nops, mod_bias, "\tCFA ");
} }
@@ -752,9 +747,7 @@ bool __pst_handler::get_dwarf_function(pst_function* fun)
int tag = dwarf_tag(&result); int tag = dwarf_tag(&result);
if(tag == DW_TAG_subprogram || tag == DW_TAG_entry_point || tag == DW_TAG_inlined_subroutine) { if(tag == DW_TAG_subprogram || tag == DW_TAG_entry_point || tag == DW_TAG_inlined_subroutine) {
if(!strcmp(fun->name.c_str(), dwarf_diename(&result))) { if(!strcmp(fun->name.c_str(), dwarf_diename(&result))) {
ctx.log(SEVERITY_DEBUG, "%s:%d", __PRETTY_FUNCTION__, __LINE__);
return fun->handle_dwarf(&result); return fun->handle_dwarf(&result);
ctx.log(SEVERITY_DEBUG, "%s:%d", __PRETTY_FUNCTION__, __LINE__);
} }
} }
} while(dwarf_siblingof(&result, &result) == 0); } while(dwarf_siblingof(&result, &result) == 0);