Add Rust support

Author: progbits

.gitignore

@@ -1,6 +1,7 @@
 *~
 _*
 *.o
+*.a
 *.d
 *.asm
 *.sym

Makefile

@@ -146,7 +146,15 @@ tags: $(OBJS) entryother.S _init
 vectors.S: vectors.pl
 	./vectors.pl > vectors.S
 
-ULIB = ulib.o usys.o printf.o umalloc.o
+# Rust library.
+libxv6.a: $(shell find rust -type f -not -path "*/target/*")
+	cd rust && \
+	cargo build --release && \
+	cd ../ && \
+	cp rust/target/i686-unknown-linux-gnu/release/libxv6.a libxv6.a
+
+# User space libraries.
+ULIB = ulib.o usys.o printf.o umalloc.o libxv6.a
 
 _%: %.o $(ULIB)
 	$(LD) $(LDFLAGS) -N -e main -Ttext 0 -o $@ $^
@@ -170,7 +178,6 @@ mkfs: mkfs.c fs.h
 
 UPROGS=\
 	_cat\
-	_nc\
 	_echo\
 	_forktest\
 	_grep\
@@ -179,6 +186,7 @@ UPROGS=\
 	_ln\
 	_ls\
 	_mkdir\
+	_nc\
 	_rm\
 	_sh\
 	_stressfs\

rust/.cargo/config.toml

@@ -0,0 +1,3 @@
+[build]
+target = ["i686-unknown-linux-gnu"]
+

rust/.gitignore

@@ -0,0 +1,5 @@
+debug/
+target/
+Cargo.lock
+**/*.rs.bk
+

rust/Cargo.toml

@@ -0,0 +1,13 @@
+[lib]
+crate-type = [ "staticlib" ]
+
+[package]
+name = "xv6"
+version = "0.1.0"
+edition = "2021"
+
+[profile.dev]
+panic = "abort"
+
+[profile.release]
+panic = "abort"

rust/src/lib.rs

@@ -0,0 +1,24 @@
+#![no_std]
+#![feature(c_variadic)]
+
+use core::panic::PanicInfo;
+
+#[panic_handler]
+fn panic(_: &PanicInfo) -> ! {
+    unsafe {
+        printf(1, "panic!".as_ptr());
+    }
+    loop {}
+}
+
+extern "C" {
+    // printf.c
+    pub fn printf(fd: i32, c: *const u8, args: ...);
+}
+
+#[no_mangle]
+fn hello_world() {
+    unsafe {
+        printf(1, "hello from Rust!\n".as_bytes().as_ptr());
+    }
+}