[project @ 2000-12-19 16:48:58 by sewardj]

Try to get the repo includes into a buildable state.

diff --git a/ghc/includes/Bytecodes.h b/ghc/includes/Bytecodes.h
index 7e4869a..e6967d9 100644 (file)
--- a/ghc/includes/Bytecodes.h
+++ b/ghc/includes/Bytecodes.h
@@ -1,6 +1,6 @@
 
 /* -----------------------------------------------------------------------------
- * $Id: Bytecodes.h,v 1.3 2000/12/12 17:16:54 sewardj Exp $
+ * $Id: Bytecodes.h,v 1.4 2000/12/19 16:48:58 sewardj Exp $
  *
  * (c) The GHC Team, 1998-2000
  *
@@ -39,17 +39,16 @@
 #define bci_UNPACK    12
 #define bci_UPK_TAG   13
 #define bci_PACK      14
-#define bci_LABEL     15
-#define bci_TESTLT_I  16 
-#define bci_TESTEQ_I  17
-#define bci_TESTLT_F  18
-#define bci_TESTEQ_F  19
-#define bci_TESTLT_D  20
-#define bci_TESTEQ_D  21
-#define bci_TESTLT_P  22
-#define bci_TESTEQ_P  23
-#define bci_CASEFAIL  24
-#define bci_ENTER     25
-#define bci_RETURN    26
+#define bci_TESTLT_I  15 
+#define bci_TESTEQ_I  16
+#define bci_TESTLT_F  17
+#define bci_TESTEQ_F  18
+#define bci_TESTLT_D  19
+#define bci_TESTEQ_D  20
+#define bci_TESTLT_P  21
+#define bci_TESTEQ_P  22
+#define bci_CASEFAIL  23
+#define bci_ENTER     24
+#define bci_RETURN    25
 
 /*-------------------------------------------------------------------------*/

diff --git a/ghc/includes/Closures.h b/ghc/includes/Closures.h
index 497fc82..2c38541 100644 (file)
--- a/ghc/includes/Closures.h
+++ b/ghc/includes/Closures.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------------
- * $Id: Closures.h,v 1.23 2000/12/19 12:34:00 sewardj Exp $
+ * $Id: Closures.h,v 1.24 2000/12/19 16:48:58 sewardj Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -176,14 +176,6 @@ typedef struct {
 
 typedef struct {
     StgHeader   header;
-    StgClosure *instrs;                /* a pointer to an ArrWords */
-    StgClosure *literals;      /* a pointer to an ArrWords */
-    StgClosure *ptrs;          /* a pointer to a MutArrPtrs */
-    StgClosure *itbls;         /* a pointer to an ArrWords */
-} StgBCO;
-
-typedef struct {
-    StgHeader   header;
     StgClosure *indirectee;
 } StgInd;
 
@@ -226,6 +218,14 @@ typedef struct {
     StgMutClosure *mut_link;
 } StgMutVar;
 
+typedef struct {
+    StgHeader      header;
+    StgArrWords   *instrs;     /* a pointer to an ArrWords */
+    StgArrWords   *literals;   /* a pointer to an ArrWords */
+    StgMutArrPtrs *ptrs;       /* a pointer to a MutArrPtrs */
+    StgArrWords   *itbls;      /* a pointer to an ArrWords */
+} StgBCO;
+
 /* 
    A collective typedef for all linkable stack frames i.e.
      StgUpdateFrame, StgSeqFrame, StgCatchFrame

diff --git a/ghc/includes/StgMiscClosures.h b/ghc/includes/StgMiscClosures.h
index 364464d..0247890 100644 (file)
--- a/ghc/includes/StgMiscClosures.h
+++ b/ghc/includes/StgMiscClosures.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: StgMiscClosures.h,v 1.28 2000/12/19 13:16:53 simonmar Exp $
+ * $Id: StgMiscClosures.h,v 1.29 2000/12/19 16:48:58 sewardj Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -67,9 +67,9 @@ STGFUN(stg_interp_constr8_entry);
 
 /* Magic glue code for when compiled code returns a value in R1/F1/D1
    to the interpreter. */
-extern DLL_IMPORT_RTS const StgInfoTable stg_ctoi_ret_R1_info;
-extern DLL_IMPORT_RTS const StgInfoTable stg_ctoi_ret_F1_info;
-extern DLL_IMPORT_RTS const StgInfoTable stg_ctoi_ret_D1_info;
+extern DLL_IMPORT_RTS const vec_info_8 stg_ctoi_ret_R1_info;
+extern DLL_IMPORT_RTS const vec_info_8 stg_ctoi_ret_F1_info;
+extern DLL_IMPORT_RTS const vec_info_8 stg_ctoi_ret_D1_info;
 #endif
 
 #if defined(PAR) || defined(GRAN)