feat/ffi-rust

src/kernel/Makefile

@@ -20,7 +20,8 @@ OBJS_BOOTPACK = \
 	$(OUT_DIR)/kernel/obj/tek.o \
 	$(OUT_DIR)/lib/libstdio.a \
 	$(OUT_DIR)/lib/libstring.a \
-	$(OUT_DIR)/lib/libstdlib.a
+	$(OUT_DIR)/lib/libstdlib.a \
+	$(OUT_DIR)/kernel/rust/rustlib.a # FIXME: いい感じにリンクできない
 
 PREMAKE = \
 	mkdir -p $(OUT_DIR)/kernel/obj &&\
@@ -32,11 +33,15 @@ MAKE = make -r
 DEL = rm -f
 
 CC = i386-elf-gcc
+# FIXME: いい感じにリンクできない
+# CFLAGS = -m32 -fno-builtin -L$(OUT_DIR)/kernel/rust/rustlib.a
 CFLAGS = -m32 -fno-builtin
+# COPTION = -march=i486 -nostdlib -L $(OUT_DIR)/kernel/rust/rustlib.a
 COPTION = -march=i486 -nostdlib
 
 default :
 	$(PREMAKE)
+	$(MAKE) -C rust
 	$(MAKE) $(OUT_DIR)/kernel/ipl10.bin
 	$(MAKE) $(OUT_DIR)/kernel/vaughan.sys
 

src/kernel/boot.c

@@ -1,6 +1,8 @@
 #include "boot.h"
 
 void Boot(void) {
+    int rust_int = rust_function();
+
     struct BootInfo *binfo = (struct BootInfo *)ADR_BOOT_INFO;
 
     /* event queue */

src/kernel/boot.h

@@ -1,5 +1,6 @@
 #include "../include/stdio.h"
 #include "../include/string.h"
+#include "rust.h"
 
 /*
  *

src/kernel/rust.h

@@ -0,0 +1 @@
+int rust_function(void);

src/kernel/rust/.cargo/config.toml

@@ -0,0 +1,8 @@
+[build]
+target = "dos.json"
+
+[unstable]
+build-std = ["core"]
+
+[target.dos]
+linker = "x86_64-elf-gcc"

src/kernel/rust/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "rust"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+
+[profile.dev]
+opt-level = 1
+
+[profile.release]
+opt-level = "s" #or "z"

src/kernel/rust/Makefile

@@ -0,0 +1,12 @@
+MAKE = make -r
+OUT_DIR = ../../../target
+
+default :
+	mkdir -p $(OUT_DIR)/kernel/rust
+	$(MAKE) $(OUT_DIR)/kernel/rust/rustlib.a
+
+$(OUT_DIR)/kernel/rust/rustlib.a: target/dos/release/librust.rlib
+	i386-elf-ar rcs $@ target/dos/release/librust.rlib
+
+target/dos/release/librust.rlib:
+	cargo build --release --target=dos.json

src/kernel/rust/dos.json

@@ -0,0 +1,36 @@
+{
+  "arch": "x86",
+  "cpu": "i386",
+  "data-layout": "e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128",
+  "disable-redzone": true,
+  "dynamic-linking": false,
+  "exe-suffix": ".com",
+  "executables": false,
+  "features": "-mmx,-sse,+soft-float",
+  "linker-flavor": "gcc",
+  "linker-is-gnu": true,
+  "llvm-target": "i386-unknown-none-code32",
+  "max-atomic-width": 32,
+  "os": "none",
+  "panic-strategy": "abort",
+  "position-independent-executables": false,
+  "pre-link-args": {
+    "gcc": [
+      "-Wl,--as-needed",
+      "-Wl,-z,noexecstack",
+      "-Wl,--gc-sections",
+      "-Wl,-melf_i386",
+      "-m32",
+      "-nostdlib",
+      "-march=i386",
+      "-ffreestanding",
+      "-fno-pie"
+    ]
+  },
+  "relocation-model": "static",
+  "relro-level": "off",
+  "target-c-int-width": "32",
+  "target-endian": "little",
+  "target-pointer-width": "32",
+  "vendor": "unknown"
+}

src/kernel/rust/src/lib.rs

@@ -0,0 +1,6 @@
+#![no_std]
+
+#[no_mangle]
+pub extern "C" fn rust_function() -> i32 {
+    42
+}

src/kernel/tek.c

@@ -1,7 +1,7 @@
 #include "../include/setjmp.h"
 #include "boot.h"
 // #include <string.h>
-#define NULL 0
+// #define NULL 0
 
 typedef unsigned char UCHAR;
 typedef unsigned int UINT32;