diff --git a/src/Makefile b/src/Makefile index f3e83e0..da8eb8b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -52,21 +52,7 @@ @echo "World Build For ${_ARCH} Completed On `LC_ALL=C date`" @echo "***************************************************************" -install-kernel: - @echo - @echo "***************************************************************" - @echo "Kernel Install For ${_ARCH} Started On `LC_ALL=C date`" - @echo "***************************************************************" - @echo - @echo "***************************************************************" - @echo "Step 1: Copy Kernel" - @echo "***************************************************************" - cp sys/compile/kernel ${ROOT}/boot/kernel/ - sync - @echo - @echo "***************************************************************" - @echo "Kernel Install For ${_ARCH} Completed On `LC_ALL=C date`" - @echo "***************************************************************" + install-world: @echo @@ -99,7 +85,8 @@ clean-kernel: (cd sys;${KMAKE} clean) -install: install-kernel install-world +install: install-world + (cd sys;${KMAKE} install kernel) clean: (cd sys;${KMAKE} clean) diff --git a/src/sys/i386/fork.c b/src/sys/i386/fork.c index 0256d74..4f4d4e3 100644 --- a/src/sys/i386/fork.c +++ b/src/sys/i386/fork.c @@ -101,7 +101,7 @@ sched_yield(); /* Return Id of Proccess */ - kprintf( "Returning! [%i]", _current->id ); + kprintf("Returning! [%i]\n", _current->id); return (newProcess->id); } diff --git a/src/sys/i386/i386_exec.c b/src/sys/i386/i386_exec.c index 5cd7dee..451182f 100644 --- a/src/sys/i386/i386_exec.c +++ b/src/sys/i386/i386_exec.c @@ -505,7 +505,7 @@ } } - if ( programHeader[i].phFlags & PF_X && text_size < seg_size ) { + if ((programHeader[i].phFlags & PF_X) && text_size < seg_size) { kprintf( "setting text: 0x%X - 0x%X\n", seg_addr, seg_size ); text_size = seg_size; text_addr = seg_addr; diff --git a/src/sys/i386/syscall.c b/src/sys/i386/syscall.c index 8e89e85..3c4d3c2 100644 --- a/src/sys/i386/syscall.c +++ b/src/sys/i386/syscall.c @@ -48,9 +48,9 @@ #include #include -long fuword( const void *base ); +//long fuword( const void *base ); -void sdeTestThread(); +//void sdeTestThread(); int InvalidSystemCall() { kprintf( "attempt was made to an invalid system call\n" ); diff --git a/src/sys/vmm/paging.c b/src/sys/vmm/paging.c index b4a6280..0bfd7eb 100644 --- a/src/sys/vmm/paging.c +++ b/src/sys/vmm/paging.c @@ -640,7 +640,7 @@ pageTableSrc[y] = 0x0; } else if ( (pageTableSrc[y] & PAGE_STACK) == PAGE_STACK ) { - //kprintf( "Page Stack!: 0x%X", (x * 0x400000) + (y * 0x1000) ); + kprintf("Page Stack!: 0x%X", (x * 0x400000) + (y * 0x1000)); // pageTableSrc[y] = 0x0; //MrOlsen (2016-01-18) NOTE: WHat should I Do Here? kprintf( "STACK: (%i:%i)", x, y ); }