[project @ 1996-07-25 20:43:49 by partain]

[ghc-hetmet.git] / ghc / includes / mkNativeHdr.lc

diff --git a/ghc/includes/mkNativeHdr.lc b/ghc/includes/mkNativeHdr.lc
index c4f51c7..e590043 100644 (file)
--- a/ghc/includes/mkNativeHdr.lc
+++ b/ghc/includes/mkNativeHdr.lc
@@ -10,31 +10,30 @@
 
 #define OFFSET(table, x) ((StgUnion *) &(x) - (StgUnion *) (&table))
 
-#define OFFSET_Dbl1 OFFSET(MainRegTable, RTBL_Dbl1)
-#define OFFSET_Dbl2 OFFSET(MainRegTable, RTBL_Dbl2)
-#define OFFSET_Flt1 OFFSET(MainRegTable, RTBL_Flt1)
-#define OFFSET_Flt2 OFFSET(MainRegTable, RTBL_Flt2)
-#define OFFSET_Flt3 OFFSET(MainRegTable, RTBL_Flt3)
-#define OFFSET_Flt4 OFFSET(MainRegTable, RTBL_Flt4)
-#define OFFSET_R1 OFFSET(MainRegTable, RTBL_R1)
-#define OFFSET_R2 OFFSET(MainRegTable, RTBL_R2)
-#define OFFSET_R3 OFFSET(MainRegTable, RTBL_R3)
-#define OFFSET_R4 OFFSET(MainRegTable, RTBL_R4)
-#define OFFSET_R5 OFFSET(MainRegTable, RTBL_R5)
-#define OFFSET_R6 OFFSET(MainRegTable, RTBL_R6)
-#define OFFSET_R7 OFFSET(MainRegTable, RTBL_R7)
-#define OFFSET_R8 OFFSET(MainRegTable, RTBL_R8)
-#define OFFSET_SpA OFFSET(MainRegTable, RTBL_SpA)
-#define OFFSET_SuA OFFSET(MainRegTable, RTBL_SuA)
-#define OFFSET_SpB OFFSET(MainRegTable, RTBL_SpB)
-#define OFFSET_SuB OFFSET(MainRegTable, RTBL_SuB)
-#define OFFSET_Hp OFFSET(MainRegTable, RTBL_Hp)
-#define OFFSET_HpLim OFFSET(MainRegTable, RTBL_HpLim)
-#define OFFSET_Tag OFFSET(MainRegTable, RTBL_Tag)
-#define OFFSET_Ret OFFSET(MainRegTable, RTBL_Ret)
-#define OFFSET_Activity OFFSET(MainRegTable, RTBL_Activity)
-#define OFFSET_StkO OFFSET(MainRegTable, RTBL_StkO)
-#define OFFSET_Liveness OFFSET(MainRegTable, RTBL_Liveness)
+#define OFFSET_Dbl1 OFFSET(MainRegTable, MAIN_Dbl1)
+#define OFFSET_Dbl2 OFFSET(MainRegTable, MAIN_Dbl2)
+#define OFFSET_Flt1 OFFSET(MainRegTable, MAIN_Flt1)
+#define OFFSET_Flt2 OFFSET(MainRegTable, MAIN_Flt2)
+#define OFFSET_Flt3 OFFSET(MainRegTable, MAIN_Flt3)
+#define OFFSET_Flt4 OFFSET(MainRegTable, MAIN_Flt4)
+#define OFFSET_R1 OFFSET(MainRegTable, MAIN_R1)
+#define OFFSET_R2 OFFSET(MainRegTable, MAIN_R2)
+#define OFFSET_R3 OFFSET(MainRegTable, MAIN_R3)
+#define OFFSET_R4 OFFSET(MainRegTable, MAIN_R4)
+#define OFFSET_R5 OFFSET(MainRegTable, MAIN_R5)
+#define OFFSET_R6 OFFSET(MainRegTable, MAIN_R6)
+#define OFFSET_R7 OFFSET(MainRegTable, MAIN_R7)
+#define OFFSET_R8 OFFSET(MainRegTable, MAIN_R8)
+#define OFFSET_SpA OFFSET(MainRegTable, MAIN_SpA)
+#define OFFSET_SuA OFFSET(MainRegTable, MAIN_SuA)
+#define OFFSET_SpB OFFSET(MainRegTable, MAIN_SpB)
+#define OFFSET_SuB OFFSET(MainRegTable, MAIN_SuB)
+#define OFFSET_Hp OFFSET(MainRegTable, MAIN_Hp)
+#define OFFSET_HpLim OFFSET(MainRegTable, MAIN_HpLim)
+#define OFFSET_Tag OFFSET(MainRegTable, MAIN_Tag)
+#define OFFSET_Ret OFFSET(MainRegTable, MAIN_Ret)
+#define OFFSET_StkO OFFSET(MainRegTable, MAIN_StkO)
+#define OFFSET_Liveness OFFSET(MainRegTable, MAIN_Liveness)
 
 #define SM_HP OFFSET(StorageMgrInfo, StorageMgrInfo.hp)
 #define SM_HPLIM OFFSET(StorageMgrInfo, StorageMgrInfo.hplim)
@@ -43,8 +42,8 @@
 #define SM_CAFLIST OFFSET(StorageMgrInfo, StorageMgrInfo.CAFlist)
 #define SM_OLDMUTABLES OFFSET(StorageMgrInfo, StorageMgrInfo.OldMutables)
 #define SM_OLDLIM OFFSET(StorageMgrInfo, StorageMgrInfo.OldLim)
-#define SM_MALLOCPTRLIST OFFSET(StorageMgrInfo, StorageMgrInfo.MallocPtrList)
-#define SM_OLDMALLOCPTRLIST OFFSET(StorageMgrInfo, StorageMgrInfo.OldMallocPtrList)
+#define SM_FOREIGNOBJLIST OFFSET(StorageMgrInfo, StorageMgrInfo.ForeignObjList)
+#define SM_OLDFOREIGNOBJLIST OFFSET(StorageMgrInfo, StorageMgrInfo.OldForeignObjList)
 #define SM_STABLEPOINTERTABLE OFFSET(StorageMgrInfo, StorageMgrInfo.StablePointerTable)
 
 STGRegisterTable MainRegTable;
@@ -79,7 +78,6 @@ main()
     printf("#define OFFSET_HpLim %d\n", OFFSET_HpLim);
     printf("#define OFFSET_Tag %d\n", OFFSET_Tag);
     printf("#define OFFSET_Ret %d\n", OFFSET_Ret);
-    printf("#define OFFSET_Activity %d\n", OFFSET_Activity);
 #ifdef CONCURRENT
     printf("#define OFFSET_StkO %d\n", OFFSET_StkO);
     printf("#define OFFSET_Liveness %d\n", OFFSET_Liveness);
@@ -100,9 +98,9 @@ main()
     printf("#define SM_OLDLIM %d\n", SM_OLDLIM);
 #endif
 #ifndef PAR
-    printf("#define SM_MALLOCPTRLIST %d\n", SM_MALLOCPTRLIST);
+    printf("#define SM_FOREIGNOBJLIST %d\n", SM_FOREIGNOBJLIST);
 #if defined(GCap) || defined(GCgn)
-    printf("#define SM_OLDMALLOCPTRLIST %d\n", SM_OLDMALLOCPTRLIST);
+    printf("#define SM_OLDFOREIGNOBJLIST %d\n", SM_OLDFOREIGNOBJLIST);
 #endif
     printf("#define SM_STABLEPOINTERTABLE %d\n", SM_STABLEPOINTERTABLE);
 #endif