diff --git a/src/sys/init/main.c b/src/sys/init/main.c index 25ae891..58a1e70 100644 --- a/src/sys/init/main.c +++ b/src/sys/init/main.c @@ -58,7 +58,7 @@ #include #include -char kernelStack[8192]; // Stack Space For Our Kernel +static char kernelStack[8192]; // Stack Space For Our Kernel ubixDescriptorTable(ubixGDT,8) { {dummy:0}, @@ -173,7 +173,7 @@ kprintf("Free Pages: [%i]\n",freePages); kprintf("MemoryMap: [0x%X]\n",vmmMemoryMap); kprintf("Starting Os\n"); - kprintf("argc: %i:%i\n",argc,argv[0]); + kprintf("argc: %i:%s\n",argc,argv[0]); irqEnable(0x0); sched(); return(0x0); @@ -203,18 +203,18 @@ asm ("pushl $2; popf"); asm volatile( "lgdtl (loadGDT) \n" - "movw $0x10,%%ax \n" // Select Ring 0 Data Segment - "movw %%ax,%%ds \n" // Set Default Segment - "movw %%ax,%%es \n" // "" "" - "movw %%ax,%%fs \n" // "" "" - "movw %%ax,%%gs \n" // "" "" - "movw %%ax,%%ss \n" // "" "" - "movl $0x2000,%%esp \n" // Set Default Stack Pointer Its The End Of First Page + "movw $0x10,%%ax \n" /* Select Ring 0 Data Segment */ + "movw %%ax,%%ds \n" /* Set Default Segment */ + "movw %%ax,%%es \n" /* "" "" */ + "movw %%ax,%%fs \n" /* "" "" */ + "movw %%ax,%%gs \n" /* "" "" */ + "movw %%ax,%%ss \n" /* "" "" */ + "movl $0x2000,%%esp \n" /* Set Default Stack Pointer Its The End Of First Page */ "movl $0x2000,%%ebp \n" - "mov $0x18,%%ax \n" // Set Up Dummy LDT - "lldt %%ax \n" // Load The Dummy LDT - "mov $0x20,%%ax \n" // Set Up Dummy TSS - "ltr %%ax \n" // Load The Dummy TSS + "mov $0x18,%%ax \n" /* Set Up Dummy LDT */ + "lldt %%ax \n" /* Load The Dummy LDT */ + "mov $0x20,%%ax \n" /* Set Up Dummy TSS */ + "ltr %%ax \n" /* Load The Dummy TSS */ "ljmp $0x08,$next \n" "next: \n" : @@ -222,12 +222,15 @@ : "%eax" ); main(argc,argv); - kpanic("We Should Not Get This Far\n"); + kpanic("Error: kernel main returned.\n"); } /*** $Log$ + Revision 1.32 2004/06/04 17:33:33 reddawg + Changed idle task to system task + Revision 1.31 2004/06/04 10:19:42 reddawg notes: we compile again, thank g-d anyways i was about to cry