diff --git a/src/lib/libc/sys/fork.c b/src/lib/libc/sys/fork.c index a1a53dc..4082259 100755 --- a/src/lib/libc/sys/fork.c +++ b/src/lib/libc/sys/fork.c @@ -24,10 +24,9 @@ #include pid_t fork() { - pid_t pid = 2; + pid_t pid; asm( "movl $4,%%eax\n" -// "movl %0,%%ebx\n" "int $0x80 \n" : : "b" (&pid) diff --git a/ubixos.kdevprj b/ubixos.kdevprj index 3753005..49679b5 100755 --- a/ubixos.kdevprj +++ b/ubixos.kdevprj @@ -44,7 +44,7 @@ kdevprj_version=1.3 lfv_open_groups=Others make_options=\s-j1 clean all install -makefiles=./Makefile.am,src/Makefile.am,src/sys/Makefile.am,src/sys/include/Makefile.am,src/lib/Makefile.am,src/lib/libc/Makefile.am,src/lib/libc/include/Makefile.am,src/bin/Makefile.am,src/bin/shell/Makefile.am,Makefile.am,src/sys/boot/Makefile.am,src/sys/init/Makefile.am,src/sys/include/ubixos/Makefile.am,src/sys/drivers/Makefile.am,src/sys/kernel/Makefile.am,src/sys/compile/Makefile.am,src/sys/include/version/Makefile.am,src/sys/include/drivers/Makefile.am,src/sys/vmm/Makefile.am,src/sys/include/vmm/Makefile.am,src/sys/include/ubixfs/Makefile.am,src/sys/ubixfs/Makefile.am,src/tools/Makefile.am,src/bin/init/Makefile.am,src/lib/libc/stdio/Makefile.am,src/lib/libc/include/sys/Makefile.am,src/lib/libc/sys/Makefile.am,src/lib/libc/stdlib/Makefile.am,src/sys/misc/Makefile.am,src/sys/deviceman/Makefile.am,src/grayspace-misc/Makefile.am,src/sys/include/deviceman/Makefile.am,src/sys/include/misc/Makefile.am +makefiles=./Makefile.am,src/Makefile.am,src/sys/Makefile.am,src/sys/include/Makefile.am,src/lib/Makefile.am,src/lib/libc/Makefile.am,src/lib/libc/include/Makefile.am,src/bin/Makefile.am,src/bin/shell/Makefile.am,Makefile.am,src/sys/boot/Makefile.am,src/sys/init/Makefile.am,src/sys/include/ubixos/Makefile.am,src/sys/drivers/Makefile.am,src/sys/kernel/Makefile.am,src/sys/compile/Makefile.am,src/sys/include/version/Makefile.am,src/sys/include/drivers/Makefile.am,src/sys/vmm/Makefile.am,src/sys/include/vmm/Makefile.am,src/sys/include/ubixfs/Makefile.am,src/sys/ubixfs/Makefile.am,src/tools/Makefile.am,src/bin/init/Makefile.am,src/lib/libc/stdio/Makefile.am,src/lib/libc/include/sys/Makefile.am,src/lib/libc/sys/Makefile.am,src/lib/libc/stdlib/Makefile.am modifyMakefiles=true project_name=UbixOS project_type=normal_empty @@ -94,7 +94,7 @@ [src/Makefile.am] files= -sub_dirs=sys,lib,bin,tools,grayspace-misc +sub_dirs=sys,lib,bin,tools type=normal [src/bin/Makefile] @@ -142,17 +142,6 @@ install_location= type=SOURCE -[src/grayspace-misc/Makefile.am] -files=src/grayspace-misc/gsdefines.h -sub_dirs= -type=normal - -[src/grayspace-misc/gsdefines.h] -dist=true -install=false -install_location= -type=HEADER - [src/lib/Makefile.am] sub_dirs=libc, type=normal @@ -327,7 +316,7 @@ [src/sys/Makefile.am] files=src/sys/Makefile -sub_dirs=include,boot,init,drivers,kernel,compile,vmm,ubixfs,misc,deviceman +sub_dirs=include,boot,init,drivers,kernel,compile,vmm,ubixfs type=normal [src/sys/boot/Makefile] @@ -358,23 +347,6 @@ sub_dirs= type=normal -[src/sys/deviceman/Makefile] -dist=true -install=false -install_location= -type=DATA - -[src/sys/deviceman/Makefile.am] -files=src/sys/deviceman/Makefile,src/sys/deviceman/bus_resources_portio.c -sub_dirs= -type=static_library - -[src/sys/deviceman/bus_resources_portio.c] -dist=true -install=false -install_location= -type=SOURCE - [src/sys/drivers/8259.c] dist=true install=false @@ -412,44 +384,9 @@ [src/sys/include/Makefile.am] files=src/sys/include/stdarg.h -sub_dirs=ubixos,version,drivers,vmm,ubixfs,deviceman,misc +sub_dirs=ubixos,version,drivers,vmm,ubixfs type=normal -[src/sys/include/deviceman/Makefile.am] -files=src/sys/include/deviceman/bus.h,src/sys/include/deviceman/bus_resources.h,src/sys/include/deviceman/bus_resources_portio.h,src/sys/include/deviceman/device.h,src/sys/include/deviceman/isapnp.h -sub_dirs= -type=normal - -[src/sys/include/deviceman/bus.h] -dist=true -install=false -install_location= -type=HEADER - -[src/sys/include/deviceman/bus_resources.h] -dist=true -install=false -install_location= -type=HEADER - -[src/sys/include/deviceman/bus_resources_portio.h] -dist=true -install=false -install_location= -type=HEADER - -[src/sys/include/deviceman/device.h] -dist=true -install=false -install_location= -type=HEADER - -[src/sys/include/deviceman/isapnp.h] -dist=true -install=false -install_location= -type=HEADER - [src/sys/include/drivers/8259.h] dist=true install=false @@ -479,23 +416,6 @@ install_location= type=HEADER -[src/sys/include/misc/Makefile.am] -files=src/sys/include/misc/kernel_string_pool.h,src/sys/include/misc/misc_bit_array.h -sub_dirs= -type=normal - -[src/sys/include/misc/kernel_string_pool.h] -dist=true -install=false -install_location= -type=HEADER - -[src/sys/include/misc/misc_bit_array.h] -dist=true -install=false -install_location= -type=HEADER - [src/sys/include/stdarg.h] dist=true install=false @@ -520,7 +440,7 @@ type=HEADER [src/sys/include/ubixos/Makefile.am] -files=src/sys/include/ubixos/gdt.h,src/sys/include/ubixos/io.h,src/sys/include/ubixos/idt.h,src/sys/include/ubixos/exec.h,src/sys/include/ubixos/schedule.h,src/sys/include/ubixos/types.h,src/sys/include/ubixos/dma.h,src/sys/include/ubixos/idlethread.h,src/sys/include/ubixos/elf.h,src/sys/include/ubixos/syscall.h,src/sys/include/ubixos/syscalls.h,src/sys/include/ubixos/a.out.h +files=src/sys/include/ubixos/gdt.h,src/sys/include/ubixos/io.h,src/sys/include/ubixos/idt.h,src/sys/include/ubixos/exec.h,src/sys/include/ubixos/schedule.h,src/sys/include/ubixos/types.h,src/sys/include/ubixos/dma.h,src/sys/include/ubixos/idlethread.h,src/sys/include/ubixos/elf.h,src/sys/include/ubixos/syscall.h,src/sys/include/ubixos/syscalls.h,src/sys/include/ubixos/a.out.h,src/sys/include/ubixos/fork.h,src/sys/include/ubixos/bios32.h sub_dirs= type=normal @@ -530,6 +450,12 @@ install_location= type=HEADER +[src/sys/include/ubixos/bios32.h] +dist=true +install=false +install_location= +type=HEADER + [src/sys/include/ubixos/dma.h] dist=true install=false @@ -548,6 +474,12 @@ install_location= type=HEADER +[src/sys/include/ubixos/fork.h] +dist=true +install=false +install_location= +type=HEADER + [src/sys/include/ubixos/gdt.h] dist=true install=false @@ -650,7 +582,7 @@ type=DATA [src/sys/kernel/Makefile.am] -files=src/sys/kernel/Makefile,src/sys/kernel/io.c,src/sys/kernel/version.c,src/sys/kernel/kprintf.c,src/sys/kernel/vsprintf.c,src/sys/kernel/idt.c,src/sys/kernel/exec.c,src/sys/kernel/schedule.c,src/sys/kernel/dma.c,src/sys/kernel/idlethread.c,src/sys/kernel/syscall.c +files=src/sys/kernel/Makefile,src/sys/kernel/io.c,src/sys/kernel/version.c,src/sys/kernel/kprintf.c,src/sys/kernel/vsprintf.c,src/sys/kernel/idt.c,src/sys/kernel/exec.c,src/sys/kernel/schedule.c,src/sys/kernel/dma.c,src/sys/kernel/idlethread.c,src/sys/kernel/syscall.c,src/sys/kernel/fork.c sub_dirs= type=static_library @@ -666,6 +598,12 @@ install_location= type=SOURCE +[src/sys/kernel/fork.c] +dist=true +install=false +install_location= +type=SOURCE + [src/sys/kernel/idlethread.c] dist=true install=false @@ -714,39 +652,8 @@ install_location= type=SOURCE -[src/sys/misc/Makefile] -dist=true -install=false -install_location= -type=DATA - -[src/sys/misc/Makefile.am] -files=src/sys/misc/kernel_string_pool.c,src/sys/misc/misc_bit_array.c,src/sys/misc/Makefile -sharedlib_LDFLAGS=-version-info 0:0:1 -sharedlib_rootname=misc -sub_dirs= -type=static_library - -[src/sys/misc/kernel_string_pool.c] -dist=true -install=false -install_location= -type=SOURCE - -[src/sys/misc/misc_bit_array.c] -dist=true -install=false -install_location= -type=SOURCE - -[src/sys/ubixfs/Makefile] -dist=true -install=false -install_location= -type=DATA - [src/sys/ubixfs/Makefile.am] -files=src/sys/ubixfs/ubixfs.c,src/sys/ubixfs/file.c,src/sys/ubixfs/Makefile +files=src/sys/ubixfs/ubixfs.c,src/sys/ubixfs/file.c sharedlib_LDFLAGS=-version-info 0:0:1 sharedlib_rootname=ubixfs sub_dirs= @@ -787,51 +694,15 @@ install_location= type=SOURCE -[src/tools/Makefile] -dist=true -install=false -install_location= -type=DATA - [src/tools/Makefile.am] -files=src/tools/format.c,src/tools/ubixfs.h,src/tools/Makefile,src/tools/build_isa_pnp_files.c,src/tools/build_isa_pnp_files.h,src/tools/make_kernel_string_pool.c,src/tools/make_kernel_string_pool.h +files=src/tools/format.c sharedlib_LDFLAGS=-version-info 0:0:1 sharedlib_rootname=tools sub_dirs= type=static_library -[src/tools/build_isa_pnp_files.c] -dist=true -install=false -install_location= -type=SOURCE - -[src/tools/build_isa_pnp_files.h] -dist=true -install=false -install_location= -type=HEADER - [src/tools/format.c] dist=true install=false install_location= type=SOURCE - -[src/tools/make_kernel_string_pool.c] -dist=true -install=false -install_location= -type=SOURCE - -[src/tools/make_kernel_string_pool.h] -dist=true -install=false -install_location= -type=HEADER - -[src/tools/ubixfs.h] -dist=true -install=false -install_location= -type=HEADER