morgan
/
libfringe
forked from M-Labs/libfringe
1
0
Fork 0
Code Pull Requests Activity

coerce rust_trampoline to a function pointer properly

This commit is contained in:
edef 2016-04-03 12:00:21 +02:00
parent 644cd81f9e
commit a50e6771b4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/arch/x86/mod.rs
View File

@ -23,7 +23,7 @@ impl Registers {
asm!(include_str!("init.s") asm!(include_str!("init.s")
: "={eax}"(sp) : "={eax}"(sp)
: "{eax}" (sp), : "{eax}" (sp),
"{ebx}" (rust_trampoline::<F>), "{ebx}" (rust_trampoline::<F> as unsafe extern "C" fn(*const F) -> !),
"{ecx}" (f_ptr) "{ecx}" (f_ptr)
: :
: "volatile"); : "volatile");

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

@ -22,7 +22,7 @@ impl Registers {
asm!(include_str!("init.s") asm!(include_str!("init.s")
: "={rdi}"(sp) : "={rdi}"(sp)
: "{rdi}" (sp), : "{rdi}" (sp),
"{rsi}" (rust_trampoline::<F>), "{rsi}" (rust_trampoline::<F> as unsafe extern "C" fn(*const F) -> !),
"{rdx}" (f_ptr) "{rdx}" (f_ptr)
: :
: "volatile"); : "volatile");