lcfOS: cos/kernel/kernel.c comparison

Now working with 2 MB pages

comparison

equal deleted inserted replaced

-:f454e3c592dd
+:b1fed2171e1a
 /*
 malloc and free divide the chunks of memory present at the heap
 of the kernel into smaller parts.
 The heap is located at: 0x
 */
-static void* kernel_heap = (void*) 0xD0000000;
+static void* kernel_heap = (void*) 0x400000; // 4 MB - 6 MB is heap
 /* Allocates 'size' bytes and returns the pointer if succesfull.
 Kernelpanic in case of failure..
 */
-void* malloc(uint64_t size) {
+void* kmalloc(uint64_t size) {
 printf("Malloc %d bytes\n", size);
 return kernel_heap;
 }
-void free(void* ptr) {
+void kfree(void* ptr) {
 printf("Free address %x\n", ptr);
 }
 void startPython()
 {
 // TODO: connect to Py_Main
+}
+void testMalloc()
+{
+char *a, *b;
+a = kmalloc(100);
+printf("Got a at %x\n", a);
+a[0] = 'A';
+b = kmalloc(22);
+printf("Got b at %x\n", b);
+b[0] = 'B';
+kfree(a);
 }
 void kmain()
 {
 init_screen();
 printf("Welcome! .. ");
 printf("Enabling interrupts .. ");
 setupIDT();
+printf("Testing malloc");
+testMalloc();
 printf("Entering mainloop!\n");
 while (1==1)
 {
 char buffer[70];

Mercurial > lcfOS