diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.build | 15 | ||||
| -rw-r--r-- | src/Makefile.userprog | 28 | ||||
| -rw-r--r-- | src/examples/.gitignore | 2 | ||||
| -rw-r--r-- | src/examples/Makefile | 14 | ||||
| -rw-r--r-- | src/examples/rust.c | 6 | ||||
| -rw-r--r-- | src/examples/rust.h | 1 | ||||
| -rw-r--r-- | src/userprog/syscall.c | 36 |
7 files changed, 73 insertions, 29 deletions
diff --git a/src/Makefile.build b/src/Makefile.build index b5474f5..22de06f 100644 --- a/src/Makefile.build +++ b/src/Makefile.build @@ -78,8 +78,18 @@ DEPENDS = $(patsubst %.o,%.d,$(OBJECTS)) threads/kernel.lds.s: CPPFLAGS += -P threads/kernel.lds.s: threads/kernel.lds.S threads/loader.h -kernel.o: threads/kernel.lds.s $(OBJECTS) - $(LD) -T $< -o $@ $(OBJECTS) +LIBDIR_RUST = $(SRCDIR)/../kernel-rs + +LIB_RUST = libkernel-rs.a + +$(LIB_RUST): + (cd $(LIBDIR_RUST) && cargo build) + cp $(LIBDIR_RUST)/target/debug/libkernel.a $@ + +.PHONY: $(LIB_RUST) + +kernel.o: threads/kernel.lds.s $(OBJECTS) $(LIB_RUST) + $(LD) -T $< -o $@ $(OBJECTS) $(LIB_RUST) kernel.bin: kernel.o $(OBJCOPY) -O binary -R .note -R .comment -S $< $@.tmp @@ -96,6 +106,7 @@ os.dsk: loader.bin kernel.bin cat $^ > $@ clean:: + (cd $(LIBDIR_RUST) && cargo clean) rm -f $(OBJECTS) $(DEPENDS) rm -f threads/loader.o threads/kernel.lds.s threads/loader.d rm -f kernel.o kernel.lds.s diff --git a/src/Makefile.userprog b/src/Makefile.userprog index f7271fe..be47b48 100644 --- a/src/Makefile.userprog +++ b/src/Makefile.userprog @@ -8,6 +8,13 @@ $(PROGS): LDSCRIPT = $(SRCDIR)/lib/user/user.lds # filst04@liu 2014-01: Added to ignore the build-id located at offset 0. $(PROGS): LDFLAGS += $(LDFLAG_BUILD_ID) +# Duplicate for rs +$(PROGS_RS): CPPFLAGS += -I$(SRCDIR)/lib/user -I. +$(PROGS_RS): LDFLAGS = -nostdlib -static -Wl,-T,$(LDSCRIPT) +$(PROGS_RS): LDSCRIPT = $(SRCDIR)/lib/user/user.lds +# filst04@liu 2014-01: Added to ignore the build-id located at offset 0. +$(PROGS_RS): LDFLAGS += $(LDFLAG_BUILD_ID) + # Library code shared between kernel and user programs. lib_SRC = lib/debug.c # Debug code. lib_SRC += lib/random.c # Pseudo-random numbers. @@ -23,13 +30,14 @@ lib/user_SRC += lib/user/console.c # Console code. LIB_OBJ = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(lib_SRC) $(lib/user_SRC))) LIB_DEP = $(patsubst %.o,%.d,$(LIB_OBJ)) -LIB = lib/user/entry.o libc.a +LIB_ENTRY = lib/user/entry.o +LIB = $(LIB_ENTRY) libc.a PROGS_SRC = $(foreach prog,$(PROGS),$($(prog)_SRC)) PROGS_OBJ = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(PROGS_SRC))) PROGS_DEP = $(patsubst %.o,%.d,$(PROGS_OBJ)) -all: $(PROGS) +all: $(PROGS) $(PROGS_RS) # filst04@liu 2014-01: Needed to not break the system call functions # on modern Linux'es, works on SunOS too @@ -41,7 +49,19 @@ $(1): $$($(1)_OBJ) $$(LIB) $$(LDSCRIPT) $$(CC) $$(LDFLAGS) $$($(1)_OBJ) $$(LIB) -o $$@ endef +define TEMPLATE_RS +lib$(1).a: + (cd $$($(1)_SRC) && cargo build) + cp $$($(1)_SRC)/target/debug/lib$(1).a . +.PHONY: lib$(1).a +$(1): rust.o lib$(1).a $$(LIB_RUST) $$(LDSCRIPT) + $$(CC) $$(LDFLAGS) $$(LIB_ENTRY) rust.o lib$(1).a -o $$@ +clean:: + (cd $$($(1)_SRC) && cargo clean) +endef + $(foreach prog,$(PROGS),$(eval $(call TEMPLATE,$(prog)))) +$(foreach prog,$(PROGS_RS),$(eval $(call TEMPLATE_RS,$(prog)))) libc.a: $(LIB_OBJ) rm -f $@ @@ -49,8 +69,8 @@ libc.a: $(LIB_OBJ) ranlib $@ clean:: - rm -f $(PROGS) $(PROGS_OBJ) $(PROGS_DEP) - rm -f $(LIB_DEP) $(LIB_OBJ) lib/user/entry.[do] libc.a + rm -f $(PROGS) $(PROGS_RS) $(PROGS_OBJ) rust.o $(PROGS_DEP) rust.d + rm -f $(LIB_DEP) $(LIB_OBJ) lib/user/entry.[do] libc.a .PHONY: all clean diff --git a/src/examples/.gitignore b/src/examples/.gitignore index 850351e..3497886 100644 --- a/src/examples/.gitignore +++ b/src/examples/.gitignore @@ -37,3 +37,5 @@ dir_stress create_file create_remove_file *.d + +haltrs diff --git a/src/examples/Makefile b/src/examples/Makefile index 5b4f6c3..dd777ae 100644 --- a/src/examples/Makefile +++ b/src/examples/Makefile @@ -4,11 +4,15 @@ SRCDIR = .. # To add a new test, put its name on the PROGS list # and then add a name_SRC line that lists its source files. PROGS = cat cmp cp echo halt hex-dump ls mcat mcp mkdir pwd rm shell \ - bubsort insult lineup matmult recursor \ - sumargv pfs pfs_reader pfs_writer dummy longrun \ - child parent generic_parent longrun_interactive busy \ - line_echo file_syscall_tests longrun_nowait shellcode \ - crack overflow dir_stress create_file create_remove_file + bubsort insult lineup matmult recursor \ + sumargv pfs pfs_reader pfs_writer dummy longrun \ + child parent generic_parent longrun_interactive busy \ + line_echo file_syscall_tests longrun_nowait shellcode \ + crack overflow dir_stress create_file create_remove_file + +PROGS_RS = haltrs + +haltrs_SRC = $(SRCDIR)/../halt-rs # Added test programs sumargv_SRC = sumargv.c diff --git a/src/examples/rust.c b/src/examples/rust.c new file mode 100644 index 0000000..d6dae76 --- /dev/null +++ b/src/examples/rust.c @@ -0,0 +1,6 @@ +#include "rust.h" + +int main (int argc, char **argv) { + entry(); + return 0; +} diff --git a/src/examples/rust.h b/src/examples/rust.h new file mode 100644 index 0000000..926337e --- /dev/null +++ b/src/examples/rust.h @@ -0,0 +1 @@ +void entry(void); diff --git a/src/userprog/syscall.c b/src/userprog/syscall.c index 4d46978..ced27aa 100644 --- a/src/userprog/syscall.c +++ b/src/userprog/syscall.c @@ -41,21 +41,21 @@ const int argc[] = { 0 }; -static void -syscall_handler (struct intr_frame *f) -{ - int32_t* esp = (int32_t*)f->esp; - - switch ( 0 /* retrive syscall number */ ) - { - default: - { - printf ("Executed an unknown system call!\n"); - - printf ("Stack top + 0: %d\n", esp[0]); - printf ("Stack top + 1: %d\n", esp[1]); - - thread_exit (); - } - } -} +//static void +//syscall_handler (struct intr_frame *f) +//{ +// int32_t* esp = (int32_t*)f->esp; +// +// switch ( 0 /* retrive syscall number */ ) +// { +// default: +// { +// printf ("Executed an unknown system call!\n"); +// +// printf ("Stack top + 0: %d\n", esp[0]); +// printf ("Stack top + 1: %d\n", esp[1]); +// +// thread_exit (); +// } +// } +//} |