[project @ 1997-03-14 05:03:43 by sof]

Nil_closure renamed

diff --git a/ghc/runtime/gum/FetchMe.lhc b/ghc/runtime/gum/FetchMe.lhc
index 98be3d5..337d8fe 100644 (file)
--- a/ghc/runtime/gum/FetchMe.lhc
+++ b/ghc/runtime/gum/FetchMe.lhc
@@ -41,7 +41,7 @@ STGFUN(FetchMe_entry)
     rGA = FETCHME_GA(Node);
     ASSERT(rGA->loc.gc.gtid != mytid);
 
-    TSO_LINK(CurrentTSO) = Prelude_Z91Z93_closure;
+    TSO_LINK(CurrentTSO) = PrelBase_Z91Z93_closure;
     SET_INFO_PTR(Node, FMBQ_info);
     FMBQ_ENTRIES(Node) = (W_) CurrentTSO;
 

diff --git a/ghc/runtime/gum/HLComms.lc b/ghc/runtime/gum/HLComms.lc
index 4eb58bc..e4dce24 100644 (file)
--- a/ghc/runtime/gum/HLComms.lc
+++ b/ghc/runtime/gum/HLComms.lc
@@ -116,7 +116,7 @@ blockFetch(P_ bf, P_ bh)
 {
     switch (INFO_TYPE(INFO_PTR(bh))) {
     case INFO_BH_TYPE:
-       BF_LINK(bf) = Prelude_Z91Z93_closure;
+       BF_LINK(bf) = PrelBase_Z91Z93_closure;
        SET_INFO_PTR(bh, BQ_info);
        BQ_ENTRIES(bh) = (W_) bf;
 
@@ -172,7 +172,7 @@ processFetches()
     P_ ip;
     globalAddr rga;
     
-    for (bf = PendingFetches; bf != Prelude_Z91Z93_closure; bf = next) {
+    for (bf = PendingFetches; bf != PrelBase_Z91Z93_closure; bf = next) {
        next = BF_LINK(bf);
 
        /*
@@ -218,7 +218,7 @@ processFetches()
            sendResume(&rga, size, graph);
        }
     }
-    PendingFetches = Prelude_Z91Z93_closure;
+    PendingFetches = PrelBase_Z91Z93_closure;
 }
 
 \end{code}
@@ -650,7 +650,7 @@ processResume(GLOBAL_TASK_ID sender)
 
        if (INFO_TYPE(INFO_PTR(old)) == INFO_FMBQ_TYPE) {
            for(tso = (P_) FMBQ_ENTRIES(old); 
-              TSO_LINK(tso) != Prelude_Z91Z93_closure; 
+              TSO_LINK(tso) != PrelBase_Z91Z93_closure; 
               tso = TSO_LINK(tso))
                ;
        }

diff --git a/ghc/runtime/gum/Pack.lc b/ghc/runtime/gum/Pack.lc
index 26891b8..4a2e402 100644 (file)
--- a/ghc/runtime/gum/Pack.lc
+++ b/ghc/runtime/gum/Pack.lc
@@ -1282,10 +1282,10 @@ char *type;
      *size = *ptrs = *nonptrs = *vhs = 0; 
      strcpy(type,"ERROR in get_closure_info");
      return;
-   } else if (closure==Prelude_Z91Z93_closure) {
-     /* fprintf(stderr, "Qagh {get_closure_info}Daq: Prelude_Z91Z93_closure closure\n"); */
+   } else if (closure==PrelBase_Z91Z93_closure) {
+     /* fprintf(stderr, "Qagh {get_closure_info}Daq: PrelBase_Z91Z93_closure closure\n"); */
      *size = *ptrs = *nonptrs = *vhs = 0; 
-     strcpy(type,"Prelude_Z91Z93_closure");
+     strcpy(type,"PrelBase_Z91Z93_closure");
      return;
    };
 

diff --git a/ghc/runtime/gum/RBH.lc b/ghc/runtime/gum/RBH.lc
index 18fef5a..dbba43d 100644 (file)
--- a/ghc/runtime/gum/RBH.lc
+++ b/ghc/runtime/gum/RBH.lc
@@ -174,7 +174,7 @@ convertFromRBH(closure)  /* The corresponding function in GUM is: */
 P_ closure;
 {
     P_ ip = (P_) INFO_PTR(closure);
-    P_ bqe, rbh_save = Prelude_Z91Z93_closure;
+    P_ bqe, rbh_save = PrelBase_Z91Z93_closure;
     int isSpec;
 #if defined(GCap) || defined(GCgn)    
     rtsBool linked = IS_MUTABLE(ip) && MUT_LINK(closure) != MUT_NOT_LINKED;
@@ -236,7 +236,7 @@ P_ closure;
     }
 
     /* Put data from special RBH save closures back into the closure */
-    if ( rbh_save == Prelude_Z91Z93_closure ) {
+    if ( rbh_save == PrelBase_Z91Z93_closure ) {
       fprintf(stderr,"convertFromRBH: No RBH_Save_? closure found at end of BQ!\n");
       EXIT(EXIT_FAILURE);
     } else {

diff --git a/ghc/runtime/gum/Unpack.lc b/ghc/runtime/gum/Unpack.lc
index f6877df..2df6741 100644 (file)
--- a/ghc/runtime/gum/Unpack.lc
+++ b/ghc/runtime/gum/Unpack.lc
@@ -56,7 +56,7 @@ CommonUp(P_ src, P_ dst)
        bqe = (P_) GEN_RBH_BQ(src);
        break;
     case INFO_FETCHME_TYPE:
-       bqe = Prelude_Z91Z93_closure;
+       bqe = PrelBase_Z91Z93_closure;
        break;
     case INFO_FMBQ_TYPE:
        bqe = (P_) FMBQ_ENTRIES(src);

diff --git a/ghc/runtime/main/main.lc b/ghc/runtime/main/main.lc
index 9293b30..d8bb331 100644 (file)
--- a/ghc/runtime/main/main.lc
+++ b/ghc/runtime/main/main.lc
@@ -263,33 +263,33 @@ Manager's requirements.
 #endif
 
 #ifdef CONCURRENT
-    AvailableStack = AvailableTSO = Prelude_Z91Z93_closure;
+    AvailableStack = AvailableTSO = PrelBase_Z91Z93_closure;
 # if defined(GRAN)                                                 /* HWL */
     /* Moved in here from ScheduleThreads, to handle a restart_main 
        (because of a signal) properly. */
     for (i=0; i<RTSflags.GranFlags.proc; i++) 
       {
-        RunnableThreadsHd[i] = RunnableThreadsTl[i] = Prelude_Z91Z93_closure;
-       WaitThreadsHd[i] = WaitThreadsTl[i] = Prelude_Z91Z93_closure;
+        RunnableThreadsHd[i] = RunnableThreadsTl[i] = PrelBase_Z91Z93_closure;
+       WaitThreadsHd[i] = WaitThreadsTl[i] = PrelBase_Z91Z93_closure;
         PendingSparksHd[i][REQUIRED_POOL] = PendingSparksHd[i][ADVISORY_POOL] = 
         PendingSparksTl[i][REQUIRED_POOL] = PendingSparksTl[i][ADVISORY_POOL] = 
             NULL; 
       }
 # else
-    RunnableThreadsHd = RunnableThreadsTl = Prelude_Z91Z93_closure;
-    WaitingThreadsHd = WaitingThreadsTl = Prelude_Z91Z93_closure;
+    RunnableThreadsHd = RunnableThreadsTl = PrelBase_Z91Z93_closure;
+    WaitingThreadsHd = WaitingThreadsTl = PrelBase_Z91Z93_closure;
     PendingSparksHd[REQUIRED_POOL] = 
       PendingSparksTl[REQUIRED_POOL] = PendingSparksBase[REQUIRED_POOL];
     PendingSparksHd[ADVISORY_POOL] = 
       PendingSparksTl[ADVISORY_POOL] = PendingSparksBase[ADVISORY_POOL];
 # endif
 
-    CurrentTSO = Prelude_Z91Z93_closure;
+    CurrentTSO = PrelBase_Z91Z93_closure;
 
 # ifdef PAR
     RunParallelSystem(TopClosure);
 # else
-    STKO_LINK(MainStkO) = Prelude_Z91Z93_closure;
+    STKO_LINK(MainStkO) = PrelBase_Z91Z93_closure;
     ScheduleThreads(TopClosure);
 # endif        /* PAR */