From eba74d74502641a4565dc6011db33742e8450680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Tue, 24 Nov 2020 15:08:20 +0100 Subject: move rust "libc" to separate crate and link with that instead --- halt-rs/Cargo.toml | 23 +++++++++++++++++++++++ halt-rs/rust-toolchain | 1 + halt-rs/src/lib.rs | 13 +++++++++++++ kernel/Makefile | 12 ------------ libpintos-rs/Cargo.toml | 16 ++++++++++++++++ libpintos-rs/build.rs | 4 ++++ libpintos-rs/rust-toolchain | 1 + libpintos-rs/src/lib.rs | 6 ++++++ rust/Cargo.toml | 20 -------------------- rust/Makefile | 17 ----------------- rust/rust-toolchain | 1 - rust/src/lib.rs | 16 ---------------- src/Makefile.build | 4 ++-- src/Makefile.userprog | 41 +++++++++++++++++++++++++---------------- src/examples/Makefile | 8 +++----- 15 files changed, 94 insertions(+), 89 deletions(-) create mode 100644 halt-rs/Cargo.toml create mode 100644 halt-rs/rust-toolchain create mode 100644 halt-rs/src/lib.rs delete mode 100644 kernel/Makefile create mode 100644 libpintos-rs/Cargo.toml create mode 100644 libpintos-rs/build.rs create mode 100644 libpintos-rs/rust-toolchain create mode 100644 libpintos-rs/src/lib.rs delete mode 100644 rust/Cargo.toml delete mode 100644 rust/Makefile delete mode 100644 rust/rust-toolchain delete mode 100644 rust/src/lib.rs diff --git a/halt-rs/Cargo.toml b/halt-rs/Cargo.toml new file mode 100644 index 0000000..7486789 --- /dev/null +++ b/halt-rs/Cargo.toml @@ -0,0 +1,23 @@ +[package] +name = "pintos-rs" +version = "0.1.0" +authors = ["Gustav Sörnäs "] +edition = "2018" + +[lib] +name = "haltrs" +crate-type = ["staticlib"] + +[profile.dev] +panic = "abort" + +[profile.release] +panic = "abort" + +[dependencies.libc] +version = "0.2" +default-features = false +features = ["extra_traits"] + +[dependencies.libpintos] +path = "../libpintos-rs" diff --git a/halt-rs/rust-toolchain b/halt-rs/rust-toolchain new file mode 100644 index 0000000..adfa491 --- /dev/null +++ b/halt-rs/rust-toolchain @@ -0,0 +1 @@ +nightly-i686-unknown-linux-gnu diff --git a/halt-rs/src/lib.rs b/halt-rs/src/lib.rs new file mode 100644 index 0000000..5455087 --- /dev/null +++ b/halt-rs/src/lib.rs @@ -0,0 +1,13 @@ +#![no_std] + +use libpintos::exit; + +#[panic_handler] +fn panic(_info: &core::panic::PanicInfo) -> ! { + loop {} +} + +#[no_mangle] +pub unsafe extern "C" fn entry() { + exit(0x69); +} diff --git a/kernel/Makefile b/kernel/Makefile deleted file mode 100644 index 49a4d42..0000000 --- a/kernel/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -all: debug - -debug: - cargo build - -release: - cargo build --release - -clean: - cargo clean - -.PHONY: all clean debug release diff --git a/libpintos-rs/Cargo.toml b/libpintos-rs/Cargo.toml new file mode 100644 index 0000000..e9293ad --- /dev/null +++ b/libpintos-rs/Cargo.toml @@ -0,0 +1,16 @@ +[package] +name = "libpintos" +version = "0.1.0" +authors = ["Gustav Sörnäs "] +edition = "2018" + +[profile.dev] +panic = "abort" + +[profile.release] +panic = "abort" + +[dependencies.libc] +version = "0.2" +default-features = false +features = ["extra_traits"] diff --git a/libpintos-rs/build.rs b/libpintos-rs/build.rs new file mode 100644 index 0000000..8b9cdb4 --- /dev/null +++ b/libpintos-rs/build.rs @@ -0,0 +1,4 @@ +fn main() { + println!("cargo:rustc-link-search=native=."); + println!("cargo:rustc-link-lib=static=pintos"); +} diff --git a/libpintos-rs/rust-toolchain b/libpintos-rs/rust-toolchain new file mode 100644 index 0000000..adfa491 --- /dev/null +++ b/libpintos-rs/rust-toolchain @@ -0,0 +1 @@ +nightly-i686-unknown-linux-gnu diff --git a/libpintos-rs/src/lib.rs b/libpintos-rs/src/lib.rs new file mode 100644 index 0000000..2ad4657 --- /dev/null +++ b/libpintos-rs/src/lib.rs @@ -0,0 +1,6 @@ +#![no_std] + +#[link(name="pintos", kind="static")] +extern { + pub fn exit(status: i32); +} diff --git a/rust/Cargo.toml b/rust/Cargo.toml deleted file mode 100644 index a74fdd6..0000000 --- a/rust/Cargo.toml +++ /dev/null @@ -1,20 +0,0 @@ -[package] -name = "pintos-rs" -version = "0.1.0" -authors = ["Gustav Sörnäs "] -edition = "2018" - -[lib] -name = "rust" -crate-type = ["staticlib"] - -[profile.dev] -panic = "abort" - -[profile.release] -panic = "abort" - -[dependencies.libc] -version = "0.2" -default-features = false -features = ["extra_traits"] diff --git a/rust/Makefile b/rust/Makefile deleted file mode 100644 index 39cae70..0000000 --- a/rust/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -all: debug - -debug: libpintos.a - cargo rustc -- -C link-arg= -L. - -release: libpintos.a - cargo rustc --release -- -C link-arg= -L. - -libpintos.a: - make -C ../src/examples libc.a - cp ../src/examples/libc.a libpintos.a - -clean: - cargo clean - rm -f libpintos.a - -.PHONY: all clean debug release libpintos.a diff --git a/rust/rust-toolchain b/rust/rust-toolchain deleted file mode 100644 index adfa491..0000000 --- a/rust/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -nightly-i686-unknown-linux-gnu diff --git a/rust/src/lib.rs b/rust/src/lib.rs deleted file mode 100644 index e64fbbd..0000000 --- a/rust/src/lib.rs +++ /dev/null @@ -1,16 +0,0 @@ -#![no_std] - -#[panic_handler] -fn panic(_info: &core::panic::PanicInfo) -> ! { - loop {} -} - -#[no_mangle] -pub unsafe extern "C" fn entry() { - exit(0x69); -} - -#[link(name="pintos", kind="static")] -extern { - fn exit(status: i32); -} diff --git a/src/Makefile.build b/src/Makefile.build index a9e5a23..1f0fa35 100644 --- a/src/Makefile.build +++ b/src/Makefile.build @@ -83,7 +83,7 @@ LIBDIR_RUST = $(SRCDIR)/../kernel LIB_RUST = libkernel-rs.a $(LIB_RUST): - make -C $(LIBDIR_RUST) debug + (cd $(LIBDIR_RUST) && cargo build) cp $(LIBDIR_RUST)/target/debug/libkernel.a $@ .PHONY: $(LIB_RUST) @@ -106,7 +106,7 @@ os.dsk: loader.bin kernel.bin cat $^ > $@ clean:: - make -C $(LIBDIR_RUST) 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 f15ec78..d6914cf 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,16 +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_RUST = lib/user/entry.o librust.a - -LIBDIR_RUST = $(SRCDIR)/../rust +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 @@ -40,27 +45,31 @@ lib/user/syscall.o: CPPFLAGS += -fno-omit-frame-pointer define TEMPLATE $(1)_OBJ = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$($(1)_SRC))) -$(1): $$($(1)_OBJ) $(2) $$(LDSCRIPT) - $$(CC) $$(LDFLAGS) $$($(1)_OBJ) $(2) -o $$@ +$(1): $$($(1)_OBJ) $$(LIB) $$(LDSCRIPT) + $$(CC) $$(LDFLAGS) $$($(1)_OBJ) $$(LIB) -o $$@ endef -$(foreach prog,$(PROGS),$(eval $(call TEMPLATE,$(prog),$(LIB)))) -$(foreach prog,$(PROGS_RUST),$(eval $(call TEMPLATE,$(prog),$(LIB_RUST)))) +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 $$@ +endef + +$(foreach prog,$(PROGS),$(eval $(call TEMPLATE,$(prog)))) +$(foreach prog,$(PROGS_RS),$(eval $(call TEMPLATE_RS,$(prog)))) libc.a: $(LIB_OBJ) rm -f $@ ar r $@ $^ ranlib $@ -librust.a: - make -C $(LIBDIR_RUST) debug - cp $(LIBDIR_RUST)/target/debug/librust.a $@ - clean:: rm -f $(PROGS) $(PROGS_OBJ) $(PROGS_DEP) - make -C $(LIBDIR_RUST) clean - rm -f $(LIB_DEP) $(LIB_OBJ) lib/user/entry.[do] libc.a librust.a + rm -f $(LIB_DEP) $(LIB_OBJ) lib/user/entry.[do] libc.a -.PHONY: all clean librust.a +.PHONY: all clean -include $(LIB_DEP) $(PROGS_DEP) diff --git a/src/examples/Makefile b/src/examples/Makefile index dba72c9..dd777ae 100644 --- a/src/examples/Makefile +++ b/src/examples/Makefile @@ -3,18 +3,16 @@ SRCDIR = .. # Test programs to compile, and a list of sources for each. # 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_C = cat cmp cp echo halt hex-dump ls mcat mcp mkdir pwd rm shell \ +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 -PROGS_RUST = rust +PROGS_RS = haltrs -PROGS = $(PROGS_C) $(PROGS_RUST) - -rust_SRC = rust.c +haltrs_SRC = $(SRCDIR)/../halt-rs # Added test programs sumargv_SRC = sumargv.c -- cgit v1.2.1