---

yaml
---
r: 6343
b: refs/heads/master
c: 5559e14
h: refs/heads/master
i:
  6341: 6d2dc2c
  6339: 5c6918b
  6335: 091bb5e
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55f89dbed994fef53beeaec49b20d450ca9b72d4
+refs/heads/master: 5559e149e492efadd803eb65f34c259a90c595e7

trunk/mk/rt.mk

@@ -67,7 +67,8 @@ RUNTIME_CS_$(1) := \
 
 RUNTIME_S_$(1) := rt/arch/$$(HOST_$(1))/_context.S \
                   rt/arch/$$(HOST_$(1))/ccall.S \
-                  rt/arch/$$(HOST_$(1))/morestack.S
+                  rt/arch/$$(HOST_$(1))/morestack.S \
+                  rt/arch/$$(HOST_$(1))/record_sp.S
 
 RUNTIME_HDR_$(1) := rt/globals.h \
                rt/rust.h \

trunk/src/rt/arch/i386/morestack.S

@@ -106,18 +106,13 @@ L$bail:
 
 #ifdef __APPLE__
 
-		.section	__IMPORT,__pointers,non_lazy_symbol_pointers
+	.section	__IMPORT,__pointers,non_lazy_symbol_pointers
 rust_new_stack_sym:
     .indirect_symbol RUST_NEW_STACK
     .long 0
 rust_del_stack_sym:
     .indirect_symbol RUST_DEL_STACK
     .long 0
 
-#else
-
-rust_new_stack_sym:
-rust_del_stack_sym:
-
 #endif
 

trunk/src/rt/rust_scheduler.cpp

@@ -13,6 +13,9 @@ DWORD rust_scheduler::task_key;
 
 bool rust_scheduler::tls_initialized = false;
 
+// Defined in arch/*/record_sp.S.
+extern "C" void rust_record_sp(uintptr_t sp);
+
 rust_scheduler::rust_scheduler(rust_kernel *kernel,
                                rust_srv *srv,
                                int id) :
@@ -286,6 +289,7 @@ rust_scheduler::start_main_loop() {
              scheduled_task->state->name);
 
         place_task_in_tls(scheduled_task);
+        rust_record_sp(scheduled_task->stk->limit);
         //pthread_setspecific(89, (void *)scheduled_task->stk->limit);
 
         interrupt_flag = 0;