mirror/pstrace
4
0
Fork 0
Code Activity

retrieve return value of function, show frame number on print

Browse Source
This commit is contained in:
nnosov
2020-01-14 16:57:21 +04:00
parent 4bc8c15918
commit b49318cd11
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/sysutils.cpp
+11 -5
View File
@@ -285,10 +285,10 @@ bool __pst_parameter::handle_dwarf(Dwarf_Die* result)
} }
} else if(dwarf_hasattr(result, DW_AT_const_value)) { } else if(dwarf_hasattr(result, DW_AT_const_value)) {
attr = dwarf_attr(result, DW_AT_const_value, &attr_mem); attr = dwarf_attr(result, DW_AT_const_value, &attr_mem);
ctx->log(SEVERITY_DEBUG, "Const value form is: 0x%X", dwarf_whatform(attr));
switch (dwarf_whatform(attr)) { switch (dwarf_whatform(attr)) {
case DW_FORM_string: case DW_FORM_string:
// do nothing for now // do nothing for now
ctx->log(SEVERITY_WARNING, "Const value form DW_FORM_string is not implemented.");
break; break;
case DW_FORM_data1: case DW_FORM_data1:
case DW_FORM_data2: case DW_FORM_data2:
@@ -322,7 +322,7 @@ bool __pst_function::print_dwarf()
bool first = true; bool start_variable = false; bool first = true; bool start_variable = false;
for(auto param : params) { for(auto param : params) {
if(param.is_return) { if(param.is_return) {
// print return value, function name and start list of parameters // print return value type, function name and start list of parameters
param.print_dwarf(); param.print_dwarf();
ctx->print(" %s(", name.c_str()); ctx->print(" %s(", name.c_str());
continue; continue;
@@ -350,6 +350,7 @@ bool __pst_function::print_dwarf()
param.print_dwarf(); param.print_dwarf();
} }
} }
if(!start_variable) { if(!start_variable) {
ctx->print(");\n"); ctx->print(");\n");
} else { } else {
@@ -415,6 +416,9 @@ bool __pst_function::handle_dwarf(Dwarf_Die* d)
attr = dwarf_attr(die, DW_AT_type, &attr_mem); attr = dwarf_attr(die, DW_AT_type, &attr_mem);
if(attr) { if(attr) {
ctx->log(SEVERITY_DEBUG, "Handle return parameter"); ctx->log(SEVERITY_DEBUG, "Handle return parameter");
if(!unw_get_reg(&ctx->cursor, 16, &ret_p.value)) {
ret_p.has_value = true;
}
if(ret_p.handle_type(attr, true)) { if(ret_p.handle_type(attr, true)) {
params.push_back(ret_p); params.push_back(ret_p);
} }
@@ -511,7 +515,7 @@ bool __pst_handler::get_frame()
Dwarf_CFI* cfi = dwfl_module_eh_cfi(module, &mod_bias); Dwarf_CFI* cfi = dwfl_module_eh_cfi(module, &mod_bias);
//Dwarf_CFI* cfi = dwfl_module_dwarf_cfi(module, &mod_bias); //Dwarf_CFI* cfi = dwfl_module_dwarf_cfi(module, &mod_bias);
if(!cfi) { if(!cfi) {
ctx.log(SEVERITY_INFO, "Cannot find CFI for module"); ctx.log(SEVERITY_ERROR, "Cannot find CFI for module");
return false; return false;
} }
@@ -519,7 +523,7 @@ bool __pst_handler::get_frame()
int result = dwarf_cfi_addrframe (cfi, addr - mod_bias, &frame); int result = dwarf_cfi_addrframe (cfi, addr - mod_bias, &frame);
if (result == 0) { if (result == 0) {
// get frame information // get frame information
ctx.log(SEVERITY_INFO, "Found CFI frame for module"); ctx.log(SEVERITY_DEBUG, "Found CFI frame for module");
Dwarf_Addr start = addr; Dwarf_Addr start = addr;
Dwarf_Addr end = addr; Dwarf_Addr end = addr;
bool signalp; bool signalp;
@@ -593,7 +597,9 @@ void __pst_handler::print_dwarf()
{ {
ctx.offset = 0; ctx.offset = 0;
ctx.print("DWARF-based stack trace information:\n"); ctx.print("DWARF-based stack trace information:\n");
uint32_t idx = 0;
for(auto function : functions) { for(auto function : functions) {
ctx.print("[%-2u] ", idx); idx++;
function.print_dwarf(); function.print_dwarf();
ctx.print("\n"); ctx.print("\n");
} }
@@ -680,7 +686,7 @@ bool __pst_handler::unwind()
ctx.print("[%-2d] ", idx); ctx.print("[%-2d] ", idx);
#endif #endif
module = dwfl_addrmodule(dwfl, addr); module = dwfl_addrmodule(dwfl, addr);
//get_frame(); get_frame();
pst_function fun(&ctx); pst_function fun(&ctx);
if(fun.unwind(dwfl, module, pc)) { if(fun.unwind(dwfl, module, pc)) {
if(get_dwarf_function(fun)) { if(get_dwarf_function(fun)) {