M-Labs
/
libfringe
3
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

uintptr_t is pointless when usize is the same anyway

This commit is contained in:
edef 2015-04-16 06:20:46 -04:00
parent 997a4a7765
commit b7624aa49a
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/arch/x86_64/mod.rs
View File

@ -7,20 +7,17 @@ use core::ptr;
use stack::Stack; use stack::Stack;
#[allow(non_camel_case_types)]
pub type uintptr_t = u64;
#[allow(raw_pointer_derive)] #[allow(raw_pointer_derive)]
#[derive(Copy, Clone)] #[derive(Copy, Clone)]
pub struct Registers { pub struct Registers {
rsp: *mut uintptr_t rsp: *mut usize
} }
impl Registers { impl Registers {
#[inline] #[inline]
pub unsafe fn new<S, F>(stack: &mut S, f: F) -> Registers where S: Stack, F: FnOnce() { pub unsafe fn new<S, F>(stack: &mut S, f: F) -> Registers where S: Stack, F: FnOnce() {
let sp_limit = stack.limit(); let sp_limit = stack.limit();
let mut sp = stack.top() as *mut uintptr_t; let mut sp = stack.top() as *mut usize;
let f_ptr = push(&mut sp, f); let f_ptr = push(&mut sp, f);
asm!(include_str!("init.s") asm!(include_str!("init.s")
@ -55,12 +52,12 @@ unsafe extern "C" fn rust_trampoline<F: FnOnce()>(f: *const F) {
ptr::read(f)() ptr::read(f)()
} }
unsafe fn push<T>(spp: &mut *mut uintptr_t, value: T) -> *mut T { unsafe fn push<T>(spp: &mut *mut usize, value: T) -> *mut T {
let mut sp = *spp as *mut T; let mut sp = *spp as *mut T;
sp = offset_mut(sp, -1); sp = offset_mut(sp, -1);
sp = align_down_mut(sp, max(align_of::<T>(), 16)); sp = align_down_mut(sp, max(align_of::<T>(), 16));
*sp = value; *sp = value;
*spp = sp as *mut uintptr_t; *spp = sp as *mut usize;
sp sp
} }