alex/rp-hal-boards
1
0
Fork 0
mirror of https://github.com/italicsjenga/rp-hal-boards.git synced 2024-12-24 05:01:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

Don't assume usize is 32 bits

Browse source
This commit is contained in:
Liam Murphy 2022-03-05 21:57:35 +11:00
parent 51cd52bb8c
commit 56aa96769d
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
rp2040-hal/src/multicore.rs
View file

@ -146,7 +146,7 @@ impl<'p> Core<'p> {
fn inner_spawn( fn inner_spawn(
&mut self, &mut self,
wrapper: *mut (), wrapper: *mut (),
entry: u64, entry: [usize; 2],
stack: &'static mut [usize], stack: &'static mut [usize],
) -> Result<(), Error> { ) -> Result<(), Error> {
if let Some((psm, ppb, sio)) = self.inner.as_mut() { if let Some((psm, ppb, sio)) = self.inner.as_mut() {
@ -167,8 +167,8 @@ impl<'p> Core<'p> {
push(wrapper as usize); push(wrapper as usize);
push(stack.as_mut_ptr() as usize); push(stack.as_mut_ptr() as usize);
push((entry >> 32) as usize); push(entry[1]);
push(entry as usize); push(entry[0]);
let vector_table = ppb.vtor.read().bits(); let vector_table = ppb.vtor.read().bits();
@ -241,9 +241,9 @@ impl<'p> Core<'p> {
} }
} }
extern "C" fn core1(entry: u64, stack_bottom: *mut usize) -> ! { extern "C" fn core1(entry0: usize, entry1: usize, stack_bottom: *mut usize) -> ! {
core1_setup(stack_bottom); core1_setup(stack_bottom);
let main: *mut dyn Core1Main = unsafe { mem::transmute(entry) }; let main: *mut dyn Core1Main = unsafe { mem::transmute([entry0, entry1]) };
unsafe { (*main).run() } unsafe { (*main).run() }
} }