From ebb0e5f9fe6707133dacbe70f80831cd1aa5c974 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Thu, 13 Jul 2017 11:23:03 +0200
Subject: added a simple test for malloc/free added a memorymanager
 initilializer which works on a buffer instead on an offset (thus we can but
 the heap area also onto the stack for testing) added a kernel_stub module to
 test modules using kernel_panic (for now, maybe have a callback later)

---
 src/kernel/memorymanagement.c | 12 +++++++++++-
 src/kernel/memorymanagement.h |  1 +
 src/libc/stdlib.c             | 17 +++++++++--------
 src/libc/stdlib.h             |  6 ++----
 4 files changed, 23 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/kernel/memorymanagement.c b/src/kernel/memorymanagement.c
index b8a84b2..bc7252e 100644
--- a/src/kernel/memorymanagement.c
+++ b/src/kernel/memorymanagement.c
@@ -10,7 +10,17 @@ void memory_manager_init( memory_manager_t *memory_manager, size_t offset, size_
 
 	memory_manager->offset = offset;
 	memory_manager->size = size;
-	memory_manager->free_ptr = offset;
+	memory_manager->free_ptr = memory_manager->offset;
+	memory_manager->prev_ptr = 0xFFFFFFFF;
+}
+
+void memory_manager_init_with_buf( memory_manager_t *memory_manager, void *buf, size_t size )
+{
+	memset( memory_manager, 0, sizeof( memory_manager_t ) );
+
+	memory_manager->offset = (uint32_t)buf;
+	memory_manager->size = size;
+	memory_manager->free_ptr = memory_manager->offset;
 	memory_manager->prev_ptr = 0xFFFFFFFF;
 }
 
diff --git a/src/kernel/memorymanagement.h b/src/kernel/memorymanagement.h
index 647c05d..5ea2618 100644
--- a/src/kernel/memorymanagement.h
+++ b/src/kernel/memorymanagement.h
@@ -11,6 +11,7 @@ typedef struct {
 } memory_manager_t;
 
 void memory_manager_init( memory_manager_t *memory_manager, size_t offset, size_t size );
+void memory_manager_init_with_buf( memory_manager_t *memory_manager, void *buf, size_t size );
 void *memory_manager_allocate( memory_manager_t *memory_manager, size_t size );
 void memory_manager_deallocate( memory_manager_t *memory_manager, void **p );
 
diff --git a/src/libc/stdlib.c b/src/libc/stdlib.c
index d6bb8b2..d7d4331 100644
--- a/src/libc/stdlib.c
+++ b/src/libc/stdlib.c
@@ -3,6 +3,8 @@
 #include "stdlib.h"
 #include "stddef.h"
 
+#include "kernel.h"
+
 static void strreverse( char *s )
 {
 	char *end = s + strlen( s ) - 1;
@@ -46,29 +48,28 @@ char *itoa( int v, char *s, int base )
 	return s;
 }
 
-#ifdef OS_ABAOS
+void abort( void )
+{
+	// TODO: this should be done on process level, terminating
+	// the process (by signalling SIGABRT for instance)
+	kernel_panic( "aborted" );
+}
+
 // TODO: we should have a global memory manager and one per
 // user process later
 static memory_manager_t *stdlib_memory_manager = NULL;
-#endif
   
 void *malloc( size_t size )
 {
-#ifdef OS_ABAOS
 	return memory_manager_allocate( stdlib_memory_manager, size );
-#endif
 }
 
 void free( void *p )
 {
-#ifdef OS_ABAOS
 	memory_manager_deallocate( stdlib_memory_manager, &p );
-#endif
 }
 
-#ifdef OS_ABAOS
 void __stdlib_set_memory_manager( memory_manager_t *memory_manager )
 {
 	stdlib_memory_manager = memory_manager;
 }
-#endif
diff --git a/src/libc/stdlib.h b/src/libc/stdlib.h
index 9507fa3..9ff28a3 100644
--- a/src/libc/stdlib.h
+++ b/src/libc/stdlib.h
@@ -3,17 +3,15 @@
 
 #include "stddef.h"
 
-#ifdef OS_ABAOS
 #include "memorymanagement.h"
-#endif
 
 char *itoa( int v, char *s, int base );
 
+void abort( void );
+
 void *malloc( size_t size );
 void free( void *p );
 
-#ifdef OS_ABAOS
 void __stdlib_set_memory_manager( memory_manager_t *memory_manager );
-#endif
 
 #endif // STDLIB_H
-- 
cgit v1.2.3-54-g00ecf