diff --git a/src/Makefile b/src/Makefile index 0e3ce8f..f3e83e0 100644 --- a/src/Makefile +++ b/src/Makefile @@ -24,29 +24,7 @@ # depend kernel tools kernel: - @echo - @echo "***************************************************************" - @echo "Kernel Build For ${_ARCH} Started On `LC_ALL=C date`" - @echo "***************************************************************" - @echo - @echo "***************************************************************" - @echo "Step 1: Clean Kernel" - @echo "***************************************************************" - #cd ${KERNEL_SRC}; ${KMAKE} ${CLEANDIR} - @echo - @echo "***************************************************************" - @echo "Step 2: Build Kernel Objects" - @echo "***************************************************************" - cd ${KERNEL_SRC}; ${KMAKE} all - @echo - @echo "***************************************************************" - @echo "Step 3: Link Kernel Objects" - @echo "***************************************************************" - cd ${KERNEL_SRC}; ${KMAKE} all - @echo - @echo "***************************************************************" - @echo "Kernel Build For ${_ARCH} Completed On `LC_ALL=C date`" - @echo "***************************************************************" + @cd sys;make world: @echo diff --git a/src/sys/i386/i386_exec.c b/src/sys/i386/i386_exec.c index 34ecee0..5cd7dee 100644 --- a/src/sys/i386/i386_exec.c +++ b/src/sys/i386/i386_exec.c @@ -265,7 +265,7 @@ } _current->oInfo.vmStart = 0x80000000; - _current->td.vm_daddr = (char *) (programHeader[i].phVaddr & 0xFFFFF000); + _current->td.vm_daddr = (u_long) (programHeader[i].phVaddr & 0xFFFFF000); /* Now Load Section To Memory */ fseek( tmpFd, programHeader[i].phOffset, 0 ); fread( (void *) programHeader[i].phVaddr, programHeader[i].phFilesz, 1, tmpFd ); @@ -281,7 +281,7 @@ /* Set Virtual Memory Start */ _current->oInfo.vmStart = 0x80000000; - _current->td.vm_daddr = (char *) (programHeader[i].phVaddr & 0xFFFFF000); + _current->td.vm_daddr = (u_long) (programHeader[i].phVaddr & 0xFFFFF000); /* Set Up Stack Space */ //MrOlsen (2016-01-14) FIX: is the stack start supposed to be addressable xhcnage x= 1 to x=0 @@ -799,7 +799,7 @@ } else { _current->td.vm_dsize = seg_size >> PAGE_SHIFT; - _current->td.vm_daddr = (char *) seg_addr; + _current->td.vm_daddr = (u_long) seg_addr; } _current->oInfo.vmStart = ((programHeader[i].phVaddr & 0xFFFFF000) + 0xA900000); @@ -831,10 +831,10 @@ kprintf( "[0x%X][0x%X]\n", eip, addr ); _current->td.vm_dsize = seg_size >> PAGE_SHIFT; - _current->td.vm_daddr = (char *) seg_addr; + _current->td.vm_daddr = (u_long) seg_addr; //! copy in arg strings - argv = ap; + argv = (char **)ap; if ( argv[1] != 0x0 ) { argc = (int) argv[0]; diff --git a/src/sys/i386/syscall.c b/src/sys/i386/syscall.c index e3f2903..8e89e85 100644 --- a/src/sys/i386/syscall.c +++ b/src/sys/i386/syscall.c @@ -124,7 +124,7 @@ ************************************************************************/ int sysGetFreePage( struct thread *td, u_int32_t *count) { kprintf("sysGetFreePage - Count: %i\n", *count); - return(vmmGetFreeVirtualPage(_current->id, *count, VM_THRD)); + return((int) vmmGetFreeVirtualPage(_current->id, *count, VM_THRD)); //return(vmmGetFreeVirtualPage(_current->id, *count, VM_TASK)); }