languages/rust
languages/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust synced 2024-09-15 22:50:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change the setup so that rust_activate_glue returns to rust_exit_task_glue

Browse source 
and rust_exit_task_glue calls the rust main.

This is simpler since we only need to setup one frame. It also matches
what ld.so does, so gdb is happy and stops a backtrace at rust_exit_task_glue
instead of continuing past whatever function happened to be before
rust_exit_task_glue is the object file.

This is only the rustc changes and should be merged first.
This commit is contained in:
Rafael Ávila de Espíndola 2011-05-05 14:00:50 -04:00 committed by Graydon Hoare
parent 2d9ccf3ae5
commit 157f61f8c8
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/comp/middle/trans.rs
View file

@ -7074,14 +7074,25 @@ fn trans_exit_task_glue(@glue_fns glues,
let vec[ValueRef] V_args = vec();
auto llfn = glues.exit_task_glue;
let ValueRef lltaskptr = llvm.LLVMGetParam(llfn, 4u);
auto entrybb = llvm.LLVMAppendBasicBlock(llfn, _str.buf("entry"));
auto build = new_builder(entrybb);
auto tptr = build.PtrToInt(lltaskptr, T_int());
auto V_args2 = vec(tptr) + V_args;
trans_native_call(build, glues, lltaskptr,
externs, tn, llmod, "upcall_exit", true, V_args2);
let ValueRef arg1 = llvm.LLVMGetParam(llfn, 0u);
let ValueRef arg2 = llvm.LLVMGetParam(llfn, 1u);
let ValueRef arg3 = llvm.LLVMGetParam(llfn, 2u);
let ValueRef arg4 = llvm.LLVMGetParam(llfn, 3u);
let ValueRef arg5 = llvm.LLVMGetParam(llfn, 4u);
auto main_type = T_fn(vec(T_int(), T_int(), T_int(), T_int()), T_void());
auto fun = build.IntToPtr(arg1, T_ptr(main_type));
auto call_args = vec(arg2, arg3, arg4, arg5);
build.FastCall(fun, call_args);
trans_native_call(build, glues, arg3,
externs, tn, llmod, "upcall_exit", true, vec(arg3));
build.RetVoid();
}
@ -7524,22 +7535,12 @@ fn take_one(ValueRef elt_tydesc,
fn make_glues(ModuleRef llmod, type_names tn) -> @glue_fns {
ret @rec(activate_glue = decl_glue(llmod, tn, abi.activate_glue_name()),
yield_glue = decl_glue(llmod, tn, abi.yield_glue_name()),
/*
* Note: the signature passed to decl_cdecl_fn here looks unusual
* because it is. It corresponds neither to a native signature
* nor a normal rust-ABI signature. In fact it is a fake
* signature, that exists solely to acquire the task pointer as
* an argument to the upcall. It so happens that the runtime sets
* up the task pointer as the sole incoming argument to the frame
* that we return into when returning to the exit task glue. So
* this is the signature required to retrieve it.
*/
exit_task_glue = decl_cdecl_fn(llmod, abi.exit_task_glue_name(),
T_fn(vec(T_int(),
T_int(),
T_int(),
T_int(),
T_taskptr(tn)),
T_int()),
T_void())),
native_glues_rust =