mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

swap taskptr and callee in preparation for making taskptr optional.

Browse Source
This commit is contained in:
Rafael Ávila de Espíndola 2011-03-09 14:16:11 -05:00
parent 50da3ea5bc
commit aeca138944
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/comp/back/x86.rs
View File

@ -175,8 +175,11 @@ fn upcall_glue(int n_args) -> vec[str] {
*/
fn copy_arg(uint i) -> str {
auto src_off = wstr(5 + (i as int));
auto dst_off = wstr(1 + (i as int));
if (i == 0u) {
ret "movl %edx, (%esp)";
}
auto src_off = wstr(4 + (i as int));
auto dst_off = wstr(0 + (i as int));
auto m = vec("movl " + src_off + "(%ebp),%eax",
"movl %eax," + dst_off + "(%esp)");
ret _str.connect(m, "\n\t");
@ -193,14 +196,13 @@ fn upcall_glue(int n_args) -> vec[str] {
+ load_esp_from_runtime_sp()
+ vec("subl $" + wstr(n_args + 1) + ", %esp # esp -= args",
"andl $~0xf, %esp # align esp down",
"movl %ecx, (%esp) # arg[0] = rust_task ")
"andl $~0xf, %esp # align esp down")
+ _vec.init_fn[str](carg, n_args as uint)
+ _vec.init_fn[str](carg, (n_args + 1) as uint)
+ vec("movl %ecx, %edi # save task from ecx to edi",
"call *%edx # call *%edx",
"movl %edi, %ecx # restore edi-saved task to ecx")
+ vec("movl %edx, %edi # save task from ecx to edi",
"call *%ecx # call *%edx",
"movl %edi, %edx # restore edi-saved task to ecx")
+ load_esp_from_rust_sp()
+ restore_callee_saves()

6
src/comp/middle/trans.rs
View File

@ -831,8 +831,8 @@ fn decl_upcall_glue(ModuleRef llmod, type_names tn, uint _n) -> ValueRef {
let int n = _n as int;
let str s = abi.upcall_glue_name(n);
let vec[TypeRef] args =
vec(T_taskptr(tn), // taskptr
T_int()) // callee
vec(T_int(), // callee
T_taskptr(tn)) // taskptr
+ _vec.init_elt[TypeRef](T_int(), n as uint);
ret decl_fastcall_fn(llmod, s, T_fn(args, T_int()));
@ -856,7 +856,7 @@ fn trans_upcall(@block_ctxt cx, str name, vec[ValueRef] args) -> result {
llupcall = llvm.LLVMConstPointerCast(llupcall, T_int());
let ValueRef llglue = cx.fcx.ccx.glues.upcall_glues.(n);
let vec[ValueRef] call_args = vec(cx.fcx.lltaskptr, llupcall);
let vec[ValueRef] call_args = vec(llupcall, cx.fcx.lltaskptr);
for (ValueRef a in args) {
call_args += cx.build.ZExtOrBitCast(a, T_int());