Merge pull request #25 from bugadani/cleanup

Clean up

Author: bugadani

src/api_xtensa.rs

@@ -1,5 +1,3 @@
-use core::arch::global_asm;
-
 // Probe-rs doesn't know how to call a function on the Xtensa architecture. Due to the windowed
 // ABI, just jumping to the function address won't work. Instead, we need to use a call<N>
 // instruction, which will set up the window increment and then jump to the function address.
@@ -19,69 +17,93 @@ static STACK_PTR: u32 = 0x3FFD_F000;
 // End of SRAM1 - DATA_CACHE_SIZE
 static STACK_PTR: u32 = 0x3FCD_0000;
 
-global_asm!(
-    "
-Init:
-    .global Init_impl
-    l32r a1, STACK_PTR
-    mov.n a6, a2
-    mov.n a7, a3
-    mov.n a8, a4
-    call4 Init_impl
-    mov.n a2, a6
-    break 1, 15
+#[unsafe(naked)]
+#[unsafe(no_mangle)]
+extern "C" fn Init() {
+    core::arch::naked_asm!(
+        "l32r a1, STACK_PTR",
+        "mov.n a6, a2",
+        "mov.n a7, a3",
+        "mov.n a8, a4",
+        "call4 Init_impl",
+        "mov.n a2, a6",
+        "break 1, 15",
+    );
+}
 
-EraseSector:
-    .global EraseSector_impl
-    l32r a1, STACK_PTR
-    mov.n a6, a2
-    call4 EraseSector_impl
-    mov.n a2, a6
-    break 1, 15
+#[unsafe(naked)]
+#[unsafe(no_mangle)]
+extern "C" fn EraseSector() {
+    core::arch::naked_asm!(
+        "l32r a1, STACK_PTR",
+        "mov.n a6, a2",
+        "call4 EraseSector_impl",
+        "mov.n a2, a6",
+        "break 1, 15",
+    );
+}
 
-EraseChip:
-    .global EraseChip_impl
-    l32r a1, STACK_PTR
-    call4 EraseChip_impl
-    mov.n a2, a6
-    break 1, 15
+#[unsafe(naked)]
+#[unsafe(no_mangle)]
+extern "C" fn EraseChip() {
+    core::arch::naked_asm!(
+        "l32r a1, STACK_PTR",
+        "call4 EraseChip_impl",
+        "mov.n a2, a6",
+        "break 1, 15"
+    );
+}
 
-ProgramPage:
-    .global ProgramPage_impl
-    l32r a1, STACK_PTR
-    mov.n a6, a2
-    mov.n a7, a3
-    mov.n a8, a4
-    call4 ProgramPage_impl
-    mov.n a2, a6
-    break 1, 15
+#[unsafe(naked)]
+#[unsafe(no_mangle)]
+extern "C" fn ProgramPage() {
+    core::arch::naked_asm!(
+        "l32r a1, STACK_PTR",
+        "mov.n a6, a2",
+        "mov.n a7, a3",
+        "mov.n a8, a4",
+        "call4 ProgramPage_impl",
+        "mov.n a2, a6",
+        "break 1, 15",
+    );
+}
 
-Verify:
-    .global Verify_impl
-    l32r a1, STACK_PTR
-    mov.n a6, a2
-    mov.n a7, a3
-    mov.n a8, a4
-    call4 Verify_impl
-    mov.n a2, a6
-    break 1, 15
+#[unsafe(naked)]
+#[unsafe(no_mangle)]
+extern "C" fn Verify() {
+    core::arch::naked_asm!(
+        "l32r a1, STACK_PTR",
+        "mov.n a6, a2",
+        "mov.n a7, a3",
+        "mov.n a8, a4",
+        "call4 Verify_impl",
+        "mov.n a2, a6",
+        "break 1, 15",
+    );
+}
 
-ReadFlash:
-    .global ReadFlash_impl
-    l32r a1, STACK_PTR
-    mov.n a6, a2
-    mov.n a7, a3
-    mov.n a8, a4
-    call4 ReadFlash_impl
-    mov.n a2, a6
-    break 1, 15
+#[unsafe(naked)]
+#[unsafe(no_mangle)]
+extern "C" fn ReadFlash() {
+    core::arch::naked_asm!(
+        "l32r a1, STACK_PTR",
+        "mov.n a6, a2",
+        "mov.n a7, a3",
+        "mov.n a8, a4",
+        "call4 ReadFlash_impl",
+        "mov.n a2, a6",
+        "break 1, 15",
+    );
+}
 
-UnInit:
-    .global UnInit_impl
-    l32r a1, STACK_PTR
-    mov.n a6, a2
-    call4 UnInit_impl
-    mov.n a2, a6
-    break 1, 15
-    "
-);
+#[unsafe(naked)]
+#[unsafe(no_mangle)]
+extern "C" fn UnInit() {
+    core::arch::naked_asm!(
+        "l32r a1, STACK_PTR",
+        "mov.n a6, a2",
+        "call4 UnInit_impl",
+        "mov.n a2, a6",
+        "break 1, 15",
+    );
+}

src/main.rs

@@ -1,9 +1,6 @@
 #![no_std]
 #![no_main]
-#![cfg_attr(
-    target_arch = "xtensa",
-    feature(asm_experimental_arch, naked_functions)
-)]
+#![cfg_attr(target_arch = "xtensa", feature(asm_experimental_arch))]
 
 // Target memory configuration