max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make PenderContext opaque

Browse Source
This commit is contained in:
Dániel Buga
2023-08-14 15:16:40 +02:00
parent f6007869bf
commit 4c4b12c307
6 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
embassy-executor/src/arch/cortex_m.rs
View File

@ -36,6 +36,7 @@ unsafe fn nvic_pend(irq: u16) {
#[export_name = "__pender"]
fn __pender(context: PenderContext) {
unsafe {
let context: usize = core::mem::transmute(context);
// Safety: `context` is either `usize::MAX` created by `Executor::run`, or a valid interrupt
// request number given to `InterruptExecutor::start`.
if context as usize == usize::MAX {
@ -56,6 +57,7 @@ fn __pender(_context: PenderContext) {
#[export_name = "__pender"]
fn __pender(context: PenderContext) {
unsafe {
let context: usize = core::mem::transmute(context);
// Safety: `context` is the same value we passed to `InterruptExecutor::start`, which must
// be a valid interrupt request number.
nvic_pend(context as u16)
@ -78,7 +80,7 @@ mod thread {
impl ThreadContext for Context {
fn context(&self) -> PenderContext {
usize::MAX
unsafe { core::mem::transmute(usize::MAX) }
}
fn wait(&mut self) {
@ -106,7 +108,7 @@ mod interrupt {
T: InterruptNumber,
{
fn context(&self) -> PenderContext {
self.number() as usize
unsafe { core::mem::transmute(self.number() as usize) }
}
fn enable(&self) {

2
embassy-executor/src/arch/riscv32.rs
View File

@ -28,7 +28,7 @@ mod thread {
impl ThreadContext for Context {
fn context(&self) -> PenderContext {
0
unsafe { core::mem::transmute(0) }
}
fn wait(&mut self) {

2
embassy-executor/src/arch/std.rs
View File

@ -29,7 +29,7 @@ mod thread {
impl ThreadContext for Context {
fn context(&self) -> PenderContext {
self.signaler as *const _ as usize
unsafe { core::mem::transmute(self.signaler) }
}
fn wait(&mut self) {

2
embassy-executor/src/arch/wasm.rs
View File

@ -49,7 +49,7 @@ mod thread {
pub fn new() -> Self {
let ctx = &*Box::leak(Box::new(WasmContext::new()));
Self {
inner: raw::Executor::new(ctx as *const _ as usize),
inner: raw::Executor::new(unsafe { core::mem::transmute(ctx) }),
ctx,
not_send: PhantomData,
}

2
embassy-executor/src/arch/xtensa.rs
View File

@ -26,7 +26,7 @@ mod thread {
impl ThreadContext for Context {
fn context(&self) -> PenderContext {
0
unsafe { core::mem::transmute(0) }
}
fn wait(&mut self) {