mirror of
https://github.com/DragonOS-Community/DragonOS.git
synced 2025-06-20 01:46:31 +00:00
新增rust ffi (#77)
* 引入cargo * 取消对Cargo.lock的跟踪 * 解决vscode报错问题 * new: rust的代码能够调用c语言的printk_color * 1、将原本run.sh的工作拆解,变为几个不同的make命令 2、在docker镜像中编译rust * 更改workflow * update workflow * new: 解决workflow无法通过编译的问题
This commit is contained in:
11
kernel/.cargo/config.toml
Normal file
11
kernel/.cargo/config.toml
Normal file
@ -0,0 +1,11 @@
|
||||
[build]
|
||||
target = "src/arch/x86_64/x86_64-unknown-none.json"
|
||||
|
||||
[unstable]
|
||||
build-std = ["core", "compiler_builtins"]
|
||||
build-std-features = ["compiler-builtins-mem"]
|
||||
|
||||
[target.'cfg(target_os = "none")']
|
||||
runner = "bootimage runner"
|
||||
|
||||
[env]
|
5
kernel/.gitignore
vendored
Normal file
5
kernel/.gitignore
vendored
Normal file
@ -0,0 +1,5 @@
|
||||
target/
|
||||
src/kernel
|
||||
Cargo.lock
|
||||
# 将自动生成的Rust FFI加到gitignore
|
||||
src/include/bindings/bindings.rs
|
15
kernel/Cargo.toml
Normal file
15
kernel/Cargo.toml
Normal file
@ -0,0 +1,15 @@
|
||||
[package]
|
||||
name = "dragonos_kernel"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[lib]
|
||||
crate-type = ["staticlib"]
|
||||
|
||||
[dependencies]
|
||||
x86_64 = "0.14.10"
|
||||
|
||||
[build-dependencies]
|
||||
bindgen = "0.61.0"
|
@ -1,75 +1,8 @@
|
||||
SUBDIR_ROOTS := .
|
||||
DIRS := . $(shell find $(SUBDIR_ROOTS) -type d)
|
||||
GARBAGE_PATTERNS := *.o *.s~ *.s *.S~ *.c~ *.h~ kernel
|
||||
GARBAGE := $(foreach DIR,$(DIRS),$(addprefix $(DIR)/,$(GARBAGE_PATTERNS)))
|
||||
|
||||
DIR_LIB=lib
|
||||
lib_patterns := *.a
|
||||
LIB_FILES := $(foreach DIR,$(DIR_LIB),$(addprefix $(DIR)/,$(lib_patterns)))
|
||||
|
||||
|
||||
# 控制操作系统使用的中断控制器 _INTR_8259A_ _INTR_APIC_
|
||||
PIC := _INTR_APIC_
|
||||
CFLAGS = $(GLOBAL_CFLAGS) -D $(PIC) -I $(shell pwd)
|
||||
|
||||
export ASFLAGS := --64
|
||||
|
||||
LD_LIST := head.o
|
||||
|
||||
|
||||
kernel_subdirs := common driver process debug filesystem time arch exception mm smp sched syscall ktest lib ipc
|
||||
all:
|
||||
$(MAKE) -C src all
|
||||
|
||||
|
||||
|
||||
head.o: head.S
|
||||
$(CC) -E head.S > _head.s # 预处理
|
||||
as $(ASFLAGS) -o head.o _head.s
|
||||
|
||||
|
||||
main.o: main.c
|
||||
# -fno-builtin: 不使用C语言内建函数
|
||||
# The -m64 option sets int to 32bits and long and pointer to 64 bits and generates code for AMD’s x86-64 architecture.
|
||||
$(CC) $(CFLAGS) -c main.c -o main.o
|
||||
|
||||
|
||||
all: kernel
|
||||
@echo "Linking kernel..."
|
||||
ld -b elf64-x86-64 -z muldefs -o kernel head.o main.o $(shell find . -name "*.o") -T link.lds
|
||||
# 生成kallsyms
|
||||
current_dir=$(pwd)
|
||||
|
||||
@dbg='debug';for x in $$dbg; do \
|
||||
cd $$x;\
|
||||
$(MAKE) generate_kallsyms kernel_root_path="$(shell pwd)";\
|
||||
cd ..;\
|
||||
if [ "$$?" != "0" ]; then\
|
||||
exit $$?;\
|
||||
fi;\
|
||||
done
|
||||
|
||||
# 重新链接
|
||||
@echo "Re-Linking kernel..."
|
||||
ld -b elf64-x86-64 -z muldefs -o kernel head.o main.o $(shell find . -name "*.o") ./debug/kallsyms.o -T link.lds
|
||||
@echo "Generating kernel ELF file..."
|
||||
# 生成内核文件
|
||||
objcopy -I elf64-x86-64 -O elf64-x86-64 -R ".comment" -R ".eh_frame" kernel ../bin/kernel/kernel.elf
|
||||
@echo "Kernel Build Done."
|
||||
|
||||
ECHO:
|
||||
@echo "$@"
|
||||
|
||||
$(kernel_subdirs): ECHO
|
||||
|
||||
$(MAKE) -C $@ all CFLAGS="$(CFLAGS)" ASFLAGS="$(ASFLAGS)" PIC="$(PIC)" kernel_root_path="$(shell pwd)"
|
||||
|
||||
kernel: head.o main.o $(kernel_subdirs)
|
||||
|
||||
|
||||
|
||||
clean:
|
||||
rm -rf $(GARBAGE)
|
||||
@list='$(kernel_subdirs)'; for subdir in $$list; do \
|
||||
echo "Clean in dir: $$subdir";\
|
||||
cd $$subdir && $(MAKE) clean;\
|
||||
cd .. ;\
|
||||
done
|
||||
clean:
|
||||
rm -f Cargo.lock
|
||||
$(MAKE) -C src clean
|
40
kernel/build.rs
Normal file
40
kernel/build.rs
Normal file
@ -0,0 +1,40 @@
|
||||
extern crate bindgen;
|
||||
|
||||
use std::path::PathBuf;
|
||||
|
||||
fn main() {
|
||||
// Tell cargo to look for shared libraries in the specified directory
|
||||
println!("cargo:rustc-link-search=src");
|
||||
println!("cargo:rerun-if-changed=src/include/bindings/wrapper.h");
|
||||
let binding_file_path = "src/include/bindings/bindings.rs";
|
||||
// The bindgen::Builder is the main entry point
|
||||
// to bindgen, and lets you build up options for
|
||||
// the resulting bindings.
|
||||
{
|
||||
let bindings = bindgen::Builder::default()
|
||||
.clang_arg("-I./src")
|
||||
// The input header we would like to generate
|
||||
// bindings for.
|
||||
.header("src/include/bindings/wrapper.h")
|
||||
.clang_arg("--target=x86_64-none-none")
|
||||
.clang_arg("-v")
|
||||
// 使用core,并将c语言的类型改为core::ffi,而不是使用std库。
|
||||
.use_core()
|
||||
.ctypes_prefix("::core::ffi")
|
||||
.generate_inline_functions(true)
|
||||
// Tell cargo to invalidate the built crate whenever any of the
|
||||
// included header files changed.
|
||||
.parse_callbacks(Box::new(bindgen::CargoCallbacks))
|
||||
// Finish the builder and generate the bindings.
|
||||
.generate()
|
||||
// Unwrap the Result and panic on failure.
|
||||
.expect("Unable to generate bindings");
|
||||
|
||||
// Write the bindings to the $OUT_DIR/bindings.rs file.
|
||||
let out_path = PathBuf::from(String::from("."));
|
||||
|
||||
bindings
|
||||
.write_to_file(out_path.join(binding_file_path))
|
||||
.expect("Couldn't write bindings!");
|
||||
}
|
||||
}
|
79
kernel/src/Makefile
Normal file
79
kernel/src/Makefile
Normal file
@ -0,0 +1,79 @@
|
||||
SUBDIR_ROOTS := .
|
||||
DIRS := . $(shell find $(SUBDIR_ROOTS) -type d)
|
||||
GARBAGE_PATTERNS := *.o *.s~ *.s *.S~ *.c~ *.h~ kernel
|
||||
GARBAGE := $(foreach DIR,$(DIRS),$(addprefix $(DIR)/,$(GARBAGE_PATTERNS)))
|
||||
|
||||
DIR_LIB=lib
|
||||
lib_patterns := *.a
|
||||
LIB_FILES := $(foreach DIR,$(DIR_LIB),$(addprefix $(DIR)/,$(lib_patterns)))
|
||||
|
||||
|
||||
# 控制操作系统使用的中断控制器 _INTR_8259A_ _INTR_APIC_
|
||||
PIC := _INTR_APIC_
|
||||
CFLAGS = $(GLOBAL_CFLAGS) -D $(PIC) -I $(shell pwd)
|
||||
|
||||
export ASFLAGS := --64
|
||||
|
||||
LD_LIST := head.o
|
||||
|
||||
|
||||
kernel_subdirs := common driver process debug filesystem time arch exception mm smp sched syscall ktest lib ipc
|
||||
|
||||
|
||||
|
||||
head.o: head.S
|
||||
$(CC) -E head.S > _head.s # 预处理
|
||||
as $(ASFLAGS) -o head.o _head.s
|
||||
|
||||
|
||||
main.o: main.c
|
||||
# -fno-builtin: 不使用C语言内建函数
|
||||
# The -m64 option sets int to 32bits and long and pointer to 64 bits and generates code for AMD’s x86-64 architecture.
|
||||
$(CC) $(CFLAGS) -c main.c -o main.o
|
||||
|
||||
|
||||
all: kernel
|
||||
rustup default nightly
|
||||
cargo +nightly build --release --target ./arch/x86_64/x86_64-unknown-none.json
|
||||
@echo "Linking kernel..."
|
||||
ld -b elf64-x86-64 -z muldefs -o kernel head.o main.o $(shell find . -name "*.o") ../target/x86_64-unknown-none/release/libdragonos_kernel.a -T link.lds
|
||||
# 生成kallsyms
|
||||
current_dir=$(pwd)
|
||||
|
||||
@dbg='debug';for x in $$dbg; do \
|
||||
cd $$x;\
|
||||
$(MAKE) generate_kallsyms kernel_root_path="$(shell pwd)";\
|
||||
cd ..;\
|
||||
if [ "$$?" != "0" ]; then\
|
||||
exit $$?;\
|
||||
fi;\
|
||||
done
|
||||
|
||||
|
||||
# 重新链接
|
||||
@echo "Re-Linking kernel..."
|
||||
ld -b elf64-x86-64 -z muldefs -o kernel head.o main.o $(shell find . -name "*.o") ../target/x86_64-unknown-none/release/libdragonos_kernel.a ./debug/kallsyms.o -T link.lds
|
||||
@echo "Generating kernel ELF file..."
|
||||
# 生成内核文件
|
||||
objcopy -I elf64-x86-64 -O elf64-x86-64 -R ".comment" -R ".eh_frame" kernel ../../bin/kernel/kernel.elf
|
||||
@echo "Kernel Build Done."
|
||||
|
||||
ECHO:
|
||||
@echo "$@"
|
||||
|
||||
$(kernel_subdirs): ECHO
|
||||
|
||||
$(MAKE) -C $@ all CFLAGS="$(CFLAGS)" ASFLAGS="$(ASFLAGS)" PIC="$(PIC)" kernel_root_path="$(shell pwd)"
|
||||
|
||||
kernel: head.o main.o $(kernel_subdirs)
|
||||
|
||||
|
||||
|
||||
clean:
|
||||
cargo clean
|
||||
rm -rf $(GARBAGE)
|
||||
@list='$(kernel_subdirs)'; for subdir in $$list; do \
|
||||
echo "Clean in dir: $$subdir";\
|
||||
cd $$subdir && $(MAKE) clean;\
|
||||
cd .. ;\
|
||||
done
|
15
kernel/src/arch/x86_64/x86_64-unknown-none.json
Normal file
15
kernel/src/arch/x86_64/x86_64-unknown-none.json
Normal file
@ -0,0 +1,15 @@
|
||||
{
|
||||
"llvm-target": "x86_64-unknown-none",
|
||||
"data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128",
|
||||
"arch": "x86_64",
|
||||
"target-endian": "little",
|
||||
"target-pointer-width": "64",
|
||||
"target-c-int-width": "32",
|
||||
"os": "none",
|
||||
"linker": "rust-lld",
|
||||
"linker-flavor": "ld.lld",
|
||||
"executables": true,
|
||||
"features": "-mmx,-sse,+soft-float",
|
||||
"disable-redzone": true,
|
||||
"panic-strategy": "abort"
|
||||
}
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user