fix: remove extern "C" rs_* functions

move gen_kallsyms.rs to build-scripts

Signed-off-by: Godones <[email protected]>

Author: Godones

Diff for: .vscode/settings.json

@@ -145,7 +145,7 @@
     "rust-analyzer.linkedProjects": [
         "./kernel/Cargo.toml",
         //"./tools/Cargo.toml",
-        // "./kernel/src/debug/gen_kallsyms.rs",
+        "./kernel/src/debug/gen_kallsyms.rs",
     ],
     // "rust-analyzer.cargo.target": "riscv64gc-unknown-none-elf",
     "rust-analyzer.cargo.target": "x86_64-unknown-none",

Diff for: build-scripts/Cargo.lock

@@ -1,5 +1,3 @@
 [workspace]
-members = [
-    "kernel_build",
-]
+members = ["gen_kallsyms", "kernel_build"]
 resolver = "2"

Diff for: build-scripts/Cargo.toml

@@ -1,8 +1,9 @@
-.PHONY: fmt
+all:
+	@cargo +nightly-2024-11-05 build --release -p gen_kallsyms
 fmt:
 	cargo fmt --all $(FMT_CHECK)
-
 clean:
 	@cargo clean
 check:
 	@cargo +nightly-2024-11-05 check --workspace $(CARGO_ZBUILD) --message-format=json
+.PHONY: fmt

Diff for: build-scripts/Makefile

@@ -0,0 +1,6 @@
+[package]
+name = "gen_kallsyms"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]

Diff for: build-scripts/gen_kallsyms/Cargo.toml

@@ -0,0 +1,122 @@
+use std::str;
+
+#[derive(Debug, Clone)]
+struct KernelSymbolEntry {
+    vaddr: u64,
+    #[allow(dead_code)]
+    symbol_type: char,
+    symbol: String,
+    symbol_length: usize,
+}
+
+fn symbol_to_write(vaddr: u64, text_vaddr: u64, etext_vaddr: u64) -> bool {
+    vaddr >= text_vaddr && vaddr <= etext_vaddr
+}
+fn read_symbol(line: &str) -> Option<KernelSymbolEntry> {
+    if line.len() > 512 {
+        return None;
+    } // skip line with length >= 512
+    let mut parts = line.split_whitespace();
+    let vaddr = u64::from_str_radix(parts.next()?, 16).ok()?;
+    let symbol_type = parts.next()?.chars().next()?;
+    let symbol = parts.collect::<Vec<_>>().join(" ");
+    if symbol_type != 'T' && symbol_type != 't' {
+        return None;
+    } // local symbol or global symbol in text section
+    if symbol == "$x" {
+        return None;
+    } // skip $x symbol
+    let symbol_length = symbol.len() + 1; // +1 for null terminator
+    Some(KernelSymbolEntry {
+        vaddr,
+        symbol_type,
+        symbol,
+        symbol_length,
+    })
+}
+
+fn read_map() -> (Vec<KernelSymbolEntry>, u64, u64) {
+    let mut symbol_table = Vec::new();
+    let mut text_vaddr = 0;
+    let mut etext_vaddr = 0;
+    let mut line = String::new();
+    loop {
+        let size = std::io::stdin().read_line(&mut line).unwrap();
+        if size == 0 {
+            break;
+        }
+        line = line.trim().to_string();
+        if let Some(entry) = read_symbol(&line) {
+            if entry.symbol.starts_with("_text") {
+                text_vaddr = entry.vaddr;
+            } else if entry.symbol.starts_with("_etext") {
+                etext_vaddr = entry.vaddr;
+            }
+            symbol_table.push(entry);
+        }
+        line.clear();
+    }
+    (symbol_table, text_vaddr, etext_vaddr)
+}
+
+fn generate_result(symbol_table: &[KernelSymbolEntry], text_vaddr: u64, etext_vaddr: u64) {
+    println!(".section .rodata\n");
+    println!(".global kallsyms_address");
+    println!(".align 8\n");
+    println!("kallsyms_address:");
+
+    let mut last_vaddr = 0;
+    let mut total_syms_to_write = 0;
+
+    for entry in symbol_table {
+        if !symbol_to_write(entry.vaddr, text_vaddr, etext_vaddr) || entry.vaddr == last_vaddr {
+            continue;
+        }
+
+        println!("\t.quad\t{:#x}", entry.vaddr);
+        total_syms_to_write += 1;
+        last_vaddr = entry.vaddr;
+    }
+
+    println!("\n.global kallsyms_num");
+    println!(".align 8");
+    println!("kallsyms_num:");
+    println!("\t.quad\t{}", total_syms_to_write);
+
+    println!("\n.global kallsyms_names_index");
+    println!(".align 8");
+    println!("kallsyms_names_index:");
+
+    let mut position = 0;
+    last_vaddr = 0;
+
+    for entry in symbol_table {
+        if !symbol_to_write(entry.vaddr, text_vaddr, etext_vaddr) || entry.vaddr == last_vaddr {
+            continue;
+        }
+
+        println!("\t.quad\t{}", position);
+        position += entry.symbol_length;
+        last_vaddr = entry.vaddr;
+    }
+
+    println!("\n.global kallsyms_names");
+    println!(".align 8");
+    println!("kallsyms_names:");
+
+    last_vaddr = 0;
+
+    for entry in symbol_table {
+        if !symbol_to_write(entry.vaddr, text_vaddr, etext_vaddr) || entry.vaddr == last_vaddr {
+            continue;
+        }
+
+        println!("\t.asciz\t\"{}\"", entry.symbol);
+        last_vaddr = entry.vaddr;
+    }
+}
+
+fn main() {
+    let (symbol_table, text_vaddr, etext_vaddr) = read_map();
+    generate_result(&symbol_table, text_vaddr, etext_vaddr);
+}

Diff for: build-scripts/gen_kallsyms/src/main.rs

@@ -2,7 +2,7 @@
 
 [metadata]
 # Target architecture. Options: x86_64, riscv64
-arch = "x86_64"
+arch = "riscv64"
 
 # Hypervisor config path
 hypervisor-config = "config/hypervisor.toml"

Diff for: dadk-manifest.toml

@@ -2,7 +2,7 @@
 ifeq ($(ARCH), )
 # ！！！！在这里设置ARCH，可选 x86_64 和 riscv64
 # !!!!!!!如果不同时调整这里以及vscode的settings.json，那么自动补全和检查将会失效
-export ARCH?=x86_64
+export ARCH?=riscv64
 endif
 
 ifeq ($(EMULATOR), )

Diff for: env.mk

@@ -16,6 +16,7 @@ ECHO:
 	@echo "$@"
 
 all: 
+	$(MAKE) -C ../build-scripts all
 	$(MAKE) -C src all ARCH=$(ARCH) || (sh -c "echo 内核编译失败" && exit 1)
 
 

Diff for: kernel/Makefile

@@ -21,7 +21,6 @@ use self::{
 };
 
 pub mod apic_timer;
-mod c_adapter;
 pub mod hw_irq;
 pub mod ioapic;
 pub mod lapic_vector;

Diff for: kernel/src/arch/x86_64/driver/apic/c_adapter.rs

@@ -5,9 +5,7 @@ pub mod pkru;
 
 use alloc::sync::Arc;
 use alloc::vec::Vec;
-use hashbrown::HashSet;
 use log::{debug, info};
-use x86::time::rdtsc;
 use x86_64::registers::model_specific::EferFlags;
 
 use crate::driver::serial::serial8250::send_to_default_serial8250_port;
@@ -553,11 +551,10 @@ unsafe fn allocator_init() {
     debug!("Successfully enabled new page table");
 }
 
-#[no_mangle]
-pub extern "C" fn rs_test_buddy() {
-    test_buddy();
-}
+#[cfg(test)]
 pub fn test_buddy() {
+    use hashbrown::HashSet;
+    use x86::time::rdtsc;
     // 申请内存然后写入数据然后free掉
     // 总共申请200MB内存
     const TOTAL_SIZE: usize = 200 * 1024 * 1024;

Diff for: kernel/src/arch/x86_64/driver/apic/mod.rs

@@ -4,14 +4,11 @@ all:
 
 CFLAGS += -I .
 
-gen_kallsyms: gen_kallsyms.rs
-	rustc gen_kallsyms.rs
-
 # 生成内核栈符号表的汇编文件
-generate_kallsyms: gen_kallsyms
+generate_kallsyms:
 	@echo "Generating kallsyms..."
 # 请注意，这个不能使用raw的nm来处理
-	nm -n -C $(kernel_root_path)/kernel | ./gen_kallsyms > kallsyms.S
+	nm -n -C $(kernel_root_path)/kernel | $(kernel_root_path)/../../build-scripts/target/release/gen_kallsyms > kallsyms.S
 	$(CC) -c kallsyms.S -o kallsyms.o
 	@echo "Kallsyms generated."
 

Diff for: kernel/src/arch/x86_64/mm/mod.rs

@@ -295,10 +295,3 @@ impl TimerFunction for VideoRefreshExecutor {
         return Ok(());
     }
 }
-
-#[no_mangle]
-pub unsafe extern "C" fn rs_video_init() -> i32 {
-    return VideoRefreshManager::video_init()
-        .map(|_| 0)
-        .unwrap_or_else(|e| e.to_posix_errno());
-}

Diff for: kernel/src/debug/Makefile

@@ -28,11 +28,6 @@ const MAX_SOFTIRQ_RESTART: i32 = 20;
 static mut __CPU_PENDING: Option<Box<[VecStatus; PerCpu::MAX_CPU_NUM as usize]>> = None;
 static mut __SORTIRQ_VECTORS: *mut Softirq = null_mut();
 
-#[no_mangle]
-pub extern "C" fn rs_softirq_init() {
-    softirq_init().expect("softirq_init failed");
-}
-
 #[inline(never)]
 pub fn softirq_init() -> Result<(), SystemError> {
     info!("Initializing softirq...");

Diff for: kernel/src/driver/video/mod.rs

@@ -1,8 +1,5 @@
 use crate::{
-    driver::{
-        serial::serial8250::send_to_default_serial8250_port, tty::virtual_terminal::vc_manager,
-        video::video_refresh_manager,
-    },
+    driver::{serial::serial8250::send_to_default_serial8250_port, video::video_refresh_manager},
     libs::{
         lib_ui::font::FONT_8x16,
         rwlock::RwLock,
@@ -1017,69 +1014,6 @@ where
     }
 }
 
-/// 在默认窗口上输出一个字符
-/// ## 参数
-/// - character 字符
-/// - FRcolor 前景色（RGB）
-/// - BKcolor 背景色（RGB）
-#[no_mangle]
-pub extern "C" fn rs_textui_putchar(character: u8, fr_color: u32, bk_color: u32) -> i32 {
-    if let Some(current_vc) = vc_manager().current_vc() {
-        // tty已经初始化了之后才输出到屏幕
-        let fr = (fr_color & 0x00ff0000) >> 16;
-        let fg = (fr_color & 0x0000ff00) >> 8;
-        let fb = fr_color & 0x000000ff;
-        let br = (bk_color & 0x00ff0000) >> 16;
-        let bg = (bk_color & 0x0000ff00) >> 8;
-        let bb = bk_color & 0x000000ff;
-        let buf = format!(
-            "\x1B[38;2;{fr};{fg};{fb};48;2;{br};{bg};{bb}m{}\x1B[0m",
-            character as char
-        );
-        let port = current_vc.port();
-        let tty = port.port_data().internal_tty();
-        if let Some(tty) = tty {
-            return tty
-                .write_to_core(buf.as_bytes(), buf.len())
-                .map(|_| 0)
-                .unwrap_or_else(|e| e.to_posix_errno());
-        }
-    }
-    return textui_putchar(
-        character as char,
-        FontColor::from(fr_color),
-        FontColor::from(bk_color),
-    )
-    .map(|_| 0)
-    .unwrap_or_else(|e| e.to_posix_errno());
-}
-
-pub fn textui_putchar(
-    character: char,
-    fr_color: FontColor,
-    bk_color: FontColor,
-) -> Result<(), SystemError> {
-    if unsafe { TEXTUI_IS_INIT } {
-        return textui_framework()
-            .current_window
-            .lock_irqsave()
-            .textui_putchar_window(
-                character,
-                fr_color,
-                bk_color,
-                textui_is_enable_put_to_window(),
-            );
-    } else {
-        //未初始化暴力输出
-        return no_init_textui_putchar_window(
-            character,
-            fr_color,
-            bk_color,
-            textui_is_enable_put_to_window(),
-        );
-    }
-}
-
 /// 向默认窗口输出一个字符串
 pub fn textui_putstr(
     string: &str,