[project @ 2005-04-27 17:13:13 by sof]

[ghc-hetmet.git] / ghc / compiler / parser / hschooks.c

diff --git a/ghc/compiler/parser/hschooks.c b/ghc/compiler/parser/hschooks.c
index adc985b..5c1f023 100644 (file)
--- a/ghc/compiler/parser/hschooks.c
+++ b/ghc/compiler/parser/hschooks.c
@@ -4,10 +4,8 @@ for various bits of the RTS.  They are linked
 in instead of the defaults.
 */
 
-#include <string.h>
-
 /* For GHC 4.08, we are relying on the fact that RtsFlags has
- * compatibile layout with the current version, because we're
+ * compatible layout with the current version, because we're
  * #including the current version of RtsFlags.h below.  4.08 didn't
  * ship with its own RtsFlags.h, unfortunately.   For later GHC
  * versions, we #include the correct RtsFlags.h.
@@ -22,6 +20,8 @@ in instead of the defaults.
 
 #include "HsFFI.h"
 
+#include <string.h>
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -41,7 +41,7 @@ defaultsHook (void)
 void
 enableTimingStats( void )      /* called from the driver */
 {
-#if __GLASGOW_HASKELL__ >= 505
+#if __GLASGOW_HASKELL__ >= 411
     RtsFlags.GcFlags.giveStats = ONELINE_GC_STATS;
 #endif
     /* ignored when bootstrapping with an older GHC */
@@ -58,34 +58,18 @@ setHeapSize( HsInt size )
 }
 
 void
-PreTraceHook (long fd)
-{
-    const char msg[]="\n";
-    write(fd,msg,sizeof(msg)-1);
-}
-
-void
-PostTraceHook (long fd)
-{
-#if 0
-    const char msg[]="\n";
-    write(fd,msg,sizeof(msg)-1);
-#endif
-}
-
-void
-OutOfHeapHook (unsigned long request_size, unsigned long heap_size)
-  /* both in bytes */
+OutOfHeapHook (unsigned long request_size/* always zero these days */,
+              unsigned long heap_size)
+    /* both in bytes */
 {
-    fprintf(stderr, "GHC's heap exhausted;\nwhile trying to allocate %lu bytes in a %lu-byte heap;\nuse the `-H<size>' option to increase the total heap size.\n",
-       request_size,
+    fprintf(stderr, "GHC's heap exhausted: current limit is %lu bytes;\nUse the `-M<size>' option to increase the total heap size.\n",
        heap_size);
 }
 
 void
 StackOverflowHook (unsigned long stack_size)    /* in bytes */
 {
-    fprintf(stderr, "GHC stack-space overflow: current size %ld bytes.\nUse the `-K<size>' option to increase it.\n", stack_size);
+    fprintf(stderr, "GHC stack-space overflow: current limit is %ld bytes.\nUse the `-K<size>' option to increase it.\n", stack_size);
 }
 
 HsInt