diff --git a/src/bin/shell/Makefile b/src/bin/shell/Makefile index b9361df..8888ec9 100755 --- a/src/bin/shell/Makefile +++ b/src/bin/shell/Makefile @@ -20,7 +20,7 @@ # Link the kernel statically with fixed text+data address @1M $(BINARY) : $(OBJS) - $(LD) -o $@ ../../lib/libc/stdio/*.o ../../lib/libc/stdlib/*.o ../../lib/libc/sys/*.o $(OBJS) #-Ttext 0x9C0000 + $(LD) -o $@ ../../lib/libc/stdio/*.o ../../lib/libc/stdlib/*.o ../../lib/libc/sys/*.o $(OBJS) # Compile the source files .cc.o: diff --git a/src/sys/Makefile b/src/sys/Makefile index 75a53d9..ef3847c 100755 --- a/src/sys/Makefile +++ b/src/sys/Makefile @@ -1,7 +1,7 @@ # $Id$ # Kernel Makefile (C) 2002 The UbixOS Project -all: boot-code init-code kernel-code driver-code vmm-code ubixfs-code kernel-img +all: boot-code init-code kernel-code driver-code vmm-code ubixfs-code graphics-code kernel-img boot-code: boot (cd boot;make) @@ -19,7 +19,10 @@ (cd vmm;make) ubixfs-code: ubixfs - (cd ubixfs;make); + (cd ubixfs;make) + +graphics-code: graphics + (cd graphics;make) kernel-img: compile (/bin/echo "/* " > ./compile/null.c) @@ -39,4 +42,5 @@ (cd compile;make clean) (cd vmm;make clean) (cd ubixfs;make clean) + (cd graphics;make clean) (cd ../tools/;make clean) diff --git a/src/sys/boot/Makefile b/src/sys/boot/Makefile index 07a288b..0ad0afb 100755 --- a/src/sys/boot/Makefile +++ b/src/sys/boot/Makefile @@ -23,4 +23,4 @@ (./format 60 2 bin help.txt readme.txt) clean: - (rm -f writeimg format bootsec) + (rm -f writeimg format bootsec *.core) diff --git a/src/sys/init/main.c b/src/sys/init/main.c index 549e9aa..d2f7e80 100755 --- a/src/sys/init/main.c +++ b/src/sys/init/main.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include diff --git a/src/sys/kernel/exec.c b/src/sys/kernel/exec.c index cc53fa1..4c5c18b 100755 --- a/src/sys/kernel/exec.c +++ b/src/sys/kernel/exec.c @@ -35,8 +35,7 @@ newLoc[x] = binarySpace[x]; } eStart = binaryHeader->eEntry; - kprintf("Fuck[%s][%i][%i]",file,eStart,programHeader->phVaddr); - execThread((void *)eStart,eStart-1,file); + execThread((void *)eStart,0xCFFF,file); return(0); }