diff --git a/Makefile b/Makefile index 1d12793..0f687a6 100644 --- a/Makefile +++ b/Makefile @@ -82,7 +82,7 @@ clean: find . -type f -name '*.[od(elf)]' -exec rm -f {} + format: - find kern -type f -name '*.[ch]' -exec clang-format -i {} \; + find . -type f -name '*.[ch]' -exec clang-format -i {} + TOOLCHAIN_DIR := toolchain diff --git a/README.md b/README.md index cc20fbe..c2a1e05 100644 --- a/README.md +++ b/README.md @@ -75,9 +75,6 @@ make distclean # Wipes the above, but also removes toolchain | `mip` | Machine Interrupt Pending | Machine | Indicates pending interrupts. | | `mie` | Machine Interrupt Enable | Machine | Controls which interrupts are enabled. | -### TODO -- Kassert, some macro in the form of `ASSERT(condition, "This went wrong")` - ### Libc Implementations [uClibc](https://uclibc.org/) diff --git a/kern/kalloc.c b/kern/kalloc.c index dead607..88238ee 100644 --- a/kern/kalloc.c +++ b/kern/kalloc.c @@ -46,7 +46,6 @@ void kfree(void *pa) { if (((u64)pa % PGSIZE) != 0 || (char *)pa < kernel_end || (u64)pa >= PHYSTOP) PANIC("kfree"); - // TODO: Kconfig this // Fill with junk to catch dangling refs. memset(pa, 1, PGSIZE); diff --git a/kern/libkern/stddef.h b/kern/libkern/stddef.h index 0d70dea..ab8a2b5 100644 --- a/kern/libkern/stddef.h +++ b/kern/libkern/stddef.h @@ -2,7 +2,8 @@ #define STDDEF_H #ifndef NULL -#define NULL ((void *)0) +#define NULL ((void*)0) #endif #endif // STDDEF_H + diff --git a/kern/libkern/stdio.c b/kern/libkern/stdio.c index c50a0d6..61b740a 100644 --- a/kern/libkern/stdio.c +++ b/kern/libkern/stdio.c @@ -22,7 +22,7 @@ static int stdout_puts(char *s, int len, void *unused) { int kprintf(const char *restrict fmt, ...) { va_list ap; va_start(ap, fmt); - int ret = kvprintf(fmt, ap); + int ret = kvprintf(fmt, &ap); va_end(ap); return ret; }