Add riscv-rt to workspace

.github/workflows/changelog.yaml

@@ -19,6 +19,8 @@ jobs:
           filters: |
             riscv:
               - 'riscv/**'
+            riscv-rt:
+              - 'riscv-rt/**'
 
       - name: Check for CHANGELOG.md (riscv)
         if: steps.changes.outputs.riscv == 'true'
@@ -27,3 +29,11 @@ jobs:
           changeLogPath: ./riscv/CHANGELOG.md
           skipLabels: 'skip changelog'
           missingUpdateErrorMessage: 'Please add a changelog entry in the riscv/CHANGELOG.md file.'
+
+      - name: Check for CHANGELOG.md (riscv-rt)
+        if: steps.changes.outputs.riscv-rt == 'true'
+        uses: dangoslen/changelog-enforcer@v3
+        with:
+          changeLogPath: ./riscv-rt/CHANGELOG.md
+          skipLabels: 'skip changelog'
+          missingUpdateErrorMessage: 'Please add a changelog entry in the riscv-rt/CHANGELOG.md file.'

.github/workflows/clippy.yaml

@@ -1,6 +1,6 @@
 on:
   push:
-    branches: [ staging, trying, master ]
+    branches: [ master ]
   pull_request:
   merge_group:
 
@@ -14,28 +14,46 @@ jobs:
     strategy:
       matrix:
         toolchain: [ stable, nightly ]
-        cargo_flags:
-          - "--no-default-features"
-          - "--all-features"
         include:
           # Nightly is only for reference and allowed to fail
           - toolchain: nightly
             experimental: true
     runs-on: ubuntu-latest
     continue-on-error: ${{ matrix.experimental || false }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.toolchain }}
           components: clippy
-      - name: Run clippy
-        run: cargo clippy --all ${{ matrix.cargo_flags }} -- -D warnings
+      - name: Run clippy (no features)
+        run: cargo clippy --all --no-default-features -- -D warnings
+      - name: Run clippy (all features)
+        run: cargo clippy --all --all-features -- -D warnings
+
+  # Additonal clippy checks for riscv-rt
+  clippy-riscv-rt:
+    strategy:
+      matrix:
+        toolchain: [ stable, nightly ]
+    runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental || false }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ matrix.toolchain }}
+          components: clippy
+      - name: Run clippy (s-mode)
+        run: cargo clippy --package riscv-rt --all --features=s-mode -- -D warnings
+      - name: Run clippy (single-hart)
+        run: cargo clippy --package riscv-rt --all --features=single-hart -- -D warnings
 
    # Job to check that all the lint checks succeeded
   clippy-check:
     needs:
     - clippy
+    - clippy-riscv-rt
     runs-on: ubuntu-latest
     if: always()
     steps:

.github/workflows/label.yaml

@@ -0,0 +1,17 @@
+name: Check Labels
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled]
+
+jobs:
+  label-check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mheap/github-action-required-labels@v5
+        with:
+          mode: exactly
+          count: 0
+          labels: "work in progress, do not merge"
+          add_comment: true
+          message: "This PR is being prevented from merging because it presents one of the blocking labels: {{ provided }}."

.github/workflows/riscv-rt.yaml

@@ -0,0 +1,52 @@
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+  merge_group:
+
+name: Build check (riscv-rt)
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        # All generated code should be running on stable now, MRSV is 1.59.0
+        toolchain: [ stable, nightly, 1.59.0 ]
+        target:
+          - riscv32i-unknown-none-elf
+          - riscv32imc-unknown-none-elf
+          - riscv32imac-unknown-none-elf
+          - riscv64imac-unknown-none-elf
+          - riscv64gc-unknown-none-elf
+        example:
+          - empty
+          - multi_core
+        include:
+          # Nightly is only for reference and allowed to fail
+          - toolchain: nightly
+            experimental: true
+    runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental || false }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ matrix.toolchain }}
+          targets: ${{ matrix.target }}
+      - name: Build (no features)
+        run: RUSTFLAGS="-C link-arg=-Triscv-rt/examples/device.x" cargo build --package riscv-rt --target ${{ matrix.target }} --example ${{ matrix.example }}
+      - name : Build example (s-mode)
+        run: RUSTFLAGS="-C link-arg=-Triscv-rt/examples/device.x" cargo build --package riscv-rt --target ${{ matrix.target }} --example ${{ matrix.example }} --features=s-mode
+      - name : Build example (single-hart)
+        run: RUSTFLAGS="-C link-arg=-Triscv-rt/examples/device.x" cargo build --package riscv-rt --target ${{ matrix.target }} --example ${{ matrix.example }} --features=single-hart
+      - name: Build example (all features)
+        run: RUSTFLAGS="-C link-arg=-Triscv-rt/examples/device.x" cargo build --package riscv-rt --target ${{ matrix.target }} --example ${{ matrix.example }} --all-features
+
+  # Job to check that all the builds succeeded
+  build-check:
+    needs:
+    - build
+    runs-on: ubuntu-latest
+    if: always()
+    steps:
+      - run: jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}'

.github/workflows/build.yaml → .github/workflows/riscv.yaml

@@ -1,10 +1,10 @@
 on:
   push:
-    branches: [ staging, trying, master ]
+    branches: [ master ]
   pull_request:
   merge_group:
 
-name: Build check
+name: Build check (riscv)
 
 jobs:
   # We check that the crate builds and links for all the toolchains and targets.
@@ -19,37 +19,36 @@ jobs:
           - riscv32imac-unknown-none-elf
           - riscv64imac-unknown-none-elf
           - riscv64gc-unknown-none-elf
-        cargo_flags: [ "--no-default-features", "--all-features" ]
         include:
           # Nightly is only for reference and allowed to fail
           - toolchain: nightly
             experimental: true
     runs-on: ubuntu-latest
     continue-on-error: ${{ matrix.experimental || false }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: dtolnay/rust-toolchain@master
       with:
         toolchain: ${{ matrix.toolchain }}
         targets: ${{ matrix.target }}
-    - name: Build library
-      run: cargo build --target ${{ matrix.target }} ${{ matrix.cargo_flags }}
+    - name: Build (no features)
+      run: cargo build --package riscv --target ${{ matrix.target }}
+    - name: Build (all features)
+      run: cargo build --package riscv --target ${{ matrix.target }} --all-features
 
   # On MacOS, Ubuntu, and Windows, we at least make sure that the crate builds and links.
   build-others:
     strategy:
       matrix:
-        os:
-          - macos-latest
-          - ubuntu-latest
-          - windows-latest
-        cargo_flags: [ "--no-default-features", "--all-features" ]
+        os: [ macos-latest, ubuntu-latest, windows-latest ]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@stable
-      - name: Build crate for host OS
-        run: cargo build ${{ matrix.cargo_flags }}
+      - name: Build (no features)
+        run: cargo build --package riscv
+      - name: Build (all features)
+        run: cargo build --package riscv --all-features
 
   # Job to check that all the builds succeeded
   build-check:

.github/workflows/rustfmt.yaml

@@ -1,6 +1,6 @@
 on:
   push:
-    branches: [ staging, trying, master ]
+    branches: [ master ]
   pull_request:
   merge_group:
 
@@ -10,7 +10,7 @@ jobs:
   rustfmt:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: rustfmt

Cargo.toml

@@ -2,4 +2,5 @@
 resolver = "2"
 members = [
     "riscv",
+    "riscv-rt",
 ]

riscv-rt/CHANGELOG.md

@@ -0,0 +1,129 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/)
+and this project adheres to [Semantic Versioning](http://semver.org/).
+
+## [Unreleased]
+
+### Added
+
+- New GitHub workflow for checking invalid labels in PRs
+- New GitHub workflow for checking modifications on CHANGELOG.md
+- New GitHub workflow for checking clippy lints in PRs
+- Optional cargo feature `single-hart` for single CPU targets
+
+### Changed
+
+- Cargo workspace for riscv and riscv-rt
+- Use inline assembly instead of pre-compiled blobs
+- Removed bors in favor of GitHub Merge Queue
+- `start_trap_rust` is now marked as `unsafe`
+- Implement `r0` as inline assembly
+- Use `${ARCH_WIDTH}` in `link.x.in` to adapt to different archs
+- mhartid CSR is no longer read in single-hart mode, assumed zero
+- Ensure stack pointer is 16-byte aligned before jumping to Rust entry point
+
+## [v0.11.0] - 2023-01-18
+
+### Changed
+
+- Update `riscv` to version 0.10.1 fixing a critical section bug
+
+## [v0.10.0] - 2022-11-04
+
+### Added
+
+- Optional cargo feature `s-mode` for supervisor mode, including conditional compilation for supervisor/machine mode instructions.
+
+### Changed
+
+- Remove superfluous parentheses from link.x, which caused linker errors with nightly.
+- Changed `mp_hook` signature, hartid as passed as usize parameter by the caller (required for `s-mode` feature).
+- Update `riscv` to version 0.9
+
+## [v0.9.0] - 2022-07-01
+
+### Added
+
+- Pass `a0..a2` register values to the `#[entry]` function.
+
+### Changed
+
+- Update `riscv` to version 0.8
+- Update `riscv-rt-macros` to 0.2.0
+- Update Minimum Supported Rust Version to 1.59
+- The main symbol is no longer randomly generated in the `#[entry]` macro, instead it uses `__risc_v_rt__main`.
+
+### Removed
+
+- Remove `inline-asm` feature which is now always enabled
+
+## [v0.8.1] - 2022-01-25
+
+### Added
+
+- Enable float support for targets with extension sets F and D
+- Add ability to override trap handling mechanism
+
+### Changed
+
+- Update `riscv` to version 0.7
+- Update `quote` to version 1.0
+- Update `proc-macro2` to version 1.0
+- Update `rand` to version to version 0.7.3
+
+## [v0.8.0] - 2020-07-18
+
+### Changed
+
+- Update `riscv` to version 0.6
+- Update Minimum Supported Rust Version to 1.42.0
+
+## [v0.7.2] - 2020-07-16
+
+### Changed
+
+- Preserve `.eh_frame` and `.eh_frame_hdr` sections
+- Place `.srodata` and `.srodata.*` sections in `.rodata`
+
+## [v0.7.1] - 2020-06-02
+
+### Added
+
+- Add support to initialize custom interrupt controllers.
+
+### Changed
+
+- Exception handler may return now
+
+## [v0.7.0] - 2020-03-10
+
+### Added
+
+- Assure address of PC at startup
+- Implement interrupt and exception handling
+- Add support for the `riscv32i-unknown-none-elf` target
+- Added Changelog
+
+### Fixed
+
+- Fix linker script compatibility with GNU linker
+
+### Changed
+
+- Move `abort` out of the `.init` section
+- Update `r0` to v1.0.0
+- Set MSRV to 1.38
+
+
+[Unreleased]: https://github.com/rust-embedded/riscv-rt/compare/v0.11.0..HEAD
+[v0.10.1]: https://github.com/rust-embedded/riscv-rt/compare/v0.10.0...v0.11.0
+[v0.10.0]: https://github.com/rust-embedded/riscv-rt/compare/v0.9.1...v0.10.0
+[v0.9.0]: https://github.com/rust-embedded/riscv-rt/compare/v0.8.1...v0.9.0
+[v0.8.1]: https://github.com/rust-embedded/riscv-rt/compare/v0.8.0...v0.8.1
+[v0.8.0]: https://github.com/rust-embedded/riscv-rt/compare/v0.7.2...v0.8.0
+[v0.7.2]: https://github.com/rust-embedded/riscv-rt/compare/v0.7.1...v0.7.2
+[v0.7.1]: https://github.com/rust-embedded/riscv-rt/compare/v0.7.0...v0.7.1
+[v0.7.0]: https://github.com/rust-embedded/riscv-rt/compare/v0.6.1...v0.7.0

riscv-rt/Cargo.toml

@@ -0,0 +1,26 @@
+[package]
+name = "riscv-rt"
+version = "0.11.0"
+rust-version = "1.59"
+repository = "https://github.com/rust-embedded/riscv"
+authors = ["The RISC-V Team <[email protected]>"]
+categories = ["embedded", "no-std"]
+description = "Minimal runtime / startup for RISC-V CPU's"
+documentation = "https://docs.rs/riscv-rt"
+keywords = ["riscv", "runtime", "startup"]
+license = "ISC"
+edition = "2021"
+
+[features]
+s-mode = []
+single-hart = []
+
+[dependencies]
+riscv = {path = "../riscv", version = "0.10"}
+riscv-rt-macros = { path = "macros", version = "0.2.0" }
+
+[dev-dependencies]
+panic-halt = "0.2.0"
+
+[build-dependencies]
+riscv-target = "0.1.2"