optimize for x86_64 support

Makefile

@@ -127,7 +127,7 @@ flash: k210-build
 debug: fs-img build
 	@tmux new-session -d \
 	"$(QEMU_EXEC) -s -S && echo '按任意键继续' && read -n 1" && \
-	tmux split-window -h "gdb-multiarch -ex 'file $(KERNEL_ELF)' -ex 'target remote localhost:1234'" && \
+	tmux split-window -h "gdb-multiarch $(KERNEL_ELF) -ex 'target remote localhost:1234' -ex 'disp /16i $pc' " && \
 	tmux -2 attach-session -d
 
 clean:

arch/src/aarch64/context.rs

@@ -126,10 +126,6 @@ impl ContextOps for Context {
         self.regs.x2 = ret;
     }
 
-    fn clear(&mut self) {
-        *self = Default::default();
-    }
-
     #[inline]
     fn set_tls(&mut self, tls: usize) {
         self.tpidr = tls

arch/src/lib.rs

@@ -5,6 +5,7 @@
 #![feature(stdsimd)]
 #![feature(const_mut_refs)]
 #![feature(const_slice_from_raw_parts_mut)]
+#![cfg_attr(target_arch = "riscv64", feature(riscv_ext_intrinsics))]
 
 extern crate alloc;
 
@@ -60,7 +61,6 @@ pub trait ContextOps {
     fn syscall_ok(&mut self);
 
     fn set_ret(&mut self, ret: usize);
-    fn clear(&mut self);
     fn set_tls(&mut self, tls: usize);
 }
 

arch/src/loongarch64/boot.rs

@@ -45,4 +45,4 @@ unsafe extern "C" fn _start() -> ! {
         entry = sym super::rust_tmp_main,
         options(noreturn),
     )
-}
+}

arch/src/loongarch64/console.rs

@@ -1,4 +1,3 @@
-
 use core::fmt::Write;
 
 use spin::Mutex;
@@ -57,14 +56,6 @@ impl Write for Uart {
 
 /// Writes a byte to the console.
 pub fn console_putchar(c: u8) {
-    // let mut uart = COM1.lock();
-    // match c {
-    //     b'\n' => {
-    //         uart.putchar(b'\r');
-    //         uart.putchar(b'\n');
-    //     }
-    //     c => uart.putchar(c),
-    // }
     COM1.lock().putchar(c)
 }
 
@@ -73,7 +64,7 @@ pub fn write_fmt(args: core::fmt::Arguments) {
     COM1.lock().write_fmt(args).unwrap();
 }
 
-/// Reads a byte from the console, or returns [`None`] if no input is available.
+/// read a byte, return -1 if nothing exists.
 pub fn console_getchar() -> u8 {
     COM1.lock().getchar().unwrap_or(u8::MAX)
-}
+}

arch/src/loongarch64/context.rs

@@ -126,10 +126,6 @@ impl ContextOps for Context {
         self.regs.x2 = ret;
     }
 
-    fn clear(&mut self) {
-        *self = Default::default();
-    }
-
     #[inline]
     fn set_tls(&mut self, tls: usize) {
         self.tpidr = tls

arch/src/loongarch64/mod.rs

@@ -7,11 +7,11 @@ mod timer;
 mod trap;
 
 use alloc::vec::Vec;
+pub use console::{console_getchar, console_putchar};
 pub use consts::*;
 pub use context::Context;
 use fdt::Fdt;
 pub use page_table::*;
-pub use console::{console_getchar, console_putchar};
 pub use timer::get_time;
 pub use trap::{enable_external_irq, enable_irq, init_interrupt, trap_pre_handle, user_restore};
 
@@ -22,7 +22,10 @@ pub fn rust_tmp_main(hart_id: usize) {
     ArchInterface::init_logging();
     allocator::init();
 
-    ArchInterface::add_memory_region(VIRT_ADDR_START | 0x9000_0000, VIRT_ADDR_START | (0x9000_0000 + 0x2f00_0000));
+    ArchInterface::add_memory_region(
+        VIRT_ADDR_START | 0x9000_0000,
+        VIRT_ADDR_START | (0x9000_0000 + 0x2f00_0000),
+    );
     info!("hart_id: {}", hart_id);
 
     ArchInterface::prepare_drivers();

arch/src/riscv64/context.rs

@@ -86,12 +86,6 @@ impl ContextOps for Context {
         self.x[12] = ret;
     }
 
-    fn clear(&mut self) {
-        self.x.fill(0);
-        self.sepc = 0;
-        self.sstatus = sstatus::read();
-    }
-
     #[inline]
     fn set_tls(&mut self, tls: usize) {
         self.x[4] = tls;

arch/src/x86_64/consts.rs

@@ -3,3 +3,5 @@ pub const USER_ADDR_MAX: usize = 0xbf_ffff_ffff;
 pub const PAGE_SIZE: usize = 4096;
 pub const PAGE_ITEM_COUNT: usize = 512;
 pub const SIG_RETURN_ADDR: usize = 0xFFFF_FF80_0000_0000;
+
+pub const SYSCALL_VECTOR: usize = usize::MAX / 2;

arch/src/x86_64/context.rs

@@ -1,5 +1,7 @@
 use crate::ContextOps;
 
+use super::gdt::GdtStruct;
+
 /// Saved registers when a trap (interrupt or exception) occurs.
 #[allow(missing_docs)]
 #[repr(C)]
@@ -21,8 +23,8 @@ pub struct Context {
     pub r14: usize,
     pub r15: usize,
 
-    // pub fs_base: usize,
-    // pub gs_base: usize,
+    pub fs_base: usize,
+    pub gs_base: usize,
 
     // Pushed by `trap.S`
     pub vector: usize,
@@ -40,7 +42,14 @@ impl Context {
     // 创建上下文信息
     #[inline]
     pub fn new() -> Self {
+        debug!(
+            "new_user cs: {:#x}, ss: {:#x}",
+            GdtStruct::UCODE64_SELECTOR.0,
+            GdtStruct::UDATA_SELECTOR.0
+        );
         Self {
+            cs: GdtStruct::UCODE64_SELECTOR.0 as _,
+            ss: GdtStruct::UDATA_SELECTOR.0 as _,
             ..Default::default()
         }
     }
@@ -107,12 +116,8 @@ impl ContextOps for Context {
         self.rdx = ret;
     }
 
-    fn clear(&mut self) {
-        *self = Default::default();
-    }
-
     #[inline]
-    fn set_tls(&mut self, _tls: usize) {
-        unimplemented!("set tls is unimplemented!")
+    fn set_tls(&mut self, tls: usize) {
+        self.fs_base = tls;
     }
 }