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

* print_demangled_call() now brings some color into your Haiku life (ie. to

Browse Source 
the KDL sessions).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28392 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2008-10-31 10:22:46 +00:00
parent d5a9a2d118
commit 3a5a677501
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,7 +131,7 @@ print_demangled_call(const char* image, const char* symbol, addr_t args,
const char* lastName = strrchr(name, ':') - 1; const char* lastName = strrchr(name, ':') - 1;
int namespaceLength = lastName - name; int namespaceLength = lastName - name;
kprintf("<%s> %.*s<%p>%s", image, namespaceLength, name, kprintf("<%s> %.*s<\33[32m%p\33[0m>%s", image, namespaceLength, name,
*(uint32 **)arg, lastName); *(uint32 **)arg, lastName);
if (addDebugVariables) if (addDebugVariables)
set_debug_variable("_this", *(uint32 *)arg); set_debug_variable("_this", *(uint32 *)arg);
@ -156,43 +156,45 @@ print_demangled_call(const char* image, const char* symbol, addr_t args,
switch (type) { switch (type) {
case B_INT64_TYPE: case B_INT64_TYPE:
value = *(int64*)arg; value = *(int64*)arg;
kprintf("int64: %Ld", value); kprintf("int64: \33[34m%Ld\33[0m", value);
break; break;
case B_INT32_TYPE: case B_INT32_TYPE:
value = *(int32*)arg; value = *(int32*)arg;
kprintf("int32: %ld", (int32)value); kprintf("int32: \33[34m%ld\33[0m", (int32)value);
break; break;
case B_INT16_TYPE: case B_INT16_TYPE:
value = *(int16*)arg; value = *(int16*)arg;
kprintf("int16: %d", (int16)value); kprintf("int16: \33[34m%d\33[0m", (int16)value);
break; break;
case B_INT8_TYPE: case B_INT8_TYPE:
value = *(int8*)arg; value = *(int8*)arg;
kprintf("int8: %d", (int8)value); kprintf("int8: \33[34m%d\33[0m", (int8)value);
break; break;
case B_UINT64_TYPE: case B_UINT64_TYPE:
value = *(uint64*)arg; value = *(uint64*)arg;
kprintf("uint64: %#Lx", value); kprintf("uint64: \33[34m%#Lx\33[0m", value);
if (value < 0x100000) if (value < 0x100000)
kprintf(" (%Lu)", value); kprintf(" (\33[34m%Lu\33[0m)", value);
break; break;
case B_UINT32_TYPE: case B_UINT32_TYPE:
value = *(uint32*)arg; value = *(uint32*)arg;
kprintf("uint32: %#lx", (uint32)value); kprintf("uint32: \33[34m%#lx\33[0m", (uint32)value);
if (value < 0x100000) if (value < 0x100000)
kprintf(" (%lu)", (uint32)value); kprintf(" (\33[34m%lu\33[0m)", (uint32)value);
break; break;
case B_UINT16_TYPE: case B_UINT16_TYPE:
value = *(uint16*)arg; value = *(uint16*)arg;
kprintf("uint16: %#x (%u)", (uint16)value, (uint16)value); kprintf("uint16: \33[34m%#x\33[0m (\33[34m%u\33[0m)",
(uint16)value, (uint16)value);
break; break;
case B_UINT8_TYPE: case B_UINT8_TYPE:
value = *(uint8*)arg; value = *(uint8*)arg;
kprintf("uint8: %#x (%u)", (uint8)value, (uint8)value); kprintf("uint8: \33[34m%#x\33[0m (\33[34m%u\33[0m)",
(uint8)value, (uint8)value);
break; break;
case B_BOOL_TYPE: case B_BOOL_TYPE:
value = *(uint8*)arg; value = *(uint8*)arg;
kprintf(value ? "true" : "false"); kprintf("\33[34m%s\33[0m", value ? "true" : "false");
break; break;
default: default:
if (buffer[0]) { if (buffer[0]) {
@ -206,7 +208,7 @@ print_demangled_call(const char* image, const char* symbol, addr_t args,
&& (type == B_POINTER_TYPE || type == B_REF_TYPE)) && (type == B_POINTER_TYPE || type == B_REF_TYPE))
kprintf("NULL"); kprintf("NULL");
else else
kprintf("%#lx", (uint32)value); kprintf("\33[34m%#lx\33[0m", (uint32)value);
break; break;
} }
@ -214,15 +216,17 @@ print_demangled_call(const char* image, const char* symbol, addr_t args,
value = *(uint64*)arg; value = *(uint64*)arg;
else else
value = (uint64)arg; value = (uint64)arg;
kprintf("%#Lx", value); kprintf("\33[34m%#Lx\33[0m", value);
break; break;
} }
if (type == B_STRING_TYPE) { if (type == B_STRING_TYPE) {
if (user_strlcpy(buffer, (char*)value, sizeof(buffer)) < B_OK) if (value == 0)
kprintf(" '???'"); kprintf(" \33[31m\"<NULL>\"\33[0m");
else if (user_strlcpy(buffer, (char*)value, sizeof(buffer)) < B_OK)
kprintf(" \33[31m\"<???>\"\33[0m");
else else
kprintf(" \"%s\"", buffer); kprintf(" \33[36m\"%s\"\33[0m", buffer);
} }
if (addDebugVariables) if (addDebugVariables)