X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FmkDerivedConstants.c;h=f87db37debc7c4f2b2428fcdaecc3464acdac67a;hb=9b70ae2db513be48a1c07bad7ee52ebb4b39132e;hp=8e3ac2b6191ec41c645d4f47a47a460d54d4b15d;hpb=5ddee764beb312933256096d03df7c3ec47ac452;p=ghc-hetmet.git

diff --git a/includes/mkDerivedConstants.c b/includes/mkDerivedConstants.c
index 8e3ac2b..f87db37 100644
--- a/includes/mkDerivedConstants.c
+++ b/includes/mkDerivedConstants.c
@@ -31,14 +31,14 @@
 
 #define str(a,b) #a "_" #b
 
-#define OFFSET(s_type, field) ((unsigned int)&(((s_type*)0)->field))
+#define OFFSET(s_type, field) ((size_t)&(((s_type*)0)->field))
 
 #if defined(GEN_HASKELL)
 #define def_offset(str, offset) \
-    printf("oFFSET_" str " = %d::Int\n", offset);
+    printf("oFFSET_" str " = %zd::Int\n", offset);
 #else
 #define def_offset(str, offset) \
-    printf("#define OFFSET_" str " %d\n", offset);
+    printf("#define OFFSET_" str " %zd\n", offset);
 #endif
 
 #if defined(GEN_HASKELL)
@@ -179,13 +179,6 @@ main(int argc, char *argv[])
     printf("#define PROF_HDR_SIZE  %d\n", sizeofW(StgProfHeader));
     printf("#define GRAN_HDR_SIZE  %d\n", sizeofW(StgGranHeader));
 
-    printf("#define STD_ITBL_SIZE   %d\n", sizeofW(StgInfoTable));
-    printf("#define RET_ITBL_SIZE   %d\n", sizeofW(StgRetInfoTable) - sizeofW(StgInfoTable));
-    printf("#define PROF_ITBL_SIZE  %d\n", sizeofW(StgProfInfo));
-
-    printf("#define GRAN_ITBL_SIZE  %d\n", 0);
-    printf("#define TICKY_ITBL_SIZE %d\n", 0);
-
     printf("#define BLOCK_SIZE   %d\n", BLOCK_SIZE);
     printf("#define MBLOCK_SIZE   %d\n", MBLOCK_SIZE);  
 
@@ -369,7 +362,6 @@ main(int argc, char *argv[])
     closure_field(StgBCO, instrs);
     closure_field(StgBCO, literals);
     closure_field(StgBCO, ptrs);
-    closure_field(StgBCO, itbls);
     closure_field(StgBCO, arity);
     closure_field(StgBCO, size);
     closure_payload(StgBCO, bitmap);