X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2FSchedule.c;h=f376286a80e48f5622e263c25bf8f2733b8754e1;hp=0b4c5b6284f348f8696c6b23fbabcb026c9b9d22;hb=32ca5da8e5f380a777edf2dacc734c4b67d41f20;hpb=c34d7dd7c5d01910e5a73b1da3a72ad1a20fa692

diff --git a/rts/Schedule.c b/rts/Schedule.c
index 0b4c5b6..f376286 100644
--- a/rts/Schedule.c
+++ b/rts/Schedule.c
@@ -2436,9 +2436,16 @@ threadStackUnderflow (Task *task STG_UNUSED, StgTSO *tso)
 
     tso_size_w = tso_sizeW(tso);
 
-    if (tso_size_w < MBLOCK_SIZE_W || 
+    if (tso_size_w < MBLOCK_SIZE_W ||
+          // TSO is less than 2 mblocks (since the first mblock is
+          // shorter than MBLOCK_SIZE_W)
+        (tso_size_w - BLOCKS_PER_MBLOCK*BLOCK_SIZE_W) % MBLOCK_SIZE_W != 0 ||
+          // or TSO is not a whole number of megablocks (ensuring
+          // precondition of splitLargeBlock() below)
         (nat)(tso->stack + tso->stack_size - tso->sp) > tso->stack_size / 4) 
+          // or stack is using more than 1/4 of the available space
     {
+        // then do nothing
         return tso;
     }