[project @ 2003-07-28 16:16:07 by moran]
[ghc-hetmet.git] / ghc / rts / Sanity.c
index 6a5ab22..a71f862 100644 (file)
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Sanity.c,v 1.32 2003/03/24 14:46:56 simonmar Exp $
+ * $Id: Sanity.c,v 1.34 2003/07/03 15:14:58 sof Exp $
  *
  * (c) The GHC Team, 1998-2001
  *
@@ -113,8 +113,8 @@ checkStackFrame( StgPtr c )
        dyn = r->liveness;
        
        p = (P_)(r->payload);
-       checkSmallBitmap(p,GET_LIVENESS(r->liveness),RET_DYN_SIZE);
-       p += RET_DYN_SIZE;
+       checkSmallBitmap(p,GET_LIVENESS(r->liveness),RET_DYN_BITMAP_SIZE);
+       p += RET_DYN_BITMAP_SIZE + RET_DYN_NONPTR_REGS_SIZE;
 
        // skip over the non-pointers
        p += GET_NONPTRS(dyn);
@@ -125,7 +125,8 @@ checkStackFrame( StgPtr c )
            p++;
        }
        
-       return sizeofW(StgRetDyn) + RET_DYN_SIZE + 
+       return sizeofW(StgRetDyn) + RET_DYN_BITMAP_SIZE +
+           RET_DYN_NONPTR_REGS_SIZE +
            GET_NONPTRS(dyn) + GET_PTRS(dyn);
     }
 
@@ -609,6 +610,9 @@ checkTSO(StgTSO *tso)
     case BlockedOnRead:
     case BlockedOnWrite:
     case BlockedOnDelay:
+#if defined(mingw32_TARGET_OS)
+    case BlockedOnDoProc:
+#endif
       /* isOnBQ(blocked_queue) */
       break;
     case BlockedOnException: