diff options
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/inc/assert.h | 7 | ||||
| -rw-r--r-- | libc/inc/mem.h | 6 | ||||
| -rw-r--r-- | libc/inc/sys.h | 21 | ||||
| -rw-r--r-- | libc/mem.c | 30 |
4 files changed, 28 insertions, 36 deletions
diff --git a/libc/inc/assert.h b/libc/inc/assert.h index e42fc5a..3656c33 100644 --- a/libc/inc/assert.h +++ b/libc/inc/assert.h @@ -18,12 +18,9 @@ __asm__ volatile("cli\nhlt"); \ } #elif defined(userspace) -#include <sys.h> #define assert(exp) \ - if (!(exp)) { \ - printf("%s:%d: %s: Assertion '%s' failed\n", __FILE__, __LINE__, __func__, #exp); \ - exit(1); \ - } + if (!(exp)) \ + err(1, "%s:%d: %s: Assertion '%s' failed\n", __FILE__, __LINE__, __func__, #exp); #else #error "No lib target specified. Please use -Dkernel or -Duserspace" #endif diff --git a/libc/inc/mem.h b/libc/inc/mem.h index e35ee62..216b939 100644 --- a/libc/inc/mem.h +++ b/libc/inc/mem.h @@ -11,11 +11,7 @@ void *malloc_debug(u32 size, const char *file, int line, const char *func, const void free_debug(void *ptr, const char *file, int line, const char *func, const char *inp); #define malloc(size) malloc_debug(size, __FILE__, __LINE__, __func__, #size) #define free(ptr) free_debug(ptr, __FILE__, __LINE__, __func__, #ptr) - -/* void *_malloc(u32 size); */ -/* void _free(void *ptr); */ -/* #define malloc(size) _malloc(size) */ -/* #define free(ptr) _free(ptr) */ +void *zalloc(u32 size); #ifdef kernel void heap_init(u32 start); diff --git a/libc/inc/sys.h b/libc/inc/sys.h index d7e5e3d..e7fdcf0 100644 --- a/libc/inc/sys.h +++ b/libc/inc/sys.h @@ -28,12 +28,6 @@ enum sys { SYS_NET_RECEIVE, // Receive data from socket }; -struct message { - int src; - int type; - void *data; -}; - struct event_keyboard { int magic; int press; @@ -96,23 +90,22 @@ static inline u32 getpid() return buf; } -// Hacky one-digit solution - TODO! #include <mem.h> +#include <print.h> #include <str.h> static inline u32 pidof(const char *name) { u32 curr = 1; - char buf[32] = { 0 }; - char *path = (char *)"/proc/1/name"; // AAH - while (read(path, buf, 0, 32)) { - if (!strcmp(name, buf)) - return curr; + char buf[32] = { 0 }, path[32] = { 0 }; + while (curr < 1000) { // Max pid?? + if (sprintf(path, "/proc/%d/name", curr) > 0 && read(path, buf, 0, 32) > 0) + if (!strcmp(name, buf)) + return curr; curr++; - path[7]++; } - return 0; + return -1; } // Simple read wrapper @@ -361,20 +361,31 @@ void _free(void *ptr) #endif +#ifdef kernel +#define PREFIX "K" +#define FUNC printf +#else +#define PREFIX "U" +#define FUNC log +#endif + +void *zalloc(u32 size) +{ + void *ret = malloc(size); + memset(ret, 0, size); + return ret; +} + void *malloc_debug(u32 size, const char *file, int line, const char *func, const char *inp) { + assert(size < (100 << 20)); // Don't brag with memory pls void *ret = _malloc(size); (void)file; (void)line; (void)func; (void)inp; - /* #ifdef kernel */ - /* printf("K"); */ - /* #else */ - /* printf("U"); */ - /* #endif */ - /* printf("MALLOC\t%s:%d: %s: 0x%x %dB (%s)\n", file, line, func, ret, size, inp); */ + /* FUNC(PREFIX "MALLOC\t%s:%d: %s: 0x%x %dB (%s)\n", file, line, func, ret, size, inp); */ return ret; } @@ -387,10 +398,5 @@ void free_debug(void *ptr, const char *file, int line, const char *func, const c (void)line; (void)func; (void)inp; - /* #ifdef kernel */ - /* printf("K"); */ - /* #else */ - /* printf("U"); */ - /* #endif */ - /* printf("FREE\t%s:%d: %s: 0x%x (%s)\n", file, line, func, ptr, inp); */ + /* FUNC(PREFIX "FREE\t%s:%d: %s: 0x%x (%s)\n", file, line, func, ptr, inp); */ } |