diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2011-11-18 15:40:23 -0800 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2011-11-18 16:32:19 -0800 |
| commit | 9fa44a41e67151c5c392e2bd2b3989d74703efec (patch) | |
| tree | ca51d17b4108c5ea64d997f04d423cbe90fc956b /src/comp/back | |
| parent | 6072ddad33e034a63bddd1ef577492b2842e8136 (diff) | |
| download | rust-9fa44a41e67151c5c392e2bd2b3989d74703efec.tar.gz rust-9fa44a41e67151c5c392e2bd2b3989d74703efec.zip | |
get pure wrappers approach running
Diffstat (limited to 'src/comp/back')
| -rw-r--r-- | src/comp/back/upcall.rs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/comp/back/upcall.rs b/src/comp/back/upcall.rs index 71137d88911..419a7fdc34c 100644 --- a/src/comp/back/upcall.rs +++ b/src/comp/back/upcall.rs @@ -26,7 +26,7 @@ type upcalls = dynastack_alloc: ValueRef, dynastack_free: ValueRef, alloc_c_stack: ValueRef, - call_c_stack_shim: ValueRef, + call_shim_on_c_stack: ValueRef, rust_personality: ValueRef}; fn declare_upcalls(targ_cfg: @session::config, @@ -85,11 +85,10 @@ fn declare_upcalls(targ_cfg: @session::config, T_ptr(T_i8())), dynastack_free: dv("dynastack_free", [T_ptr(T_i8())]), alloc_c_stack: d("alloc_c_stack", [size_t], T_ptr(T_i8())), - call_c_stack_shim: d("call_c_stack_shim", - // first arg is func ptr, but type of func varies, - // so just call it char* for LLVM - [T_ptr(T_i8()), T_ptr(T_i8())], - int_t), + call_shim_on_c_stack: d("call_shim_on_c_stack", + // arguments: void *args, void *fn_ptr + [T_ptr(T_i8()), T_ptr(T_i8())], + int_t), rust_personality: d("rust_personality", [], T_i32()) }; } |
