From d69b701ddedf706cbfcea7f96bd69453237280c6 Mon Sep 17 00:00:00 2001
From: Rokas Kupstys <rokups@zoho.com>
Date: Fri, 17 Feb 2017 16:49:17 +0200
Subject: Coroutines realtime support

---
 lib/system/gc.nim | 49 ++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 13 deletions(-)

(limited to 'lib')

diff --git a/lib/system/gc.nim b/lib/system/gc.nim
index e989ec111..515aa9851 100644
--- a/lib/system/gc.nim
+++ b/lib/system/gc.nim
@@ -67,6 +67,8 @@ type
     prev: ptr GcStack
     next: ptr GcStack
     bottom: pointer
+    when withRealTime:
+      bottomSaved: pointer
     pos: pointer
     maxStackSize: int
 
@@ -929,19 +931,40 @@ when withRealTime:
       collectCTBody(gch)
     release(gch)
 
-  proc GC_step*(us: int, strongAdvice = false, stackSize = -1) {.noinline.} =
-    var stackTop {.volatile.}: pointer
-    let prevStackBottom = gch.stackBottom
-    if stackSize >= 0:
-      stackTop = addr(stackTop)
-      when stackIncreases:
-        gch.stackBottom = cast[pointer](
-          cast[ByteAddress](stackTop) - sizeof(pointer) * 6 - stackSize)
-      else:
-        gch.stackBottom = cast[pointer](
-          cast[ByteAddress](stackTop) + sizeof(pointer) * 6 + stackSize)
-    GC_step(gch, us, strongAdvice)
-    gch.stackBottom = prevStackBottom
+  when defined(nimCoroutines):
+    proc GC_step*(us: int, strongAdvice = false, stackSize = -1) {.noinline.} =
+      if stackSize >= 0:
+        var stackTop {.volatile.}: pointer
+        gch.activeStack.pos = addr(stackTop)
+
+        for stack in gch.stack.items():
+          stack.bottomSaved = stack.bottom
+          when stackIncreases:
+            stack.bottom = cast[pointer](
+              cast[ByteAddress](stack.pos) - sizeof(pointer) * 6 - stackSize)
+          else:
+            stack.bottom = cast[pointer](
+              cast[ByteAddress](stack.pos) + sizeof(pointer) * 6 + stackSize)
+
+      GC_step(gch, us, strongAdvice)
+
+      if stackSize >= 0:
+        for stack in gch.stack.items():
+          stack.bottom = stack.bottomSaved
+  else:
+    proc GC_step*(us: int, strongAdvice = false, stackSize = -1) {.noinline.} =
+      var stackTop {.volatile.}: pointer
+      let prevStackBottom = gch.stackBottom
+      if stackSize >= 0:
+        stackTop = addr(stackTop)
+        when stackIncreases:
+          gch.stackBottom = cast[pointer](
+            cast[ByteAddress](stackTop) - sizeof(pointer) * 6 - stackSize)
+        else:
+          gch.stackBottom = cast[pointer](
+            cast[ByteAddress](stackTop) + sizeof(pointer) * 6 + stackSize)
+      GC_step(gch, us, strongAdvice)
+      gch.stackBottom = prevStackBottom
 
 when not defined(useNimRtl):
   proc GC_disable() =
-- 
cgit 1.4.1-2-gfad0