dinosauriel/aos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ensure no debug_printf makes it to the output

Browse Source
This commit is contained in:
Sparchatus 2022-06-02 20:43:17 +00:00
parent dd7757af55
commit b6cb27a875
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hake/hake.sh
View File

@ -16,7 +16,7 @@ DEFAULT_JOBS=4
JOBS="$DEFAULT_JOBS" JOBS="$DEFAULT_JOBS"
CACHEDIR="$HOME/.cache/barrelfish" CACHEDIR="$HOME/.cache/barrelfish"
HAGFISH_LOCATION="/home/netos/tftpboot/Hagfish.efi" HAGFISH_LOCATION="/home/netos/tftpboot/Hagfish.efi"
DEFAULT_OPT_FLAGS="-O2 -g" DEFAULT_OPT_FLAGS="-O2 -g -DNDEBUG"
# Don't override the default toolchain unless asked to. # Don't override the default toolchain unless asked to.
TOOLROOT=Nothing TOOLROOT=Nothing

2
lib/aos/coreboot.c
View File

@ -377,7 +377,7 @@ errval_t coreboot(coreid_t mpid,
// debug_printf("[coreboot]: ARMv8_KERNEL_OFFSET = %p\n", ARMv8_KERNEL_OFFSET); // debug_printf("[coreboot]: ARMv8_KERNEL_OFFSET = %p\n", ARMv8_KERNEL_OFFSET);
core_data->cpu_driver_entry = reloc_cpudriver_entry + ARMv8_KERNEL_OFFSET; core_data->cpu_driver_entry = reloc_cpudriver_entry + ARMv8_KERNEL_OFFSET;
debug_printf("[coreboot] Flush the cache\n"); // debug_printf("[coreboot] Flush the cache\n");
// - Flush the cache. // - Flush the cache.
//memory barrier //memory barrier

6
lib/aos/init.c
View File

@ -46,7 +46,7 @@ void libc_exit(int);
__weak_reference(libc_exit, _exit); __weak_reference(libc_exit, _exit);
void libc_exit(int status) void libc_exit(int status)
{ {
debug_printf("libc exit NYI!\n"); DEBUG_PRINTF("libc exit NYI!\n");
thread_exit(status); thread_exit(status);
// If we're not dead by now, we wait // If we're not dead by now, we wait
while (1) {} while (1) {}
@ -110,7 +110,7 @@ static size_t aos_terminal_write(const char *buf, size_t len)
struct aos_rpc *rpc = aos_rpc_get_serial_channel(); struct aos_rpc *rpc = aos_rpc_get_serial_channel();
if (rpc == NULL) { if (rpc == NULL) {
debug_printf("[aos_terminal_write] RPC NOT YET INITIALIZED: %.*s\n", len, buf); // debug_printf("[aos_terminal_write] RPC NOT YET INITIALIZED: %.*s\n", len, buf);
USER_PANIC("Make sure to initialize aos_rpc before barrelfish_libc_glue_init is called."); USER_PANIC("Make sure to initialize aos_rpc before barrelfish_libc_glue_init is called.");
} }
for (int i = 0; i < len; ++i) { for (int i = 0; i < len; ++i) {
@ -129,7 +129,7 @@ static size_t aos_terminal_read(char *buf, size_t len)
struct aos_rpc *rpc = aos_rpc_get_serial_channel(); struct aos_rpc *rpc = aos_rpc_get_serial_channel();
if (rpc == NULL) { if (rpc == NULL) {
debug_printf("[aos_terminal_read] RPC NOT YET INITIALIZED: %.*s\n", len, buf); // debug_printf("[aos_terminal_read] RPC NOT YET INITIALIZED: %.*s\n", len, buf);
USER_PANIC("Make sure to initialize aos_rpc before barrelfish_libc_glue_init is called."); USER_PANIC("Make sure to initialize aos_rpc before barrelfish_libc_glue_init is called.");
} }
for (int i = 0; i < len; ++i) { for (int i = 0; i < len; ++i) {

2
lib/mm/mm.c
View File

@ -72,7 +72,7 @@ errval_t mm_add(struct mm *mm, struct capref cap)
gensize_t size = get_size(&c); gensize_t size = get_size(&c);
assert(size != 0); assert(size != 0);
debug_printf("mm_add: adding region. base=%"PRIx64", size=%"PRIx64"\n", base, size); DEBUG_PRINTF("mm_add: adding region. base=%"PRIx64", size=%"PRIx64"\n", base, size);
genpaddr_t base_rounded = ROUND_UP(base, BASE_PAGE_SIZE); genpaddr_t base_rounded = ROUND_UP(base, BASE_PAGE_SIZE);
gensize_t size_rounded = ROUND_DOWN(size - (base_rounded - base), BASE_PAGE_SIZE); gensize_t size_rounded = ROUND_DOWN(size - (base_rounded - base), BASE_PAGE_SIZE);

2
usr/drivers/enet/enet_module.c
View File

@ -330,7 +330,7 @@ static errval_t enet_phy_startup(struct enet_driver_state* st)
if (!(mii_reg & PHY_STATUS_ANEG_COMP)) { if (!(mii_reg & PHY_STATUS_ANEG_COMP)) {
debug_printf("[enet] Starting autonegotiation \n"); DEBUG_PRINTF("[enet] Starting autonegotiation \n");
while(!(mii_reg & PHY_STATUS_ANEG_COMP)) { while(!(mii_reg & PHY_STATUS_ANEG_COMP)) {
err = enet_read_mdio(st, PHY_ID, PHY_STATUS_CMD, &mii_reg); err = enet_read_mdio(st, PHY_ID, PHY_STATUS_CMD, &mii_reg);
assert(err_is_ok(err)); assert(err_is_ok(err));

4
usr/init/main.c
View File

@ -370,7 +370,7 @@ static int
app_main(int argc, char *argv[]) { app_main(int argc, char *argv[]) {
errval_t err; errval_t err;
debug_printf("[app_main]\n"); DEBUG_PRINTF("[app_main]\n");
// Implement me in Milestone 5 // Implement me in Milestone 5
// Remember to call // Remember to call
@ -524,7 +524,7 @@ int main(int argc, char *argv[])
platform = "UNKNOWN"; platform = "UNKNOWN";
} }
debug_printf("init domain starting on core %" PRIuCOREID " (%s), invoked as:", my_core_id, platform); DEBUG_PRINTF("init domain starting on core %" PRIuCOREID " (%s), invoked as:", my_core_id, platform);
for (int i = 0; i < argc; i++) { for (int i = 0; i < argc; i++) {
printf(" %s", argv[i]); printf(" %s", argv[i]);
} }

2
usr/init/mem_alloc.c
View File

@ -107,7 +107,7 @@ errval_t initialize_ram_alloc(void)
mem_cap.slot++; mem_cap.slot++;
} }
} }
debug_printf("Added %"PRIu64" MB of physical memory.\n", mem_avail / 1024 / 1024); DEBUG_PRINTF("Added %"PRIu64" MB of physical memory.\n", mem_avail / 1024 / 1024);
// Grading // Grading
grading_test_mm(&aos_mm); grading_test_mm(&aos_mm);