X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FRtsUtils.h;h=96a5f0d82f9b11077f165db43fceee06891d20a3;hb=7f24ae51ed36c5c0308a2d0de23e243f32a0043c;hp=6f7111fc766c71b4af5fe1d4b6cd7b35ceadf779;hpb=95ca6bff6fc9918203173b442192d9298ef9757a;p=ghc-hetmet.git

diff --git a/ghc/rts/RtsUtils.h b/ghc/rts/RtsUtils.h
index 6f7111f..96a5f0d 100644
--- a/ghc/rts/RtsUtils.h
+++ b/ghc/rts/RtsUtils.h
@@ -1,6 +1,6 @@
 /* -----------------------------------------------------------------------------
  *
- * (c) The GHC Team, 1998-2004
+ * (c) The GHC Team, 1998-2005
  *
  * General utility functions used in the RTS.
  *
@@ -9,68 +9,27 @@
 #ifndef RTSUTILS_H
 #define RTSUTILS_H
 
-#include <stdarg.h>
-
 /* -----------------------------------------------------------------------------
- * Message generation
+ * (Checked) dynamic allocation
  * -------------------------------------------------------------------------- */
 
-/*
- * A fatal internal error: this is for errors that probably indicate
- * bugs in the RTS or compiler.  We normally output bug reporting
- * instructions along with the error message.
- */
-extern void barf(char *s, ...) 
-   GNUC3_ATTRIBUTE(__noreturn__);
-
-/*
- * An error condition which is caused by and/or can be corrected by
- * the user.
- */
-extern void errorBelch(char *s, ...)
-   GNUC3_ATTRIBUTE(format (printf, 1, 2));
-
-/*
- * A debugging message.  Debugging messages are generated either as a
- * virtue of having DEBUG turned on, or by being explicitly selected
- * via RTS options (eg. +RTS -Ds).
- */
-extern void debugBelch(char *s, ...)
-   GNUC3_ATTRIBUTE(format (printf, 1, 2));
-
-/* Version of debugBelch() that takes parameters as a va_list */
-extern void vdebugBelch(char *s, va_list ap);
-
-/* Hooks for redirecting message generation: */
-
-typedef void RtsMsgFunction(char *, va_list);
-
-extern RtsMsgFunction *fatalInternalMsgFn;
-extern RtsMsgFunction *debugMsgFn;
-extern RtsMsgFunction *errorMsgFn;
+extern void *stgMallocBytes(int n, char *msg)
+    GNUC3_ATTRIBUTE(__malloc__);
 
-/* Default stdio implementation of the message hooks: */
+extern void* stgMallocBytesRWX(int len)
+    GNUC3_ATTRIBUTE(__malloc__);
 
-extern RtsMsgFunction stdioFatalInternalMsgFn;
-extern RtsMsgFunction stdioDebugMsgFn;
-extern RtsMsgFunction stdioErrorMsgFn;
+extern void *stgReallocBytes(void *p, int n, char *msg);
 
-/* -----------------------------------------------------------------------------
- * (Checked) dynamic allocation
- * -------------------------------------------------------------------------- */
+extern void *stgCallocBytes(int n, int m, char *msg)
+     GNUC3_ATTRIBUTE(__malloc__);
 
-extern void *stgMallocBytes(int n, char *msg) GNUC3_ATTRIBUTE(__malloc__);
-extern void *stgReallocBytes(void *p, int n, char *msg);
-extern void *stgCallocBytes(int n, int m, char *msg) GNUC3_ATTRIBUTE(__malloc__);
 extern void stgFree(void* p);
 
-
 /* -----------------------------------------------------------------------------
  * Misc other utilities
  * -------------------------------------------------------------------------- */
 
-extern void _stgAssert (char *filename, unsigned int linenum);
-
 extern void heapOverflow(void);
 
 extern void setNonBlockingFd(int fd);
@@ -78,11 +37,11 @@ extern void resetNonBlockingFd(int fd);
 
 extern nat stg_strlen(char *str);
 
-char *time_str(void);
-char *ullong_format_string(ullong, char *, rtsBool);
+extern char *time_str(void);
+extern char *ullong_format_string(ullong, char *, rtsBool);
 
 #ifdef PAR
-ullong   msTime(void);
+extern ullong msTime(void);
 #endif
 
 #ifdef DEBUG
@@ -92,4 +51,4 @@ extern void heapCheckFail( void );
 extern void* __hscore_get_saved_termios(int fd);
 extern void __hscore_set_saved_termios(int fd, void* ts);
 
-#endif // RTSUTILS_H
+#endif /* RTSUTILS_H */