[project @ 2002-06-03 11:31:55 by simonmar]

[ghc-hetmet.git] / ghc / includes / InfoMacros.h

diff --git a/ghc/includes/InfoMacros.h b/ghc/includes/InfoMacros.h
index 7773763..b181ce5 100644 (file)
--- a/ghc/includes/InfoMacros.h
+++ b/ghc/includes/InfoMacros.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------------
- * $Id: InfoMacros.h,v 1.16 2001/07/24 05:04:58 ken Exp $
+ * $Id: InfoMacros.h,v 1.18 2002/02/26 05:03:27 sof Exp $
  * 
  * (c) The GHC Team, 1998-1999
  *
@@ -35,8 +35,9 @@
 #define PROF_INFO(type_str, desc_str)
 #endif
 
+/* Why no empty array initializer in the 'else' branch? sof 2/02 */
 #ifdef USE_MINIINTERPRETER
-#define INIT_VECTOR {}
+#define INIT_VECTOR vector : {}
 #else
 #define INIT_VECTOR
 #endif
@@ -618,7 +619,8 @@ typedef vec_info_8 StgPolyInfoTable;
   static const StgSRT lbl = {
 
 #define BITMAP(lbl,size,contents) \
-  static const StgLargeBitmap lbl = { size, { contents } };
+  static const StgLargeBitmap lbl = { \
+      (size*4+SIZEOF_VOID_P-1)/SIZEOF_VOID_P, { contents } };
 
 #if SIZEOF_VOID_P == 8
 #define BITMAP_SWITCH64(small, large)  small