From ecbcb2509f4b811bce0a56e07de9737d14815251 Mon Sep 17 00:00:00 2001
From: Josh Rahm <joshuarahm@gmail.com>
Date: Tue, 24 Nov 2020 15:15:11 -0700
Subject: Add better logging capabilities, including the ability to panic.

---
 src/kern/mem.c | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'src/kern/mem.c')

diff --git a/src/kern/mem.c b/src/kern/mem.c
index ac90f0d..eb4527e 100644
--- a/src/kern/mem.c
+++ b/src/kern/mem.c
@@ -1,7 +1,9 @@
 #include "kern/mem.h"
 
 #include "arch.h"
+
 #include "kern/common.h"
+#include "kern/panic.h"
 
 #ifdef ARCH_STM32L4
 /* Provide a definition for memset() when not provided for the
@@ -146,22 +148,6 @@ static void coalesce(kalloc_node_t* cur)
   last_freed->size = ((uint8_t*)next_used - (last_freed->mem)) / 4;
 }
 
-#ifdef FOR_TESTING
-#include <assert.h>
-#include <stdio.h>
-void panic(const char* x)
-{
-  fprintf(stderr, "%s\n", x);
-  assert(0);
-}
-#else
-void panic(const char* x)
-{
-  for (;;)
-    ;
-}
-#endif
-
 void kfree(void* mem)
 {
   /* Like normal free(), do nothing on free'ing NULL */
-- 
cgit