projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2003-09-23 17:07:39 by sof]
[ghc-hetmet.git]
/
ghc
/
rts
/
Sanity.c
diff --git
a/ghc/rts/Sanity.c
b/ghc/rts/Sanity.c
index
6a5ab22
..
a71f862
100644
(file)
--- a/
ghc/rts/Sanity.c
+++ b/
ghc/rts/Sanity.c
@@
-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
*
*
* (c) The GHC Team, 1998-2001
*
@@
-113,8
+113,8
@@
checkStackFrame( StgPtr c )
dyn = r->liveness;
p = (P_)(r->payload);
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);
// skip over the non-pointers
p += GET_NONPTRS(dyn);
@@
-125,7
+125,8
@@
checkStackFrame( StgPtr c )
p++;
}
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);
}
GET_NONPTRS(dyn) + GET_PTRS(dyn);
}
@@
-609,6
+610,9
@@
checkTSO(StgTSO *tso)
case BlockedOnRead:
case BlockedOnWrite:
case BlockedOnDelay:
case BlockedOnRead:
case BlockedOnWrite:
case BlockedOnDelay:
+#if defined(mingw32_TARGET_OS)
+ case BlockedOnDoProc:
+#endif
/* isOnBQ(blocked_queue) */
break;
case BlockedOnException:
/* isOnBQ(blocked_queue) */
break;
case BlockedOnException: