diff --git a/sys/i386/Makefile b/sys/i386/Makefile index 1e3207d..95a8bcb 100644 --- a/sys/i386/Makefile +++ b/sys/i386/Makefile @@ -6,7 +6,7 @@ include ../Makefile.incl # Objects -OBJS = support.o strcpy.o strcmp.o strncmp.o memset.o memcmp.o schedyield.o kpanic.o timer.o spinlock.o i386_exec.o sys_call_new.o sys_call.o bioscall.o fork.o systemtask.o sched.o cpu.o trap.o +OBJS = support.o strcpy.o strcmp.o strncmp.o memset.o memcmp.o schedyield.o kpanic.o timer.o spinlock.o i386_exec.o sys_call_posix.o sys_call.o bioscall.o fork.o systemtask.o sched.o cpu.o trap.o # ap-boot.o smp.o vitals.o(obsolete) all: $(OBJS) diff --git a/sys/i386/sys_call.S b/sys/i386/sys_call.S index 56a43d5..7844128 100644 --- a/sys/i386/sys_call.S +++ b/sys/i386/sys_call.S @@ -52,7 +52,7 @@ mov %eax,%fs cld push %esp -call syscall +call sys_call add $0x4,%esp cmpb $0x13,0x38(%esp) je _B4 diff --git a/sys/include/ubixos/syscall.h b/sys/include/ubixos/syscall.h index 09867a2..e824415 100644 --- a/sys/include/ubixos/syscall.h +++ b/sys/include/ubixos/syscall.h @@ -29,10 +29,10 @@ #ifndef _UBIXOS_SYSCALL_H #define _UBIXOS_SYSCALL_H -#include +#include void _sys_call(); -void sys_call(struct trapframe *frame) +void sys_call(struct trapframe *frame); int invalidCall(); void invalidCallINT(int); diff --git a/sys/include/ubixos/syscall_posix.h b/sys/include/ubixos/syscall_posix.h index f1bb998..a553a0e 100644 --- a/sys/include/ubixos/syscall_posix.h +++ b/sys/include/ubixos/syscall_posix.h @@ -29,7 +29,9 @@ #ifndef _UBIXOS_SYSCALL_POXIX_H #define _UBIXOS_SYSCALL_POSIX_H +#include + void _sys_call_posix(); -void sys_call_posix(struct trapframe *frame) +void sys_call_posix(struct trapframe *frame); #endif diff --git a/sys/kernel/syscall.c b/sys/kernel/syscall.c index 82cad2d..c9d8629 100644 --- a/sys/kernel/syscall.c +++ b/sys/kernel/syscall.c @@ -44,6 +44,10 @@ #include #include +void sys_call(struct trapframe *frame) { + asm("nop"); +} + //long fuword( const void *base ); //void sdeTestThread();