From 7c8c98a6d7fe02ee697d8490a7203d1da676d908 Mon Sep 17 00:00:00 2001 From: Roy Frostig Date: Mon, 12 Jul 2010 23:58:00 -0700 Subject: [PATCH] Adjust call args laid out by fake frame created in rust_task::start to reflect new position of closure-or-obj pointer. --- src/rt/rust_task.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/rt/rust_task.cpp b/src/rt/rust_task.cpp index 43213b46773..7c92c4ca7cd 100644 --- a/src/rt/rust_task.cpp +++ b/src/rt/rust_task.cpp @@ -130,6 +130,7 @@ rust_task::start(uintptr_t exit_task_glue, uintptr_t *spp = (uintptr_t *)rust_sp; // The exit_task_glue frame we synthesize above the frame we activate: + *spp-- = (uintptr_t) 0; // closure-or-obj *spp-- = (uintptr_t) this; // task *spp-- = (uintptr_t) 0; // output *spp-- = (uintptr_t) 0; // retpc @@ -153,6 +154,7 @@ rust_task::start(uintptr_t exit_task_glue, uintptr_t *src = (uintptr_t *)args; src += 1; // spawn-call output slot src += 1; // spawn-call task slot + src += 1; // spawn-call closure-or-obj slot // Memcpy all but the task and output pointers callsz -= (2 * sizeof(uintptr_t)); spp = (uintptr_t*) (((uintptr_t)spp) - callsz); @@ -168,6 +170,7 @@ rust_task::start(uintptr_t exit_task_glue, // The *implicit* incoming args to the spawnee frame we're // activating: + *spp-- = (uintptr_t) 0; // closure-or-obj *spp-- = (uintptr_t) this; // task *spp-- = (uintptr_t) 0; // output addr *spp-- = (uintptr_t) exit_task_glue; // retpc