sel4debug: Actually print in debug_print_bootinfo
Trying to get this function to print requires lots of hard to find
config options. Just print output if the function is called and let the
call site decide how to config guard whether it gets called or not.
diff --git a/libsel4debug/include/sel4debug/debug.h b/libsel4debug/include/sel4debug/debug.h
index d17c679..a128ae5 100644
--- a/libsel4debug/include/sel4debug/debug.h
+++ b/libsel4debug/include/sel4debug/debug.h
@@ -27,9 +27,5 @@
void debug_cap_identify(seL4_CPtr cap);
-#ifdef CONFIG_USER_DEBUG_BUILD
void debug_print_bootinfo(seL4_BootInfo *info);
-#else
-#define debug_print_bootinfo(x)
-#endif /* CONFIG_USER_DEBUG_BUILD */
diff --git a/libsel4debug/src/bootinfo.c b/libsel4debug/src/bootinfo.c
index 2747fc7..78e853a 100644
--- a/libsel4debug/src/bootinfo.c
+++ b/libsel4debug/src/bootinfo.c
@@ -17,34 +17,33 @@
#include <sel4/sel4.h>
#include <utils/util.h>
-#ifdef CONFIG_USER_DEBUG_BUILD
void
debug_print_bootinfo(seL4_BootInfo *info)
{
- ZF_LOGI("Node %lu of %lu", (long)info->nodeID, (long)info->numNodes);
- ZF_LOGI("IOPT levels: %u", (int)info->numIOPTLevels);
- ZF_LOGI("IPC buffer: %p", info->ipcBuffer);
- ZF_LOGI("Empty slots: [%lu --> %lu)", (long)info->empty.start, (long)info->empty.end);
- ZF_LOGI("sharedFrames: [%lu --> %lu)", (long)info->sharedFrames.start, (long)info->sharedFrames.end);
- ZF_LOGI("userImageFrames: [%lu --> %lu)", (long)info->userImageFrames.start, (long)info->userImageFrames.end);
- ZF_LOGI("userImagePaging: [%lu --> %lu)", (long)info->userImagePaging.start, (long)info->userImagePaging.end);
- ZF_LOGI("untypeds: [%lu --> %lu)", (long)info->untyped.start, (long)info->untyped.end);
- ZF_LOGI("Initial thread domain: %u\n", (int)info->initThreadDomain);
- ZF_LOGI("Initial thread cnode size: %u", info->initThreadCNodeSizeBits);
- ZF_LOGI("List of untypeds");
- ZF_LOGI("------------------");
- ZF_LOGI("Paddr | Size | Device");
+ printf("Node %lu of %lu\n", (long)info->nodeID, (long)info->numNodes);
+ printf("IOPT levels: %u\n", (int)info->numIOPTLevels);
+ printf("IPC buffer: %p\n", info->ipcBuffer);
+ printf("Empty slots: [%lu --> %lu)\n", (long)info->empty.start, (long)info->empty.end);
+ printf("sharedFrames: [%lu --> %lu)\n", (long)info->sharedFrames.start, (long)info->sharedFrames.end);
+ printf("userImageFrames: [%lu --> %lu)\n", (long)info->userImageFrames.start, (long)info->userImageFrames.end);
+ printf("userImagePaging: [%lu --> %lu)\n", (long)info->userImagePaging.start, (long)info->userImagePaging.end);
+ printf("untypeds: [%lu --> %lu)\n", (long)info->untyped.start, (long)info->untyped.end);
+ printf("Initial thread domain: %u\n", (int)info->initThreadDomain);
+ printf("Initial thread cnode size: %u\n", info->initThreadCNodeSizeBits);
+ printf("List of untypeds\n");
+ printf("------------------\n");
+ printf("Paddr | Size | Device\n");
int sizes[CONFIG_WORD_SIZE] = {0};
for (int i = 0; i < CONFIG_MAX_NUM_BOOTINFO_UNTYPED_CAPS && i < (info->untyped.end - info->untyped.start); i++) {
int index = info->untypedList[i].sizeBits;
assert(index < ARRAY_SIZE(sizes));
sizes[index]++;
- ZF_LOGI("%p | %zu | %d", (void*)info->untypedList[i].paddr, (size_t)info->untypedList[i].sizeBits, (int)info->untypedList[i].isDevice);
+ printf("%p | %zu | %d\n", (void*)info->untypedList[i].paddr, (size_t)info->untypedList[i].sizeBits, (int)info->untypedList[i].isDevice);
}
- ZF_LOGI("Untyped summary\n");
+ printf("Untyped summary\n");
for (int i = 0; i < ARRAY_SIZE(sizes); i++) {
if (sizes[i] != 0) {
printf("%d untypeds of size %d\n", sizes[i], i);
@@ -52,4 +51,3 @@
}
}
-#endif /* CONFIG_USER_DEBUG_BUILD */
