diff --git a/src/bin/clock/main.c b/src/bin/clock/main.c index 81ce9e0..d7c7f49 100644 --- a/src/bin/clock/main.c +++ b/src/bin/clock/main.c @@ -92,9 +92,11 @@ sec = sysTime; printf("[%s][%02d/%02d/%i, %02d:%02d.%02d]\n",argv[0],month,day,year,hour,min,sec); + /* for (i = 0x0;i < argc;i++) { printf("argv[%i](0x%X:%s),__progrname(%s), argc: %i\n",i,argv[i],argv[i],__progname,argc); } + */ return(0); } diff --git a/src/bin/shell/exec.c b/src/bin/shell/exec.c index c9406c8..6a2ee04 100644 --- a/src/bin/shell/exec.c +++ b/src/bin/shell/exec.c @@ -37,11 +37,13 @@ //printf("Executing App\n"); cPid = fork(); +printf("Forked: [%i]\n", cPid); if (!cPid) { sprintf(file, "%s%s", cwd, data->argv[1]); // if (boo == 0) - execve(file,data->argv, 0x0); + //execve(file,data->argv, 0x0); + execve(file,0x0, 0x0); /* else execn(file,&data->argv); diff --git a/src/sys/i386/i386_exec.c b/src/sys/i386/i386_exec.c index cd95429..fda818f 100644 --- a/src/sys/i386/i386_exec.c +++ b/src/sys/i386/i386_exec.c @@ -428,8 +428,9 @@ _current->imageFd = fd; //! Clean the virtual of COW pages left over from the fork - vmm_cleanVirtualSpace( (u_int32_t) _current->td.vm_daddr + (_current->td.vm_dsize << PAGE_SHIFT) ); + //vmm_cleanVirtualSpace( (u_int32_t) _current->td.vm_daddr + (_current->td.vm_dsize << PAGE_SHIFT) ); //MrOlsen 2017-12-15 - FIX! - This should be done before it was causing a lot of problems why did I free space after loading binary???? + vmm_cleanVirtualSpace( (u_int32_t) 0x8048000 ); /* Load ELF Header */ if ( (binaryHeader = (elfHeader *) kmalloc( sizeof(elfHeader) )) == 0x0 ) @@ -575,6 +576,8 @@ tmp = (void *) elfDynamicS[i].dynPtr; if ( tmp == 0x0 ) kpanic( "tmp: NULL\n" ); + else + kprintf("[0x%X]", tmp); tmp[2] = (uInt32) ldAddr; tmp[1] = (uInt32) fd; break; @@ -586,6 +589,7 @@ */ } } + kprintf("WTF"); /* _current->td.vm_dsize = seg_size >> PAGE_SHIFT; _current->td.vm_daddr = (char *) seg_addr;