Remove uses of unstable features

Author: taiki-e

.github/workflows/ci.yaml

@@ -36,7 +36,8 @@ jobs:
         run: cargo check --target riscv32imac-unknown-none-elf
       - name: Run CI script for riscv32imac-unknown-none-elf (inline-asm) under ${{ matrix.rust }}
         run: |
-          if [ "${{ matrix.rust }}" == "nightly" ]; then
+          # asm! requires Rust 1.59
+          if [ "${{ matrix.rust }}" != "1.42.0" ]; then
             cargo check --target riscv32imac-unknown-none-elf --features inline-asm
           fi
       - name: Run CI script for riscv64imac-unknown-none-elf under ${{ matrix.rust }}
@@ -63,4 +64,4 @@ jobs:
           toolchain: stable
           override: true
       - name: Build crate for host OS
-        run: cargo build
+        run: cargo build

src/lib.rs

@@ -14,8 +14,6 @@
 //! - Wrappers around assembly instructions like `WFI`.
 
 #![no_std]
-#![cfg_attr(feature = "inline-asm", feature(asm))]
-#![cfg_attr(feature = "inline-asm", feature(asm_const))]
 
 extern crate bare_metal;
 extern crate bit_field;

src/register/macros.rs

@@ -1,13 +1,13 @@
 macro_rules! read_csr {
-    ($csr_number:expr, $asm_fn: ident) => {
+    ($csr_number:literal, $asm_fn: ident) => {
         /// Reads the CSR
         #[inline]
         unsafe fn _read() -> usize {
             match () {
                 #[cfg(all(riscv, feature = "inline-asm"))]
                 () => {
                     let r: usize;
-                    core::arch::asm!("csrrs {0}, {1}, x0", out(reg) r, const $csr_number);
+                    core::arch::asm!(concat!("csrrs {0}, ", stringify!($csr_number), ", x0"), out(reg) r);
                     r
                 }
 
@@ -28,15 +28,15 @@ macro_rules! read_csr {
 }
 
 macro_rules! read_csr_rv32 {
-    ($csr_number:expr, $asm_fn: ident) => {
+    ($csr_number:literal, $asm_fn: ident) => {
         /// Reads the CSR
         #[inline]
         unsafe fn _read() -> usize {
             match () {
                 #[cfg(all(riscv32, feature = "inline-asm"))]
                 () => {
                     let r: usize;
-                    core::arch::asm!("csrrs {0}, {1}, x0", out(reg) r, const $csr_number);
+                    core::arch::asm!(concat!("csrrs {0}, ", stringify!($csr_number), ", x0"), out(reg) r);
                     r
                 }
 
@@ -57,7 +57,7 @@ macro_rules! read_csr_rv32 {
 }
 
 macro_rules! read_csr_as {
-    ($register:ident, $csr_number:expr, $asm_fn: ident) => {
+    ($register:ident, $csr_number:literal, $asm_fn: ident) => {
         read_csr!($csr_number, $asm_fn);
 
         /// Reads the CSR
@@ -71,7 +71,7 @@ macro_rules! read_csr_as {
 }
 
 macro_rules! read_csr_as_usize {
-    ($csr_number:expr, $asm_fn: ident) => {
+    ($csr_number:literal, $asm_fn: ident) => {
         read_csr!($csr_number, $asm_fn);
 
         /// Reads the CSR
@@ -83,7 +83,7 @@ macro_rules! read_csr_as_usize {
 }
 
 macro_rules! read_csr_as_usize_rv32 {
-    ($csr_number:expr, $asm_fn: ident) => {
+    ($csr_number:literal, $asm_fn: ident) => {
         read_csr_rv32!($csr_number, $asm_fn);
 
         /// Reads the CSR
@@ -95,14 +95,14 @@ macro_rules! read_csr_as_usize_rv32 {
 }
 
 macro_rules! write_csr {
-    ($csr_number:expr, $asm_fn: ident) => {
+    ($csr_number:literal, $asm_fn: ident) => {
         /// Writes the CSR
         #[inline]
         #[allow(unused_variables)]
         unsafe fn _write(bits: usize) {
             match () {
                 #[cfg(all(riscv, feature = "inline-asm"))]
-                () => core::arch::asm!("csrrw x0, {1}, {0}", in(reg) bits, const $csr_number),
+                () => core::arch::asm!(concat!("csrrw x0, ", stringify!($csr_number), ", {0}"), in(reg) bits),
 
                 #[cfg(all(riscv, not(feature = "inline-asm")))]
                 () => {
@@ -121,14 +121,14 @@ macro_rules! write_csr {
 }
 
 macro_rules! write_csr_rv32 {
-    ($csr_number:expr, $asm_fn: ident) => {
+    ($csr_number:literal, $asm_fn: ident) => {
         /// Writes the CSR
         #[inline]
         #[allow(unused_variables)]
         unsafe fn _write(bits: usize) {
             match () {
                 #[cfg(all(riscv32, feature = "inline-asm"))]
-                () => core::arch::asm!("csrrw x0, {1}, {0}", in(reg) bits, const $csr_number),
+                () => core::arch::asm!(concat!("csrrw x0, ", stringify!($csr_number), ", {0}"), in(reg) bits),
 
                 #[cfg(all(riscv32, not(feature = "inline-asm")))]
                 () => {
@@ -147,7 +147,7 @@ macro_rules! write_csr_rv32 {
 }
 
 macro_rules! write_csr_as_usize {
-    ($csr_number:expr, $asm_fn: ident) => {
+    ($csr_number:literal, $asm_fn: ident) => {
         write_csr!($csr_number, $asm_fn);
 
         /// Writes the CSR
@@ -159,7 +159,7 @@ macro_rules! write_csr_as_usize {
 }
 
 macro_rules! write_csr_as_usize_rv32 {
-    ($csr_number:expr, $asm_fn: ident) => {
+    ($csr_number:literal, $asm_fn: ident) => {
         write_csr_rv32!($csr_number, $asm_fn);
 
         /// Writes the CSR
@@ -171,14 +171,14 @@ macro_rules! write_csr_as_usize_rv32 {
 }
 
 macro_rules! set {
-    ($csr_number:expr, $asm_fn: ident) => {
+    ($csr_number:literal, $asm_fn: ident) => {
         /// Set the CSR
         #[inline]
         #[allow(unused_variables)]
         unsafe fn _set(bits: usize) {
             match () {
                 #[cfg(all(riscv, feature = "inline-asm"))]
-                () => core::arch::asm!("csrrs x0, {1}, {0}", in(reg) bits, const $csr_number),
+                () => core::arch::asm!(concat!("csrrs x0, ", stringify!($csr_number), ", {0}"), in(reg) bits),
 
                 #[cfg(all(riscv, not(feature = "inline-asm")))]
                 () => {
@@ -197,14 +197,14 @@ macro_rules! set {
 }
 
 macro_rules! clear {
-    ($csr_number:expr, $asm_fn: ident) => {
+    ($csr_number:literal, $asm_fn: ident) => {
         /// Clear the CSR
         #[inline]
         #[allow(unused_variables)]
         unsafe fn _clear(bits: usize) {
             match () {
                 #[cfg(all(riscv, feature = "inline-asm"))]
-                () => core::arch::asm!("csrrc x0, {1}, {0}", in(reg) bits, const $csr_number),
+                () => core::arch::asm!(concat!("csrrc x0, ", stringify!($csr_number), ", {0}"), in(reg) bits),
 
                 #[cfg(all(riscv, not(feature = "inline-asm")))]
                 () => {