diff options
| author | Alexis211 <alexis211@gmail.com> | 2009-10-17 23:22:41 +0200 |
|---|---|---|
| committer | Alexis211 <alexis211@gmail.com> | 2009-10-17 23:22:41 +0200 |
| commit | 7dc8c19f7d6220c9e3dac43796faf77c4f11974f (patch) | |
| tree | 7a63b88ed80583198776ce706f85d528eff28b16 /Source/Kernel/Core | |
| parent | e35e95188674ae4802df2a511825218253d01d2c (diff) | |
| download | Melon-7dc8c19f7d6220c9e3dac43796faf77c4f11974f.tar.gz Melon-7dc8c19f7d6220c9e3dac43796faf77c4f11974f.zip | |
Melon now loads a simple ASM application out of the ramfs
The format is very simple, but an ELF loader is planned.
Diffstat (limited to 'Source/Kernel/Core')
| -rw-r--r-- | Source/Kernel/Core/kmain.wtf.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/Source/Kernel/Core/kmain.wtf.cpp b/Source/Kernel/Core/kmain.wtf.cpp index 655bd8b..87e95de 100644 --- a/Source/Kernel/Core/kmain.wtf.cpp +++ b/Source/Kernel/Core/kmain.wtf.cpp @@ -35,9 +35,6 @@ extern u32int end; //Placement address extern "C" void kmain(multiboot_info_t* mbd, u32int magic); -extern "C" void sample_task(); -extern u32int sample_task_size; - #define INFO(vt) vt->setColor(KVT_FGCOLOR); *vt << " - "; vt->setColor(KVT_LIGHTCOLOR); #define PROCESSING(vt, m) vt->setColor(KVT_BLECOLOR); *vt << " > "; vt->setColor(KVT_FGCOLOR); *vt << m; \ vt->setCursorCol(60); vt->setColor(KVT_LIGHTCOLOR); *vt << ": "; @@ -167,20 +164,12 @@ void kmain(multiboot_info_t* mbd, u32int magic) { FloppyController::detect(); Log::log(KL_STATUS, "kmain : Floppy drives detected"); - //Create dummy process, for testing user mode - Process* p; - p = new Process("dummy task", 0); - u8int *ptr = (u8int*)p->heap().alloc(sample_task_size); - memcpy(ptr, (const u8int*)sample_task, sample_task_size); - new Thread(p, (thread_entry_t)ptr, 0); - kernelPageDirectory->switchTo(); - asm volatile("sti"); Log::log(KL_STATUS, "kmain : Interrupts enabled."); new KernelShell(cwd); //No need to save that in a var, it is automatically destroyed anyways Log::log(KL_STATUS, "kmain : Kernel shell launched"); - kvt->unmap(); + //kvt->unmap(); while (KernelShell::getInstances() > 0) { Task::currThread()->sleep(100); |