UPDATE

Author: VaaKii

kernel/Makefile

@@ -2,7 +2,7 @@ DEFAULT_HOST!=../default-host.sh
 HOST?=DEFAULT_HOST
 HOSTARCH!=../target-triplet-to-arch.sh $(HOST)
 
-CFLAGS?=-O0 -g -pedantic
+CFLAGS?=-O2 -g #-pedantic
 CPPFLAGS?=
 LDFLAGS?=
 LIBS?=
@@ -18,7 +18,7 @@ CPPFLAGS:=$(CPPFLAGS) -D__is_kernel -Iinclude
 LDFLAGS:=$(LDFLAGS)
 LIBS:=$(LIBS) -nostdlib -lk -lgcc
 
-ARCHDIR=arch/$(HOSTARCH)
+ARCHDIR=arch/i386
 
 include $(ARCHDIR)/make.config
 

kernel/arch/i386/src/drivers/keyboard.c

@@ -4,6 +4,7 @@
 #include <memory/memory.h>
 #include <threading/tasking.h>
 #include <idt/idt.h>
+#include <memory/mutex.h>
 #include <drivers/keyboard.h>
 
 void keyboard_irq();
@@ -92,7 +93,7 @@ void keyboard_init(){
     printf("PS/2 Keyboard init sequence activated.\n");
     keycache = (uint8_t*)malloc(256);
     memset(keycache,0,256);
-    set_int(0x33,(uint32_t)keyboard_irq);
+    set_int(33,(uint32_t)keyboard_irq);
     __kbd_enabled = 1;
     _kill();
 };
@@ -109,8 +110,10 @@ void keyboard_read_key(){
     }
 }
 
+DEFINE_MUTEX(m_getkey);
 static char c = 0;
 char keyboard_get_key(){
+    mutex_lock(&m_getkey);
     c = 0;
     if(key_loc == 0) goto out;
     c = *keycache;
@@ -119,6 +122,7 @@ char keyboard_get_key(){
         keycache[i] = keycache[i+1];
     }
     out:
+    mutex_unlock(&m_getkey);
     return c;
 }
 

kernel/arch/i386/src/idt/exceptions.c

@@ -63,7 +63,7 @@ void exc_bound()
 
 void exc_invopcode()
 {
-    panic("Invalid opcode.\n");
+    printf("Invalid opcode.\n");
     if(is_tasking()) {
         send_sig(SIG_TERM);
         printf("Notifying process %s (%d) with SIGTERM\n", p_name(), p_pid());
@@ -138,11 +138,16 @@ void exc_gpf()
 
 void exc_pf()
 {
-    panic("Page fault in %s (%d)\n",p_name(), p_pid());
+    uint32_t esp;
+    uint32_t cr2;
+    asm volatile("mov (%%esp), %%eax":"=a"(esp));
+    asm volatile("mov %%cr2, %%eax":"=a"(cr2));
+    printf("Page fault in %s (%d); (esp)=0x%x, cr2=0x%x\n",p_name(), p_pid(),esp,cr2);
     if(is_tasking()) {
         send_sig(SIG_TERM);
         panic("Notifying process %s (%d) with SIGTERM\n", p_name(), p_pid());
     }
+
     return;
 }
 

kernel/arch/i386/src/idt/idt.c

@@ -29,7 +29,7 @@ void idt_init()
         idt_register_interrupt(i,(uint32_t)&__idt_default_handler);
     }
     idt_register_interrupt(0x2f,(uint32_t)&__idt_test_handler);
-    //idt_register_interrupt(0x2e,(uint32_t)&schedule);
+    idt_register_interrupt(0x2e,(uint32_t)&schedule);
     printf("Registered all interrupts to default handler\n");
     *(uint16_t*)idtr_location = idt_size - 1;
     *(uint32_t*)(idtr_location + 2) = idt_location;

kernel/arch/i386/src/memory/malloc.c

@@ -1,6 +1,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <memory/memory.h>
+#include <threading/pit.h>
 
 #define MAX_PAGE_ALIGNED_ALLOCS 32
 
@@ -18,9 +19,7 @@ void mm_init(uint32_t kernel_end){
     pheap_end = 0x400000;
     pheap_begin = pheap_end - (MAX_PAGE_ALIGNED_ALLOCS * 4096);
     heap_end = pheap_begin;
-    printf("MM_INIT: Use memset. heap_begin: 0x%x\n", heap_begin);
     memset((char*)heap_begin, 0, heap_end - heap_begin);
-    printf("MM_INIT: Use memset done\n");
     pheap_desc = (uint8_t*)malloc(MAX_PAGE_ALIGNED_ALLOCS);
     printf("Kernel heap start at: 0x%x\n", last_alloc);
 }
@@ -34,7 +33,7 @@ void free(void *mem)
 
 void pfree(void *mem)
 {
-    if((uint32_t)mem < pheap_begin || (uint32_t)mem > pheap_end) return;
+    if(mem < (void *)pheap_begin || mem > (void *)pheap_end) return;
     /* Determine which page is it */
     uint32_t ad = (uint32_t)mem;
     ad -= pheap_begin;
@@ -65,7 +64,7 @@ char* malloc(size_t size){
         if(a->size >= size){
             a->status = 1;
 
-            printf("RE:Allocated %d bytes from 0x%x to 0x%x\n", size, mem + sizeof(alloc_t), mem + sizeof(alloc_t) + size);
+            //printf("RE:Allocated %d bytes from 0x%x to 0x%x\n", size, mem + sizeof(alloc_t), mem + sizeof(alloc_t) + size);
             memset(mem + sizeof(alloc_t), 0, size);
             memory_used += size + sizeof(alloc_t);
             return ((char*)mem + sizeof(alloc_t));
@@ -78,6 +77,7 @@ char* malloc(size_t size){
 
     nalloc:;
     if(last_alloc+size+sizeof(alloc_t) >= heap_end){
+        set_task(0);
         panic("Cannot allocate %d bytes! Out of memory.\n", size);
     }
     alloc_t *alloc = (alloc_t*)last_alloc;
@@ -87,7 +87,7 @@ char* malloc(size_t size){
     last_alloc += size;
     last_alloc += sizeof(alloc_t);
     last_alloc += 4;
-    printf("Allocated %d bytes from 0x%x to 0x%x\n", size, (uint32_t)alloc + sizeof(alloc_t), last_alloc);
+    //printf("Allocated %d bytes from 0x%x to 0x%x\n", size, (uint32_t)alloc + sizeof(alloc_t), last_alloc);
     memory_used += size + 4 + sizeof(alloc_t);
     memset((char*)(uint32_t)last_alloc + sizeof(alloc_t), 0, size);
     return ((char*)(uint32_t)last_alloc + sizeof(alloc_t));

kernel/arch/i386/src/memory/memutils.c

@@ -1,6 +1,8 @@
 #include <memory/memory.h>
 #include <stdint.h>
 #include <stddef.h>
+#include <memory/mutex.h>
+
 
 void *memset16(void *ptr, uint16_t value, size_t num) {
     uint16_t *p = ptr;
@@ -18,11 +20,27 @@ void *memset(void *ptr, int value, size_t num) {
     return ptr;
 }
 
-void*memcpy(void*dst,const void*src,size_t n){
-    size_t i=0;
-    for(;i<(n&~7);i+=8)*(uint64_t*)((char*)dst+i)=*(const uint64_t*)((const char*)src+i);
-    if(i&4){           *(uint32_t*)((char*)dst+i)=*(const uint32_t*)((const char*)src+i);i+=4;}
-    if(i&2){           *(uint16_t*)((char*)dst+i)=*(const uint16_t*)((const char*)src+i);i+=2;}
-    if(i&1){           *(uint8_t *)((char*)dst+i)=*(const uint8_t *)((const char*)src+i);}
-    return dst;
+DEFINE_MUTEX(m_memcpy)
+void* memcpy(const void* dest, const void* src, size_t count )
+{
+	mutex_lock(&m_memcpy);
+	char* dst8 = (char*)dest;
+	char* src8 = (char*)src;
+
+	if (count & 1) {
+		dst8[0] = src8[0];
+		dst8 += 1;
+		src8 += 1;
+	}
+
+	count /= 2;
+	while (count--) {
+		dst8[0] = src8[0];
+		dst8[1] = src8[1];
+
+		dst8 += 2;
+		src8 += 2;
+	}
+	mutex_unlock(&m_memcpy);
+	return (void*)dest;
 }

kernel/arch/i386/src/threading/pit.c

@@ -2,6 +2,7 @@
 #include <threading/pit.h>
 #include <memory/pic.h>
 #include <stdio.h>
+#include <memory/hal.h>
 #include <threading/tasking.h>
 #include <stdint.h>