Changeset 23 for trunk/Makefile

Timestamp:

Jun 18, 2017, 10:06:41 PM (8 years ago)

Author:

alain

Message:

Introduce syscalls.

File:

• trunk/Makefile (modified) (10 diffs)

trunk/Makefile

@@ -84 +84 @@
               build/kernel/kern/core.o            \
               build/kernel/kern/dqdt.o            \
-              build/kernel/kern/remote_sem.o      \
               build/kernel/kern/do_syscall.o      \
               build/kernel/kern/do_interrupt.o    \
               build/kernel/kern/do_exception.o    \
-              build/kernel/kern/rpc.o
+              build/kernel/kern/rpc.o             \
+              build/kernel/kern/signal.o
 
 HAL_OBJS    = build/kernel/hal/hal_special.o      \
@@ -133 +133 @@
               build/kernel/libk/remote_rwlock.o   \
               build/kernel/libk/remote_fifo.o     \
+              build/kernel/libk/remote_mutex.o    \
+              build/kernel/libk/remote_sem.o      \
+              build/kernel/libk/remote_condvar.o  \
               build/kernel/libk/memcpy.o          \
+              build/kernel/libk/htab.o            \
               build/kernel/libk/xhtab.o
 
 SYS_OBJS_0  = build/kernel/syscalls/sys_thread_exit.o     \
-              build/kernel/syscalls/sys_thread_mmap.o     \
+              build/kernel/syscalls/sys_mmap.o            \
               build/kernel/syscalls/sys_thread_create.o   \
               build/kernel/syscalls/sys_thread_join.o     \
@@ -143 +147 @@
               build/kernel/syscalls/sys_thread_yield.o    \
               build/kernel/syscalls/sys_sem.o             \
-              build/kernel/syscalls/sys_cond_var.o        \
+              build/kernel/syscalls/sys_condvar.o         \
               build/kernel/syscalls/sys_barrier.o         \
-              build/kernel/syscalls/sys_rwlock.o 
+              build/kernel/syscalls/sys_mutex.o
 
 SYS_OBJS_1  = build/kernel/syscalls/sys_thread_sleep.o    \
-              build/kernel/syscalls/sys_thread_wakup.o    \
+              build/kernel/syscalls/sys_thread_wakeup.o   \
               build/kernel/syscalls/sys_open.o            \
               build/kernel/syscalls/sys_creat.o           \
@@ -156 +160 @@
               build/kernel/syscalls/sys_close.o           \
               build/kernel/syscalls/sys_unlink.o          \
-              build/kernel/syscalls/sys_pipe.o 
+              build/kernel/syscalls/sys_pipe.o
 
 SYS_OBJS_2  = build/kernel/syscalls/sys_chdir.o           \
@@ -167 +171 @@
               build/kernel/syscalls/sys_clock.o           \
               build/kernel/syscalls/sys_alarm.o           \
-              build/kernel/syscalls/sys_dma_memcpy.o
+              build/kernel/syscalls/sys_rmdir.o    
 
 SYS_OBJS_3  = build/kernel/syscalls/sys_utls.o            \
-              build/kernel/syscalls/sys_notAvailable.o    \
+              build/kernel/syscalls/sys_chmod.o           \
               build/kernel/syscalls/sys_signal.o          \
-              build/kernel/syscalls/sys_sigreturn_setup.o \
-              build/kernel/syscalls/sys_sigkill.o         \
+              build/kernel/syscalls/sys_gettimeofday.o    \
+              build/kernel/syscalls/sys_kill.o            \
               build/kernel/syscalls/sys_getpid.o          \
               build/kernel/syscalls/sys_fork.o            \
               build/kernel/syscalls/sys_exec.o            \
-              build/kernel/syscalls/sys_thread_getattr.o  \
-              build/kernel/syscalls/sys_ps.o         
+              build/kernel/syscalls/sys_stat.o            \
+              build/kernel/syscalls/sys_trace.o         
 
 SYS_OBJS_4  = build/kernel/syscalls/sys_madvise.o         \
@@ -196 +200 @@
 VFS_OBJS    = build/kernel/vfs/vfs.o              \
               build/kernel/vfs/fatfs.o            \
+              build/kernel/vfs/devfs.o            \
               build/kernel/vfs/ramfs.o
 
@@ -209 +214 @@
                  -Ikernel/mm             \
                  -Ikernel/vfs            \
-                 -Ikernel/fs/fatfs       \
-                 -Ikernel/fs/sysfs       \
-                 -Ikernel/fs/ramfs       \
-                 -Ikernel/fs/devfs       \
+                 -Ikernel/fatfs          \
+                 -Ikernel/sysfs          \
+                 -Ikernel/ramfs          \
+                 -Ikernel/devfs          \
                  -Itools/arch_info       \
                  -Ihal/generic           \
@@ -468 +473 @@
 # Rules to generate kernel/vfs objects
 build/kernel/vfs/%.o:           kernel/vfs/%.c              \
-                                kernel/vfs/vfs.h            \
+                                kernel/vfs/%.h              \
                                 kernel_config.h             \
                                 hal/tsar_mips32/hal_types.h
@@ -483 +488 @@
                                 $(DRIVERS_OBJS)             \
                                 $(VFS_OBJS)                 \
+                                $(SYS_OBJS_0)               \
+                                $(SYS_OBJS_1)               \
+                                $(SYS_OBJS_2)               \
+                                $(SYS_OBJS_3)               \
                                                                 kernel/kernel.ld            
         $(LD) -o $@ -T kernel/kernel.ld                         \
@@ -488 +497 @@
           $(LIBK_OBJS) $(DRIVERS_OBJS) $(VFS_OBJS)          \
           $(SYS_OBJS_0) $(SYS_OBJS_1) $(SYS_OBJS_2)         \
-          $(SYS_OBJS_3) $(SYS_OBJS_4) $(SYS_OBJS_5)
+          $(SYS_OBJS_3)
           
+
+#   $(SYS_OBJS_4) $(SYS_OBJS_5)
+          
         $(DU) -D $@ > $@.txt
         mcopy -o -i $(DISK_IMAGE) build/kernel/kernel.elf ::/bin/kernel