Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved the appending of '*'/'&' for pointer/reference parameters to the gcc 2

Browse Source 
demangler, where it belongs. The gcc 4 stack traces look correct now.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30955 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2009-06-04 02:00:45 +00:00
parent 15394881a8
commit 7927ebb672
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/add-ons/kernel/debugger/demangle/gcc2.cpp
View File

@ -349,8 +349,8 @@ get_next_argument_internal(uint32* _cookie, const char* symbol, char* name,
return B_LINK_LIMIT; return B_LINK_LIMIT;
// it's a repeat case // it's a repeat case
status_t status = get_next_argument_internal(&index, symbol, name, status_t status = get_next_argument_internal(&index, symbol,
nameSize, _type, _argumentLength, true); name, nameSize, _type, _argumentLength, true);
if (status == B_OK) if (status == B_OK)
(*_cookie)++; (*_cookie)++;
return status; return status;
@ -472,6 +472,14 @@ status_t
get_next_argument_gcc2(uint32* _cookie, const char* symbol, char* name, get_next_argument_gcc2(uint32* _cookie, const char* symbol, char* name,
size_t nameSize, int32* _type, size_t* _argumentLength) size_t nameSize, int32* _type, size_t* _argumentLength)
{ {
return get_next_argument_internal(_cookie, symbol, name, nameSize, _type, status_t error = get_next_argument_internal(_cookie, symbol, name, nameSize,
_argumentLength, false); _type, _argumentLength, false);
if (error != B_OK)
return error;
// append the missing '*'/'&' for pointer/ref types
if (name[0] != '\0' && (*_type == B_POINTER_TYPE || *_type == B_REF_TYPE))
strlcat(name, *_type == B_POINTER_TYPE ? "*" : "&", nameSize);
return B_OK;
} }

6
src/system/kernel/arch/x86/arch_debug.cpp
View File

@ -204,10 +204,8 @@ print_demangled_call(const char* image, const char* symbol, addr_t args,
kprintf("\33[34m%s\33[0m", value ? "true" : "false"); kprintf("\33[34m%s\33[0m", value ? "true" : "false");
break; break;
default: default:
if (buffer[0]) { if (buffer[0])
kprintf("%s%s: ", buffer, type == B_POINTER_TYPE ? "*" kprintf("%s: ", buffer);
: type == B_REF_TYPE ? "&" : "");
}
if (length == 4) { if (length == 4) {
value = *(uint32*)arg; value = *(uint32*)arg;