use cargo for rust stuff

flake.nix

@@ -4,11 +4,18 @@
   inputs = {
     nixpkgs.url = "nixpkgs/nixpkgs-unstable";
     flake-utils.url = "github:numtide/flake-utils";
+    rust-overlay = {
+      url = "github:oxalica/rust-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = { self, nixpkgs, flake-utils }: { } // flake-utils.lib.eachDefaultSystem (system:
+  outputs = { self, nixpkgs, flake-utils, rust-overlay }: { } // flake-utils.lib.eachDefaultSystem (system:
     let
-      pkgs = import nixpkgs { inherit system; };
+      pkgs = import nixpkgs {
+        inherit system;
+        overlays = [ rust-overlay.overlays.default ];
+      };
     in
     {
       devShells = {

kernel/rust/Makefile

@@ -1,3 +1 @@
-obj-d += libkernel
-
-obj-$(CONFIG_RUST_SUPPORT) += test.ors
+obj-d += rlibk

kernel/rust/rlibk/.gitignore

@@ -0,0 +1,2 @@
+/target
+/librlibk.a

kernel/rust/rlibk/Cargo.toml

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

kernel/rust/rlibk/Makefile

@@ -0,0 +1,9 @@
+lib-$(CONFIG_RUST_SUPPORT) += librlibk.a
+
+# FIXME: figure out the rust target stuff
+RUST_TARGET := i686-unknown-linux-gnu
+
+$(objtree)/librlibk.a: $(objtree)/src/**
+	@#FIXME: get rid of the copy, stupid
+	@cd $(dir $@) && cargo build --release --target $(RUST_TARGET)
+	@cp $(dir $@)target/$(RUST_TARGET)/release/librlibk.a $@

kernel/rust/rlibk/src/lib.rs

@@ -0,0 +1,5 @@
+#![no_std]
+#![no_main]
+
+mod panic;
+mod test;

kernel/rust/rlibk/src/panic.rs

@@ -0,0 +1,6 @@
+use core::panic::PanicInfo;
+
+#[panic_handler]
+fn panic(_panic: &PanicInfo<'_>) -> ! {
+    loop {}
+}

kernel/rust/libkernel/bindings/kprintf.rs → kernel/rust/rlibk/src/test.rs

@@ -1,3 +1,5 @@
+use core::convert::TryFrom;
+
 pub const KP_EMERG: core::ffi::c_int = 0;
 pub const KP_ALERT: core::ffi::c_int = 1;
 pub const KP_CRIT: core::ffi::c_int = 2;
@@ -9,3 +11,13 @@ pub const KP_DEBUG: core::ffi::c_int = 7;
 extern "C" {
     pub fn kprintf(loglevel: core::ffi::c_int, fmt: *const core::ffi::c_char, ...);
 }
+
+#[no_mangle]
+pub extern "C" fn rust_test(n: i32) -> i32 {
+    unsafe {
+        kprintf(KP_INFO, "Hi from Rust :3 :3 number: %u\n".as_bytes().as_ptr() as *const i8, n);
+    }
+    let bytes: [u8; 3] = [1, 0, 2];
+    u16::from_le_bytes(<[u8; 2]>::try_from(&bytes[0..2]).unwrap());
+    return n;
+}

nix-shells/IA-32.nix

@@ -9,6 +9,13 @@ pkgs.stdenv.mkDerivation {
     cross.binutils
     cross.gcc
     nasm
+
+    # Rust stuff
+    (rust-bin.stable.latest.default.override
+      {
+        targets = [ "i686-unknown-linux-gnu" ];
+      }
+    )
   ] ++ common.commonPkgs ++ common.limine ++ common.grub ++ common.fatTools;
 
   shellHook = common.shellHook + ''