update riscv to 0.10 with new critical section

Author: almindor

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Changed
+- Update `riscv` dependency to version 0.10
+
 ## [v0.10.0] - 2022-09-04
 
 ### Added

Cargo.toml

@@ -11,7 +11,7 @@ rust-version = "1.59"
 
 [dependencies]
 vcell = "0.1.3"
-riscv = "0.8.0"
+riscv = "0.10.1"
 
 [features]
 rt = []

README.md

@@ -15,9 +15,13 @@ This project is developed and maintained by the [RISC-V team][team].
 This crate is guaranteed to compile on stable Rust 1.59.0 and up. It *might*
 compile with older versions but that may change in any new patch release.
 
+## Requirements
+
+Install [form](https://crates.io/crates/form) and [svd2rust](https://crates.io/crates/svd2rust) using cargo install
+
 ## License
 
-Copyright 2018-2022 [RISC-V team][team]
+Copyright 2018-2023 [RISC-V team][team]
 
 Permission to use, copy, modify, and/or distribute this software for any purpose
 with or without fee is hereby granted, provided that the above copyright notice

build.rs

@@ -1,15 +1,16 @@
+use std::env;
+use std::fs::File;
 use std::io::Write;
 use std::path::PathBuf;
-use std::{env, fs};
-
 fn main() {
-    // Put the linker script somewhere the linker can find it
-    let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
-    println!("cargo:rustc-link-search={}", out_dir.display());
-
-    fs::File::create(out_dir.join("memory-fe310.x"))
-        .unwrap()
-        .write_all(include_bytes!("memory-fe310.x"))
-        .unwrap();
-    println!("cargo:rerun-if-changed=memory-fe310.x");
+    if env::var_os("CARGO_FEATURE_RT").is_some() {
+        let out = &PathBuf::from(env::var_os("OUT_DIR").unwrap());
+        File::create(out.join("device.x"))
+            .unwrap()
+            .write_all(include_bytes!("device.x"))
+            .unwrap();
+        println!("cargo:rustc-link-search={}", out.display());
+        println!("cargo:rerun-if-changed=device.x");
+    }
+    println!("cargo:rerun-if-changed=build.rs");
 }

device.x

@@ -0,0 +1,53 @@
+PROVIDE(WATCHDOG = DefaultHandler);
+PROVIDE(RTC = DefaultHandler);
+PROVIDE(UART0 = DefaultHandler);
+PROVIDE(UART1 = DefaultHandler);
+PROVIDE(QSPI0 = DefaultHandler);
+PROVIDE(QSPI1 = DefaultHandler);
+PROVIDE(QSPI2 = DefaultHandler);
+PROVIDE(GPIO0 = DefaultHandler);
+PROVIDE(GPIO1 = DefaultHandler);
+PROVIDE(GPIO2 = DefaultHandler);
+PROVIDE(GPIO3 = DefaultHandler);
+PROVIDE(GPIO4 = DefaultHandler);
+PROVIDE(GPIO5 = DefaultHandler);
+PROVIDE(GPIO6 = DefaultHandler);
+PROVIDE(GPIO7 = DefaultHandler);
+PROVIDE(GPIO8 = DefaultHandler);
+PROVIDE(GPIO9 = DefaultHandler);
+PROVIDE(GPIO10 = DefaultHandler);
+PROVIDE(GPIO11 = DefaultHandler);
+PROVIDE(GPIO12 = DefaultHandler);
+PROVIDE(GPIO13 = DefaultHandler);
+PROVIDE(GPIO14 = DefaultHandler);
+PROVIDE(GPIO15 = DefaultHandler);
+PROVIDE(GPIO16 = DefaultHandler);
+PROVIDE(GPIO17 = DefaultHandler);
+PROVIDE(GPIO18 = DefaultHandler);
+PROVIDE(GPIO19 = DefaultHandler);
+PROVIDE(GPIO20 = DefaultHandler);
+PROVIDE(GPIO21 = DefaultHandler);
+PROVIDE(GPIO22 = DefaultHandler);
+PROVIDE(GPIO23 = DefaultHandler);
+PROVIDE(GPIO24 = DefaultHandler);
+PROVIDE(GPIO25 = DefaultHandler);
+PROVIDE(GPIO26 = DefaultHandler);
+PROVIDE(GPIO27 = DefaultHandler);
+PROVIDE(GPIO28 = DefaultHandler);
+PROVIDE(GPIO29 = DefaultHandler);
+PROVIDE(GPIO30 = DefaultHandler);
+PROVIDE(GPIO31 = DefaultHandler);
+PROVIDE(PWM0CMP0 = DefaultHandler);
+PROVIDE(PWM0CMP1 = DefaultHandler);
+PROVIDE(PWM0CMP2 = DefaultHandler);
+PROVIDE(PWM0CMP3 = DefaultHandler);
+PROVIDE(PWM1CMP0 = DefaultHandler);
+PROVIDE(PWM1CMP1 = DefaultHandler);
+PROVIDE(PWM1CMP2 = DefaultHandler);
+PROVIDE(PWM1CMP3 = DefaultHandler);
+PROVIDE(PWM2CMP0 = DefaultHandler);
+PROVIDE(PWM2CMP1 = DefaultHandler);
+PROVIDE(PWM2CMP2 = DefaultHandler);
+PROVIDE(PWM2CMP3 = DefaultHandler);
+PROVIDE(I2C0 = DefaultHandler);
+

memory-fe310.x

@@ -206,4 +206,4 @@ impl Interrupt {
 #[doc = r"     }"]
 #[doc = r" }"]
 #[doc = r" ```"]
-macro_rules ! interrupt { ( $ NAME : ident , $ path : path , locals : { $ ( $ lvar : ident : $ lty : ty = $ lval : expr ; ) * } ) => { # [ allow ( non_snake_case ) ] mod $ NAME { pub struct Locals { $ ( pub $ lvar : $ lty , ) * } } # [ allow ( non_snake_case ) ] # [ no_mangle ] pub extern "C" fn $ NAME ( ) { let _ = $ crate :: interrupt :: Interrupt :: $ NAME ; static mut LOCALS : self :: $ NAME :: Locals = self :: $ NAME :: Locals { $ ( $ lvar : $ lval , ) * } ; let f : fn ( & mut self :: $ NAME :: Locals ) = $ path ; f ( unsafe { & mut LOCALS } ) ; } } ; ( $ NAME : ident , $ path : path ) => { # [ allow ( non_snake_case ) ] # [ no_mangle ] pub extern "C" fn $ NAME ( ) { let _ = $ crate :: interrupt :: Interrupt :: $ NAME ; let f : fn ( ) = $ path ; f ( ) ; } } }
+macro_rules ! interrupt { ($ NAME : ident , $ path : path , locals : { $ ($ lvar : ident : $ lty : ty = $ lval : expr ;) * }) => { # [allow (non_snake_case)] mod $ NAME { pub struct Locals { $ (pub $ lvar : $ lty ,) * } } # [allow (non_snake_case)] # [no_mangle] pub extern "C" fn $ NAME () { let _ = $ crate :: interrupt :: Interrupt :: $ NAME ; static mut LOCALS : self :: $ NAME :: Locals = self :: $ NAME :: Locals { $ ($ lvar : $ lval ,) * } ; let f : fn (& mut self :: $ NAME :: Locals) = $ path ; f (unsafe { & mut LOCALS }) ; } } ; ($ NAME : ident , $ path : path) => { # [allow (non_snake_case)] # [no_mangle] pub extern "C" fn $ NAME () { let _ = $ crate :: interrupt :: Interrupt :: $ NAME ; let f : fn () = $ path ; f () ; } } }

src/interrupt.rs

@@ -1,6 +1,5 @@
 #![doc = "Peripheral access API for FE310 microcontrollers (generated using svd2rust v0.19.0 ( ))\n\nYou can find an overview of the generated API [here].\n\nAPI features to be included in the [next]
 svd2rust release can be generated by cloning the svd2rust [repository], checking out the above commit, and running `cargo doc --open`.\n\n[here]: https://docs.rs/svd2rust/0.19.0/svd2rust/#peripheral-api\n[next]: https://github.com/rust-embedded/svd2rust/blob/master/CHANGELOG.md#unreleased\n[repository]: https://github.com/rust-embedded/svd2rust"]
-#![deny(const_err)]
 #![deny(dead_code)]
 #![deny(improper_ctypes)]
 #![deny(missing_docs)]