fmt code

Author: ZR233

.vscode/settings.json

@@ -1,6 +1,5 @@
 {
-    "rust-analyzer.cargo.target":
-    // "aarch64-unknown-none",
-    "x86_64-unknown-none",
+    "rust-analyzer.cargo.target": "aarch64-unknown-none",
+    // "x86_64-unknown-none",
     "rust-analyzer.cargo.allTargets": false,
 }

hello/build.rs

@@ -2,7 +2,7 @@ use std::{fs, path::PathBuf};
 
 fn main() {
     println!("cargo::rustc-link-arg-tests=-Tlink.ld");
-    // println!("cargo::rustc-link-arg-tests=-no-pie");
+    println!("cargo::rustc-link-arg-tests=-no-pie");
     println!("cargo::rustc-link-arg-tests=-znostart-stop-gc");
 
     fs::copy("link.ld", out_dir().join("link.ld")).unwrap();

hello/src/lib.rs

@@ -1,6 +1,5 @@
 #![no_std]
 #![no_main]
-#![feature(naked_functions)]
 
 use core::{
     arch::naked_asm,
@@ -16,60 +15,56 @@ const FLAG_LE: usize = 0b0;
 const FLAG_PAGE_SIZE_4K: usize = 0b10;
 const FLAG_ANY_MEM: usize = 0b1000;
 
-#[naked]
+#[unsafe(naked)]
 #[unsafe(no_mangle)]
 #[unsafe(link_section = ".text.head")]
 /// The entry point of the kernel.
 unsafe extern "C" fn _start() -> ! {
-    unsafe {
-        naked_asm!(
-            // code0/code1
-            "nop",
-            "bl {entry}",
-            // text_offset
-            ".quad 0",
-            // image_size
-            ".quad _kernel_size",
-            // flags
-            ".quad {flags}",
-            // Reserved fields
-            ".quad 0",
-            ".quad 0",
-            ".quad 0",
-            // magic - yes 0x644d5241 is the same as ASCII string "ARM\x64"
-            ".ascii \"ARM\\x64\"",
-            // Another reserved field at the end of the header
-            ".byte 0, 0, 0, 0",
-            flags = const FLAG_LE | FLAG_PAGE_SIZE_4K | FLAG_ANY_MEM,
-            entry = sym primary_entry,
-        )
-    }
+    naked_asm!(
+        // code0/code1
+        "nop",
+        "bl {entry}",
+        // text_offset
+        ".quad 0",
+        // image_size
+        ".quad _kernel_size",
+        // flags
+        ".quad {flags}",
+        // Reserved fields
+        ".quad 0",
+        ".quad 0",
+        ".quad 0",
+        // magic - yes 0x644d5241 is the same as ASCII string "ARM\x64"
+        ".ascii \"ARM\\x64\"",
+        // Another reserved field at the end of the header
+        ".byte 0, 0, 0, 0",
+        flags = const FLAG_LE | FLAG_PAGE_SIZE_4K | FLAG_ANY_MEM,
+        entry = sym primary_entry,
+    )
 }
 
-#[naked]
+#[unsafe(naked)]
 #[unsafe(link_section = ".text.boot")]
 /// The entry point of the kernel.
 unsafe extern "C" fn primary_entry() -> ! {
-    unsafe {
-        naked_asm!(
-            "ADR      x11, .",
-            "LDR      x10, ={this_func}",
-            "SUB      x18, x10, x11", // x18 = va_offset
-            "MOV      x19, x0",        // x19 = dtb_addr
-
-            // setup stack
-            "LDR      x1,  =_stack_top",
-            "SUB      x1,  x1, x18", // X1 == STACK_TOP
-            "MOV      sp,  x1",
-
-
-            "MOV      x0,  x18",
-            "MOV      x1,  x19",
-            "BL       {entry}",
-            this_func = sym primary_entry,
-            entry = sym rust_entry,
-        )
-    }
+    naked_asm!(
+        "ADR      x11, .",
+        "LDR      x10, ={this_func}",
+        "SUB      x18, x10, x11", // x18 = va_offset
+        "MOV      x19, x0",        // x19 = dtb_addr
+
+        // setup stack
+        "LDR      x1,  =_stack_top",
+        "SUB      x1,  x1, x18", // X1 == STACK_TOP
+        "MOV      sp,  x1",
+
+
+        "MOV      x0,  x18",
+        "MOV      x1,  x19",
+        "BL       {entry}",
+        this_func = sym primary_entry,
+        entry = sym rust_entry,
+    )
 }
 
 fn phys_to_virt(addr: usize) -> *mut u8 {
@@ -90,7 +85,10 @@ fn rust_entry(_text_va: usize, fdt: *mut u8) -> ! {
         let mut u = Uart::new_by_fdt_node(&node, phys_to_virt).unwrap();
         let _ = tx.write_str_blocking("found\n");
 
-        u.tx.take().unwrap().write_str_blocking("Hello, world!\n");
+        u.tx.take()
+            .unwrap()
+            .write_str_blocking("Hello, world!\n")
+            .unwrap();
 
         let _ = tx.write_str_blocking("All tests passed!\n");
     }