X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FSMinterface.lh;h=4fb03e6d948610337291ca94551c0c2db2b269d2;hb=967cc47f37cb93a5e2b6df7822c9a646f0428247;hp=a6c4c0fc5dec875a7ce8f1b09691d0168fec2957;hpb=063eda14b18aadc138bc27eb460e1af93b09ca9b;p=ghc-hetmet.git

diff --git a/ghc/includes/SMinterface.lh b/ghc/includes/SMinterface.lh
index a6c4c0f..4fb03e6 100644
--- a/ghc/includes/SMinterface.lh
+++ b/ghc/includes/SMinterface.lh
@@ -78,14 +78,14 @@ Question: Where are the stable pointer roots? (JSM)
 Answer: They're on the heap in a "Stable Pointer Table". (ADR)
 \begin{code}
 #ifndef CONCURRENT
-# define SM_MAXROOTS 8		/* 8 Vanilla Regs */
+# define SM_MAXROOTS 9		/* 8 Vanilla Regs + stable pointer table*/
 #else
 # ifndef PAR
 #   ifdef GRAN
 #    define SM_MAXROOTS (10 + (MAX_PROC*2) + 2 )
 		     /* unthreaded + hd/tl thread queues + Current/Main TSOs */
 #   else
-#     define SM_MAXROOTS 5      /* See c-as-asm/HpOverflow.lc */
+#     define SM_MAXROOTS 6      /* See c-as-asm/HpOverflow.lc */
 #   endif
 # else
 #  define SM_MAXROOTS 6         /* See c-as-asm/HpOverflow.lc */
@@ -453,20 +453,19 @@ Each garbage collector requires different garbage collection entries
 in the info-table.
 
 \begin{code}
-#if   defined(GC2s)
-#define _INFO_COPYING
 
-#else
-#if defined(GC1s)
+#if defined(GCdu) || defined (GCap) || defined (GCgn)
+#define _INFO_COPYING
 #define _INFO_COMPACTING
 #define _INFO_MARKING
-
 #else
-#if defined(GCdu) || defined (GCap) || defined (GCgn)
+#if   defined(GC2s)
 #define _INFO_COPYING
+
+#else
+#if defined(GC1s)
 #define _INFO_COMPACTING
 #define _INFO_MARKING
-
 #else
 /* NO_INFO_SPECIFIED (ToDo: an #error ?) */
 #endif