X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FRtsAPI.c;h=8fcf8ce81207e6cc3b7752d2ae88c0ea4175ce33;hb=b2bd63f99d643f6b3eb30bb72bb9ae26d4183252;hp=2479f2038a4b501aad09cec9db172dfaf4078e2b;hpb=497f8aa6c2c8770daf3d39f57ee5e04dcdcc3778;p=ghc-hetmet.git diff --git a/rts/RtsAPI.c b/rts/RtsAPI.c index 2479f20..8fcf8ce 100644 --- a/rts/RtsAPI.c +++ b/rts/RtsAPI.c @@ -375,8 +375,8 @@ rts_getBool (HaskellObj p) -------------------------------------------------------------------------- */ INLINE_HEADER void pushClosure (StgTSO *tso, StgWord c) { - tso->sp--; - tso->sp[0] = (W_) c; + tso->stackobj->sp--; + tso->stackobj->sp[0] = (W_) c; } StgTSO * @@ -394,7 +394,6 @@ createIOThread (Capability *cap, nat stack_size, StgClosure *closure) { StgTSO *t; t = createThread (cap, stack_size); - pushClosure(t, (W_)&stg_noforceIO_info); pushClosure(t, (W_)&stg_ap_v_info); pushClosure(t, (W_)closure); pushClosure(t, (W_)&stg_enter_info); @@ -510,7 +509,7 @@ rts_evalLazyIO_ (Capability *cap, HaskellObj p, unsigned int stack_size, void rts_checkSchedStatus (char* site, Capability *cap) { - SchedulerStatus rc = cap->running_task->stat; + SchedulerStatus rc = cap->running_task->incall->stat; switch (rc) { case Success: return; @@ -529,7 +528,7 @@ rts_checkSchedStatus (char* site, Capability *cap) SchedulerStatus rts_getSchedStatus (Capability *cap) { - return cap->running_task->stat; + return cap->running_task->incall->stat; } Capability *