X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FHeapStackCheck.hc;h=8d0c46a86a73486b5d34387af4439d08fd3610a3;hb=50027272414438955dbc41696541cbd25da55883;hp=1b3ba29392633931dd3fb1974e3ebd6f89f24eed;hpb=d37986fe8eef5554e6dbd6dbe83db0cce9f62280;p=ghc-hetmet.git diff --git a/ghc/rts/HeapStackCheck.hc b/ghc/rts/HeapStackCheck.hc index 1b3ba29..8d0c46a 100644 --- a/ghc/rts/HeapStackCheck.hc +++ b/ghc/rts/HeapStackCheck.hc @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: HeapStackCheck.hc,v 1.13 2000/03/17 13:30:24 simonmar Exp $ + * $Id: HeapStackCheck.hc,v 1.16 2001/03/23 16:36:21 simonmar Exp $ * * (c) The GHC Team, 1998-1999 * @@ -7,6 +7,7 @@ * * ---------------------------------------------------------------------------*/ +#include "Stg.h" #include "Rts.h" #include "Storage.h" /* for CurrentTSO */ #include "StgRun.h" /* for StgReturn and register saving */ @@ -105,9 +106,9 @@ R1.i = ThreadYielding; \ JMP_(StgReturn); -#define YIELD_TO_HUGS \ +#define YIELD_TO_INTERPRETER \ SaveThreadState(); \ - CurrentTSO->what_next = ThreadEnterHugs; \ + CurrentTSO->what_next = ThreadEnterInterp; \ R1.i = ThreadYielding; \ JMP_(StgReturn); @@ -123,6 +124,7 @@ R1.i = ThreadBlocked; \ JMP_(StgReturn); + /* ----------------------------------------------------------------------------- Heap Checks -------------------------------------------------------------------------- */ @@ -1176,11 +1178,11 @@ FN_(stg_yield_noregs) FE_ } -FN_(stg_yield_to_Hugs) +FN_(stg_yield_to_interpreter) { FB_ /* No need to save everything - no live registers */ - YIELD_TO_HUGS + YIELD_TO_INTERPRETER FE_ }