From: ken <unknown>
Date: Mon, 17 Sep 2001 22:46:59 +0000 (+0000)
Subject: [project @ 2001-09-17 22:46:59 by ken]
X-Git-Tag: Approximately_9120_patches~961
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=99f27d0991f9359a584e1f8a99f05113cfc122d1;p=ghc-hetmet.git

[project @ 2001-09-17 22:46:59 by ken]
The size of a large bitmap is in number of (32- or 64-bit) words,
not 32-bit words. MERGE TO STABLE
---

diff --git a/ghc/includes/InfoMacros.h b/ghc/includes/InfoMacros.h
index 7773763..0c1c593 100644
--- 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.17 2001/09/17 22:46:59 ken Exp $
  * 
  * (c) The GHC Team, 1998-1999
  *
@@ -618,7 +618,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