fix(prototyper): typo

feat(prototyper): use function pointer to get payload address

Signed-off-by: Woshiluo Luo <woshiluo.luo@outlook.com>

prototyper/src/board.rs

@@ -22,7 +22,7 @@ pub(crate) static mut SBI_IMPL: MaybeUninit<
 #[doc(hidden)]
 pub enum MachineConsole {
     Uart16550(*const Uart16550<u8>),
-    UartAxiLte(MmioUartAxiLite),
+    UartAxiLite(MmioUartAxiLite),
 }
 
 unsafe impl Send for MachineConsole {}
@@ -32,14 +32,14 @@ impl ConsoleDevice for MachineConsole {
     fn read(&self, buf: &mut [u8]) -> usize {
         match self {
             Self::Uart16550(uart16550) => unsafe { (**uart16550).read(buf) },
-            Self::UartAxiLte(axilite) => axilite.read(buf),
+            Self::UartAxiLite(axilite) => axilite.read(buf),
         }
     }
 
     fn write(&self, buf: &[u8]) -> usize {
         match self {
             MachineConsole::Uart16550(uart16550) => unsafe { (**uart16550).write(buf) },
-            Self::UartAxiLte(axilite) => axilite.write(buf),
+            Self::UartAxiLite(axilite) => axilite.write(buf),
         }
     }
 }
@@ -49,13 +49,13 @@ impl ConsoleDevice for MachineConsole {
 #[doc(hidden)]
 #[cfg(feature = "nemu")]
 pub(crate) static UART: Mutex<MachineConsole> =
-    Mutex::new(MachineConsole::UartAxiLte(MmioUartAxiLite::new(0)));
+    Mutex::new(MachineConsole::UartAxiLite(MmioUartAxiLite::new(0)));
 #[cfg(not(feature = "nemu"))]
 pub(crate) static UART: Mutex<MachineConsole> = Mutex::new(MachineConsole::Uart16550(null()));
 pub(crate) fn console_dev_init(base: usize) {
     let new_console = match *UART.lock() {
         MachineConsole::Uart16550(_) => MachineConsole::Uart16550(base as _),
-        MachineConsole::UartAxiLte(_) => MachineConsole::UartAxiLte(MmioUartAxiLite::new(base)),
+        MachineConsole::UartAxiLite(_) => MachineConsole::UartAxiLite(MmioUartAxiLite::new(base)),
     };
     *UART.lock() = new_console;
 }

prototyper/src/payload.rs

@@ -18,18 +18,12 @@ pub unsafe extern "C" fn fw_payload_image() {
     );
 }
 
+#[inline]
 pub fn get_fdt_address() -> usize {
-    let addr: usize;
-    unsafe {
-        asm!("la {}, {fdt}", out(reg) addr, fdt = sym raw_fdt, options(nomem));
-    }
-    addr
+    raw_fdt as usize
 }
 
+#[inline]
 pub fn get_image_address() -> usize {
-    let addr: usize;
-    unsafe {
-        asm!("la {}, {image}", out(reg) addr, image = sym fw_payload_image, options(nomem));
-    }
-    addr
+    fw_payload_image as usize
 }