Merge #99

99: Remove uses of unstable features and always use inline assembly r=Disasm a=taiki-e

Currently, the `inline-asm` feature uses unstable features, but by replacing the uses of asm_const with `concat!`+`stringify`, the uses of unstable features can be removed.

https://github.com/rust-embedded/riscv/blob/cd31989ba11d5d64e1addd8aab98bfb00dd927d5/src/lib.rs#L17-L18

Co-authored-by: Taiki Endo <[email protected]>

Author: bors[bot]

.github/bors.toml

@@ -3,7 +3,7 @@ delete_merged_branches = true
 required_approvals = 1
 status = [
     "ci-linux (stable)",
-    "ci-linux (1.42.0)",
+    "ci-linux (1.59.0)",
     "build-other (macOS-latest)",
     "build-other (windows-latest)",
     "Rustfmt"

.github/workflows/ci.yaml

@@ -11,8 +11,8 @@ jobs:
     continue-on-error: ${{ matrix.experimental || false }}
     strategy:
       matrix:
-        # All generated code should be running on stable now, MRSV is 1.42.0
-        rust: [nightly, stable, 1.42.0]
+        # All generated code should be running on stable now, MRSV is 1.59.0
+        rust: [nightly, stable, 1.59.0]
 
         include:
           # Nightly is only for reference and allowed to fail
@@ -34,17 +34,10 @@ jobs:
         run: cargo check --target x86_64-unknown-linux-gnu
       - name: Run CI script for riscv32imac-unknown-none-elf under ${{ matrix.rust }}
         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
-            cargo check --target riscv32imac-unknown-none-elf --features inline-asm
-          fi
       - name: Run CI script for riscv64imac-unknown-none-elf under ${{ matrix.rust }}
         run: cargo check --target riscv64imac-unknown-none-elf
       - name: Run CI script for riscv64gc-unknown-none-elf under ${{ matrix.rust }}
         run: cargo check --target riscv64gc-unknown-none-elf
-      - name: Check blobs
-        run: ./check-blobs.sh
 
   # On macOS and Windows, we at least make sure that the crate builds and links.
   build-other:
@@ -63,4 +56,4 @@ jobs:
           toolchain: stable
           override: true
       - name: Build crate for host OS
-        run: cargo build
+        run: cargo build

.gitignore

@@ -1,5 +1,2 @@
 Cargo.lock
 target/
-bin/*.after
-bin/*.before
-bin/*.o

CHANGELOG.md

@@ -19,7 +19,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 
 - Use new `asm!` instead of `llvm_asm!`
-- Change `pmpcfgx::read()` macro to `read_csr_as!()` from `read_csr_as_usize!()` 
+- Change `pmpcfgx::read()` macro to `read_csr_as!()` from `read_csr_as_usize!()`
+- Inline assembly is now always used
+- Update Minimum Supported Rust Version to 1.59
+
+### Removed
+
+- Remove `inline-asm` feature which is now always enabled
 
 ## [v0.7.0] - 2020-07-29
 

Cargo.toml

@@ -1,6 +1,7 @@
 [package]
 name = "riscv"
 version = "0.7.0"
+rust-version = "1.59"
 repository = "https://github.com/rust-embedded/riscv"
 authors = ["The RISC-V Team <[email protected]>"]
 categories = ["embedded", "hardware-support", "no-std"]
@@ -19,9 +20,3 @@ targets = [
 bare-metal = "1.0.0"
 bit_field = "0.10.0"
 embedded-hal = "0.2.6"
-
-[build-dependencies]
-riscv-target = "0.1.2"
-
-[features]
-inline-asm = []

README.md

@@ -12,7 +12,7 @@ This project is developed and maintained by the [RISC-V team][team].
 
 ## Minimum Supported Rust Version (MSRV)
 
-This crate is guaranteed to compile on stable Rust 1.42.0 and up. It *might*
+This crate is guaranteed to compile on stable Rust 1.59 and up. It *might*
 compile with older versions but that may change in any new patch release.
 
 ## License