git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Complete (almost!) printf fmt support
[lunaix-os.git]
/
lunaix-os
/
kernel
/
k_main.c
diff --git
a/lunaix-os/kernel/k_main.c
b/lunaix-os/kernel/k_main.c
index 3f56166b14f57c659c9920c4156412ac5e0d3237..121273bed02243126a09f629905968e04bed6652 100644
(file)
--- a/
lunaix-os/kernel/k_main.c
+++ b/
lunaix-os/kernel/k_main.c
@@
-3,6
+3,7
@@
#include <lunaix/mm/dmm.h>
#include <hal/cpu.h>
#include <libc/stdio.h>
#include <lunaix/mm/dmm.h>
#include <hal/cpu.h>
#include <libc/stdio.h>
+#include <lunaix/spike.h>
extern uint8_t __kernel_start;
extern uint8_t __kernel_start;
@@
-20,8
+21,6
@@
_kernel_main()
void* k_start = vmm_v2p(&__kernel_start);
printf("The kernel's base address mapping: %p->%p\n", &__kernel_start, k_start);
void* k_start = vmm_v2p(&__kernel_start);
printf("The kernel's base address mapping: %p->%p\n", &__kernel_start, k_start);
- dmm_init();
-
// test malloc & free
uint32_t** arr = (uint32_t**) lx_malloc(10 * sizeof(uint32_t*));
// test malloc & free
uint32_t** arr = (uint32_t**) lx_malloc(10 * sizeof(uint32_t*));
@@
-40,5
+39,4
@@
_kernel_main()
lx_free(arr);
lx_free(big_);
lx_free(arr);
lx_free(big_);
- // assert(0);
}
\ No newline at end of file
}
\ No newline at end of file