yuzu-emu/breakpad
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Issue 284 - DWARF dumper doesn't output function names including arguments. r=nealsid

Browse source 
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@302 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
ted.mielczarek 2008-12-08 13:00:29 +00:00
parent 7837cb7236
commit d3441c2c96
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/common/mac/dump_syms.mm
View file

@ -63,7 +63,6 @@ static NSString *kHeaderSizeKey = @"size";
static NSString *kHeaderOffsetKey = @"offset"; // Offset to the header static NSString *kHeaderOffsetKey = @"offset"; // Offset to the header
static NSString *kHeaderIs64BitKey = @"is64"; static NSString *kHeaderIs64BitKey = @"is64";
static NSString *kHeaderCPUTypeKey = @"cpuType"; static NSString *kHeaderCPUTypeKey = @"cpuType";
static NSString *kUnknownSymbol = @"???";
// The section for __TEXT, __text seems to be always 1. This is useful // The section for __TEXT, __text seems to be always 1. This is useful
// for pruning out extraneous non-function symbols. // for pruning out extraneous non-function symbols.
@ -433,6 +432,15 @@ void DumpFunctionMap(const dwarf2reader::FunctionMap function_map) {
NSString *symbolName = [NSString stringWithUTF8String:iter->second->name.c_str()]; NSString *symbolName = [NSString stringWithUTF8String:iter->second->name.c_str()];
[dict setObject:symbolName forKey:kAddressSymbolKey]; [dict setObject:symbolName forKey:kAddressSymbolKey];
} }
// try demangling function name if we have a mangled name
if (![dict objectForKey:kAddressConvertedSymbolKey] &&
!iter->second->mangled_name.empty()) {
NSString *mangled = [NSString stringWithUTF8String:iter->second->mangled_name.c_str()];
NSString *demangled = [self convertCPlusPlusSymbol:mangled];
if (demangled != nil)
[dict setObject:demangled forKey:kAddressConvertedSymbolKey];
}
// set line number for beginning of function // set line number for beginning of function
if (iter->second->line && ![dict objectForKey:kAddressSourceLineKey]) if (iter->second->line && ![dict objectForKey:kAddressSourceLineKey])

8
src/common/mac/dwarf/functioninfo.cc
View file

@ -152,8 +152,12 @@ void CUFunctionInfoHandler::ProcessAttributeString(uint64 offset,
enum DwarfAttribute attr, enum DwarfAttribute attr,
enum DwarfForm form, enum DwarfForm form,
const string &data) { const string &data) {
if (attr == DW_AT_name && current_function_info_) if (current_function_info_) {
current_function_info_->name = data; if (attr == DW_AT_name)
current_function_info_->name = data;
else if(attr == DW_AT_MIPS_linkage_name)
current_function_info_->mangled_name = data;
}
} }
void CUFunctionInfoHandler::ProcessAttributeUnsigned(uint64 offset, void CUFunctionInfoHandler::ProcessAttributeUnsigned(uint64 offset,

2
src/common/mac/dwarf/functioninfo.h
View file

@ -47,6 +47,8 @@ namespace dwarf2reader {
struct FunctionInfo { struct FunctionInfo {
// Name of the function // Name of the function
string name; string name;
// Mangled name of the function
string mangled_name;
// File containing this function // File containing this function
string file; string file;
// Line number for start of function. // Line number for start of function.