summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ghc/includes/ClosureTypes.h23
-rw-r--r--ghc/includes/InfoTables.h5
-rw-r--r--ghc/includes/PrimOps.h5
-rw-r--r--ghc/includes/StgMiscClosures.h4
-rw-r--r--ghc/rts/DebugProf.c4
-rw-r--r--ghc/rts/Evaluator.c6
-rw-r--r--ghc/rts/GC.c5
-rw-r--r--ghc/rts/PrimOps.hc4
-rw-r--r--ghc/rts/StgMiscClosures.hc3
9 files changed, 23 insertions, 36 deletions
diff --git a/ghc/includes/ClosureTypes.h b/ghc/includes/ClosureTypes.h
index 24d4189695..65502a73db 100644
--- a/ghc/includes/ClosureTypes.h
+++ b/ghc/includes/ClosureTypes.h
@@ -1,5 +1,5 @@
/* ----------------------------------------------------------------------------
- * $Id: ClosureTypes.h,v 1.7 1999/01/26 16:16:19 simonm Exp $
+ * $Id: ClosureTypes.h,v 1.8 1999/02/05 15:25:01 simonm Exp $
*
* Closure Type Constants
*
@@ -62,16 +62,15 @@
#define BLACKHOLE_BQ 48
#define MVAR 49
#define ARR_WORDS 50
-#define MUT_ARR_WORDS 51
-#define MUT_ARR_PTRS 52
-#define MUT_ARR_PTRS_FROZEN 53
-#define MUT_VAR 54
-#define WEAK 55
-#define FOREIGN 56
-#define STABLE_NAME 57
-#define TSO 58
-#define BLOCKED_FETCH 59
-#define FETCH_ME 60
-#define EVACUATED 61
+#define MUT_ARR_PTRS 51
+#define MUT_ARR_PTRS_FROZEN 52
+#define MUT_VAR 53
+#define WEAK 54
+#define FOREIGN 55
+#define STABLE_NAME 56
+#define TSO 57
+#define BLOCKED_FETCH 58
+#define FETCH_ME 69
+#define EVACUATED 60
#endif CLOSURETYPES_H
diff --git a/ghc/includes/InfoTables.h b/ghc/includes/InfoTables.h
index 3f1cd51f60..e7bc9a1db3 100644
--- a/ghc/includes/InfoTables.h
+++ b/ghc/includes/InfoTables.h
@@ -1,5 +1,5 @@
/* ----------------------------------------------------------------------------
- * $Id: InfoTables.h,v 1.8 1999/02/05 12:41:32 sof Exp $
+ * $Id: InfoTables.h,v 1.9 1999/02/05 15:25:02 simonm Exp $
*
* Info Tables
*
@@ -146,8 +146,6 @@ typedef enum {
, MVAR
, ARR_WORDS
- , MUT_ARR_WORDS
-
, MUT_ARR_PTRS
, MUT_ARR_PTRS_FROZEN
@@ -225,7 +223,6 @@ typedef enum {
#define FLAGS_IND_STATIC ( _STA )
#define FLAGS_EVACUATED 0
#define FLAGS_ARR_WORDS (_HNF| _NS| _UPT )
-#define FLAGS_MUT_ARR_WORDS (_HNF| _NS| _MUT|_UPT )
#define FLAGS_MUT_ARR_PTRS (_HNF| _NS| _MUT|_UPT )
#define FLAGS_MUT_ARR_PTRS_FROZEN (_HNF| _NS| _MUT|_UPT )
#define FLAGS_MUT_VAR (_HNF| _NS| _MUT|_UPT )
diff --git a/ghc/includes/PrimOps.h b/ghc/includes/PrimOps.h
index 50e031741a..fe32074e30 100644
--- a/ghc/includes/PrimOps.h
+++ b/ghc/includes/PrimOps.h
@@ -1,5 +1,5 @@
/* -----------------------------------------------------------------------------
- * $Id: PrimOps.h,v 1.14 1999/02/02 14:19:49 simonm Exp $
+ * $Id: PrimOps.h,v 1.15 1999/02/05 15:25:03 simonm Exp $
*
* Macros for primitive operations in STG-ish C code.
*
@@ -415,8 +415,7 @@ LI_ stg_word64ToInt64 (StgNat64);
#ifdef DEBUG
#define BYTE_ARR_CTS(a) \
- ({ ASSERT((GET_INFO(a) == &ARR_WORDS_info) \
- || (GET_INFO(a) == &MUT_ARR_WORDS_info)); \
+ ({ ASSERT(GET_INFO(a) == &ARR_WORDS_info); \
REAL_BYTE_ARR_CTS(a); })
#define PTRS_ARR_CTS(a) \
({ ASSERT((GET_INFO(a) == &ARR_PTRS_info) \
diff --git a/ghc/includes/StgMiscClosures.h b/ghc/includes/StgMiscClosures.h
index ee948dc09c..2f625b6536 100644
--- a/ghc/includes/StgMiscClosures.h
+++ b/ghc/includes/StgMiscClosures.h
@@ -1,5 +1,5 @@
/* -----------------------------------------------------------------------------
- * $Id: StgMiscClosures.h,v 1.7 1999/02/01 18:05:31 simonm Exp $
+ * $Id: StgMiscClosures.h,v 1.8 1999/02/05 15:25:03 simonm Exp $
*
* Entry code for various built-in closure types.
*
@@ -33,7 +33,6 @@ STGFUN(TSO_entry);
STGFUN(FULL_MVAR_entry);
STGFUN(EMPTY_MVAR_entry);
STGFUN(ARR_WORDS_entry);
-STGFUN(MUT_ARR_WORDS_entry);
STGFUN(MUT_ARR_PTRS_entry);
STGFUN(MUT_ARR_PTRS_FROZEN_entry);
STGFUN(MUT_VAR_entry);
@@ -65,7 +64,6 @@ extern const StgInfoTable FULL_MVAR_info;
extern const StgInfoTable EMPTY_MVAR_info;
extern const StgInfoTable TSO_info;
extern const StgInfoTable ARR_WORDS_info;
-extern const StgInfoTable MUT_ARR_WORDS_info;
extern const StgInfoTable MUT_ARR_PTRS_info;
extern const StgInfoTable MUT_ARR_PTRS_FROZEN_info;
extern const StgInfoTable MUT_VAR_info;
diff --git a/ghc/rts/DebugProf.c b/ghc/rts/DebugProf.c
index f5ad811fb5..cd7ff5b951 100644
--- a/ghc/rts/DebugProf.c
+++ b/ghc/rts/DebugProf.c
@@ -1,5 +1,5 @@
/* -----------------------------------------------------------------------------
- * $Id: DebugProf.c,v 1.4 1999/01/15 17:57:05 simonm Exp $
+ * $Id: DebugProf.c,v 1.5 1999/02/05 15:25:04 simonm Exp $
*
* (c) The GHC Team 1998
*
@@ -162,7 +162,6 @@ static char *type_names[] = {
, "ARR_WORDS"
- , "MUT_ARR_WORDS"
, "MUT_ARR_PTRS"
, "MUT_ARR_PTRS_FROZEN"
, "MUT_VAR"
@@ -313,7 +312,6 @@ heapCensus(bdescr *bd)
break;
case ARR_WORDS:
- case MUT_ARR_WORDS:
size = arr_words_sizeW(stgCast(StgArrWords*,p));
break;
diff --git a/ghc/rts/Evaluator.c b/ghc/rts/Evaluator.c
index f50c05eabe..b27c128fc1 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.6 $
- * $Date: 1999/02/05 10:29:21 $
+ * $Revision: 1.7 $
+ * $Date: 1999/02/05 15:25:05 $
* ---------------------------------------------------------------------------*/
#include "Rts.h"
@@ -2249,7 +2249,7 @@ enterLoop:
StgWord size = sizeofW(StgArrWords) + words;
nat i;
StgArrWords* arr = stgCast(StgArrWords*,allocate(size));
- SET_HDR(arr,&MUT_ARR_WORDS_info,CCCS);
+ SET_HDR(arr,&ARR_WORDS_info,CCCS);
arr->words = words;
#ifdef DEBUG
for (i = 0; i < n; ++i) {
diff --git a/ghc/rts/GC.c b/ghc/rts/GC.c
index 1dab72dea2..3311550567 100644
--- a/ghc/rts/GC.c
+++ b/ghc/rts/GC.c
@@ -1,5 +1,5 @@
/* -----------------------------------------------------------------------------
- * $Id: GC.c,v 1.25 1999/02/05 14:49:22 simonm Exp $
+ * $Id: GC.c,v 1.26 1999/02/05 15:25:07 simonm Exp $
*
* Two-space garbage collector
*
@@ -1276,7 +1276,6 @@ loop:
}
return ((StgEvacuated*)q)->evacuee;
- case MUT_ARR_WORDS:
case ARR_WORDS:
{
nat size = arr_words_sizeW(stgCast(StgArrWords*,q));
@@ -1648,7 +1647,6 @@ scavenge(step *step)
}
case ARR_WORDS:
- case MUT_ARR_WORDS:
/* nothing to follow */
p += arr_words_sizeW(stgCast(StgArrWords*,p));
break;
@@ -2339,7 +2337,6 @@ scavenge_large(step *step)
/* only certain objects can be "large"... */
case ARR_WORDS:
- case MUT_ARR_WORDS:
/* nothing to follow */
continue;
diff --git a/ghc/rts/PrimOps.hc b/ghc/rts/PrimOps.hc
index 6dceb3ba24..0c9061340b 100644
--- a/ghc/rts/PrimOps.hc
+++ b/ghc/rts/PrimOps.hc
@@ -1,5 +1,5 @@
/* -----------------------------------------------------------------------------
- * $Id: PrimOps.hc,v 1.11 1999/02/02 14:17:05 simonm Exp $
+ * $Id: PrimOps.hc,v 1.12 1999/02/05 15:25:09 simonm Exp $
*
* Primitive functions / data
*
@@ -197,7 +197,7 @@ const
size = sizeofW(StgArrWords)+ stuff_size; \
p = (StgArrWords *)RET_STGCALL1(P_,allocate,size); \
TICK_ALLOC_PRIM(sizeofW(StgArrWords),stuff_size,0); \
- SET_HDR(p, &MUT_ARR_WORDS_info, CCCS); \
+ SET_HDR(p, &ARR_WORDS_info, CCCS); \
p->words = stuff_size; \
TICK_RET_UNBOXED_TUP(1) \
RET_P(p); \
diff --git a/ghc/rts/StgMiscClosures.hc b/ghc/rts/StgMiscClosures.hc
index aac2de287f..e17a02ba4c 100644
--- a/ghc/rts/StgMiscClosures.hc
+++ b/ghc/rts/StgMiscClosures.hc
@@ -1,5 +1,5 @@
/* -----------------------------------------------------------------------------
- * $Id: StgMiscClosures.hc,v 1.11 1999/02/02 14:21:32 simonm Exp $
+ * $Id: StgMiscClosures.hc,v 1.12 1999/02/05 15:25:09 simonm Exp $
*
* Entry code for various built-in closure types.
*
@@ -327,7 +327,6 @@ INFO_TABLE(type##_info, type##_entry, 0, 0, type, const, EF_,0,0); \
NON_ENTERABLE_ENTRY_CODE(type);
ArrayInfo(ARR_WORDS);
-ArrayInfo(MUT_ARR_WORDS);
ArrayInfo(MUT_ARR_PTRS);
ArrayInfo(MUT_ARR_PTRS_FROZEN);
View Lorry Controller Status