From: simonmar <unknown>
Date: Tue, 5 Apr 2005 21:24:53 +0000 (+0000)
Subject: [project @ 2005-04-05 21:24:53 by simonmar]
X-Git-Tag: Initial_conversion_from_CVS_complete~797
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=060a1134ac4879aadccb5fbba981dd75227f2461;p=ghc-hetmet.git

[project @ 2005-04-05 21:24:53 by simonmar]
wibble to fix the unreg way
---

diff --git a/ghc/includes/InfoTables.h b/ghc/includes/InfoTables.h
index ae3b2c2..8fa699a 100644
--- a/ghc/includes/InfoTables.h
+++ b/ghc/includes/InfoTables.h
@@ -321,7 +321,9 @@ typedef struct _StgFunInfoExtraFwd {
     StgHalfWord    fun_type;    /* function type */
     StgHalfWord    arity;       /* function arity */
     StgSRT         *srt;	/* pointer to the SRT table */
-    StgWord        bitmap;	/* arg ptr/nonptr bitmap */
+    union { /* union for compat. with TABLES_NEXT_TO_CODE version */
+	StgWord        bitmap;	/* arg ptr/nonptr bitmap */
+    } b;
     StgFun         *slow_apply; /* apply to args on the stack */
 } StgFunInfoExtraFwd;
 
@@ -414,7 +416,7 @@ typedef struct _StgThunkInfoTable {
 #define GET_FUN_LARGE_BITMAP(info) ((StgLargeBitmap*) (((StgWord) ((info)+1)) \
                                         + (info)->f.b.bitmap_offset))
 #else
-#define GET_FUN_LARGE_BITMAP(info) ((StgLargeBitmap*) ((info)->f.b.bitmap_offset))
+#define GET_FUN_LARGE_BITMAP(info) ((StgLargeBitmap*) ((info)->f.b.bitmap))
 #endif