[project @ 2001-01-24 15:39:50 by simonmar]

Change the types of is_dynamically_blahblahblah to take void * rather
than char *.

diff --git a/ghc/rts/Linker.c b/ghc/rts/Linker.c
index ac91c61..7b9b404 100644 (file)
--- a/ghc/rts/Linker.c
+++ b/ghc/rts/Linker.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Linker.c,v 1.11 2001/01/19 17:31:24 simonmar Exp $
+ * $Id: Linker.c,v 1.12 2001/01/24 15:39:50 simonmar Exp $
  *
  * (c) The GHC Team, 2000
  *
@@ -13,6 +13,7 @@
 #include "Hash.h"
 #include "Linker.h"
 #include "RtsUtils.h"
+#include "StoragePriv.h"
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -25,7 +26,7 @@
 #ifdef HAVE_DLFCN_H
 #include <dlfcn.h>
 #endif
-  
+
 #ifdef GHCI /* endif is right at end of file */
 
 /* A bucket in the symbol hash-table.  Primarily, maps symbol names to
@@ -1491,7 +1492,7 @@ lookupSection ( void* addr )
 }
 
 int
-is_dynamically_loaded_code_or_rodata_ptr ( char* p )
+is_dynamically_loaded_code_or_rodata_ptr ( void* p )
 {
    SectionKind sk = lookupSection(p);
    ASSERT (sk != SECTIONKIND_NOINFOAVAIL);
@@ -1500,7 +1501,7 @@ is_dynamically_loaded_code_or_rodata_ptr ( char* p )
 
 
 int
-is_dynamically_loaded_rwdata_ptr ( char* p )
+is_dynamically_loaded_rwdata_ptr ( void* p )
 {
    SectionKind sk = lookupSection(p);
    ASSERT (sk != SECTIONKIND_NOINFOAVAIL);
@@ -1509,7 +1510,7 @@ is_dynamically_loaded_rwdata_ptr ( char* p )
 
 
 int
-is_not_dynamically_loaded_ptr ( char* p )
+is_not_dynamically_loaded_ptr ( void* p )
 {
    SectionKind sk = lookupSection(p);
    ASSERT (sk != SECTIONKIND_NOINFOAVAIL);

diff --git a/ghc/rts/Linker.h b/ghc/rts/Linker.h
index d4b723e..5ec2c01 100644 (file)
--- a/ghc/rts/Linker.h
+++ b/ghc/rts/Linker.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Linker.h,v 1.1 2000/10/06 15:33:27 simonmar Exp $
+ * $Id: Linker.h,v 1.2 2001/01/24 15:39:50 simonmar Exp $
  *
  * (c) The GHC Team, 2000
  *
@@ -21,9 +21,3 @@ HsInt loadObj( char *path );
 
 /* resolve all the currently unlinked objects in memory */
 HsInt resolveObjs( void );
-
-/* These three are used by the garbage collector (see ClosureMacros.h,
-   IS_CODE_PTR etc.). */
-int is_dynamically_loaded_code_or_rodata_ptr ( char* p );
-int is_dynamically_loaded_rwdata_ptr ( char* p );
-int is_not_dynamically_loaded_ptr ( char* p );

diff --git a/ghc/rts/StoragePriv.h b/ghc/rts/StoragePriv.h
index bcd221c..687ba1c 100644 (file)
--- a/ghc/rts/StoragePriv.h
+++ b/ghc/rts/StoragePriv.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: StoragePriv.h,v 1.13 2000/12/04 12:31:22 simonmar Exp $
+ * $Id: StoragePriv.h,v 1.14 2001/01/24 15:39:50 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -77,8 +77,8 @@ extern void checkSanity(nat N);
  * IS_CODE_PTR etc.). 
  * Defined in Linker.c.
  */
-int is_dynamically_loaded_code_or_rodata_ptr ( char* p );
-int is_dynamically_loaded_rwdata_ptr ( char* p );
-int is_not_dynamically_loaded_ptr ( char* p );
+int is_dynamically_loaded_code_or_rodata_ptr ( void* p );
+int is_dynamically_loaded_rwdata_ptr         ( void* p );
+int is_not_dynamically_loaded_ptr            ( void* p );
 
 #endif /* STORAGEPRIV_H */