diff options
| author | simonmar <unknown> | 2000-03-17 14:37:22 +0000 |
|---|---|---|
| committer | simonmar <unknown> | 2000-03-17 14:37:22 +0000 |
| commit | b53f0596d8afc5d6f1dcc335e7aed5afdd0a5578 (patch) | |
| tree | 9bf3a0552294d53da2ac6bf7e3991c54d4452ae7 /ghc/rts/Evaluator.c | |
| parent | d37986fe8eef5554e6dbd6dbe83db0cce9f62280 (diff) | |
| download | haskell-b53f0596d8afc5d6f1dcc335e7aed5afdd0a5578.tar.gz | |
[project @ 2000-03-17 14:37:21 by simonmar]
More random cleanups.
Diffstat (limited to 'ghc/rts/Evaluator.c')
| -rw-r--r-- | ghc/rts/Evaluator.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/ghc/rts/Evaluator.c b/ghc/rts/Evaluator.c index 0624184eaa..0d07a96187 100644 --- a/ghc/rts/Evaluator.c +++ b/ghc/rts/Evaluator.c @@ -5,8 +5,8 @@ * Copyright (c) 1994-1998. * * $RCSfile: Evaluator.c,v $ - * $Revision: 1.41 $ - * $Date: 2000/03/17 13:30:23 $ + * $Revision: 1.42 $ + * $Date: 2000/03/17 14:37:21 $ * ---------------------------------------------------------------------------*/ #include "Rts.h" @@ -41,7 +41,8 @@ #include <ieee754.h> /* These are for primops */ #endif - +/* Allegedly useful macro */ +#define payloadWord( c, i ) (*stgCast(StgWord*, ((c)->payload+(i)))) /* An incredibly useful abbreviation. * Interestingly, there are some uses of END_TSO_QUEUE_closure that @@ -772,7 +773,7 @@ StgThreadReturnCode enter( Capability* cap, StgClosure* obj0 ) nat np = info->layout.payload.nptrs; nat i; for(i=0; i < p; ++i) { - payloadCPtr(o,i) = xPopCPtr(); + o->payload[i] = xPopCPtr(); } for(i=0; i < np; ++i) { payloadWord(o,p+i) = 0xdeadbeef; @@ -794,7 +795,7 @@ StgThreadReturnCode enter( Capability* cap, StgClosure* obj0 ) nat np = info->layout.payload.nptrs; nat i; for(i=0; i < p; ++i) { - payloadCPtr(o,i) = xPopCPtr(); + o->payload[i] = xPopCPtr(); } for(i=0; i < np; ++i) { payloadWord(o,p+i) = 0xdeadbeef; @@ -867,7 +868,7 @@ StgThreadReturnCode enter( Capability* cap, StgClosure* obj0 ) || itbl->type == CONSTR_0_2 ); while (--i>=0) { - xPushCPtr(payloadCPtr(o,i)); + xPushCPtr(o->payload[i]); } Continue; } |