[project @ 2003-09-23 17:07:39 by sof]

[ghc-hetmet.git] / ghc / rts / Linker.c

diff --git a/ghc/rts/Linker.c b/ghc/rts/Linker.c
index 61b0034..6753876 100644 (file)
--- a/ghc/rts/Linker.c
+++ b/ghc/rts/Linker.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Linker.c,v 1.126 2003/08/18 09:27:54 dons Exp $
+ * $Id: Linker.c,v 1.130 2003/09/21 22:20:54 wolfgang Exp $
  *
  * (c) The GHC Team, 2000-2003
  *
@@ -71,6 +71,7 @@
 #  include <mach-o/loader.h>
 #  include <mach-o/nlist.h>
 #  include <mach-o/reloc.h>
+#  include <mach-o/dyld.h>
 #endif
 
 /* Hash table mapping symbol names to Symbol */
@@ -374,11 +375,13 @@ typedef struct _RtsSymbolVal {
       SymX(gcdIntegerzh_fast)                  \
       SymX(gcdIntegerIntzh_fast)               \
       SymX(gcdIntzh_fast)                      \
+      SymX(genSymZh)                           \
       SymX(getProgArgv)                                \
       SymX(getStablePtr)                       \
       SymX(int2Integerzh_fast)                 \
       SymX(integer2Intzh_fast)                 \
       SymX(integer2Wordzh_fast)                        \
+      SymX(isCurrentThreadBoundzh_fast)                \
       SymX(isDoubleDenormalized)               \
       SymX(isDoubleInfinite)                   \
       SymX(isDoubleNaN)                                \
@@ -420,6 +423,7 @@ typedef struct _RtsSymbolVal {
       SymX(rts_eval)                           \
       SymX(rts_evalIO)                         \
       SymX(rts_evalLazyIO)                     \
+      SymX(rts_evalStableIO)                   \
       SymX(rts_eval_)                          \
       SymX(rts_getBool)                                \
       SymX(rts_getChar)                                \
@@ -453,6 +457,7 @@ typedef struct _RtsSymbolVal {
       SymX(rts_mkWord64)                       \
       SymX(rts_mkWord8)                                \
       SymX(rts_unlock)                         \
+      SymX(rtsSupportsBoundThreads)            \
       SymX(run_queue_hd)                       \
       SymX(setProgArgv)                                \
       SymX(startupHaskell)                     \
@@ -818,8 +823,15 @@ lookupSymbol( char *lbl )
     val = lookupStrHashTable(symhash, lbl);
 
     if (val == NULL) {
-#       if defined(OBJFORMAT_ELF) || defined(OBJFORMAT_MACHO)
+#       if defined(OBJFORMAT_ELF)
        return dlsym(dl_prog_handle, lbl);
+#       elif defined(OBJFORMAT_MACHO)
+       if(NSIsSymbolNameDefined(lbl)) {
+           NSSymbol symbol = NSLookupAndBindSymbol(lbl);
+           return NSAddressOfSymbol(symbol);
+       } else {
+           return NULL;
+       }
 #       elif defined(OBJFORMAT_PEi386)
         OpenedDLL* o_dll;
         void* sym;
@@ -2008,6 +2020,9 @@ ocResolve_PEi386 ( ObjectCode* oc )
 #  define ELF_TARGET_SPARC  /* Used inside <elf.h> */
 #elif defined(i386_TARGET_ARCH)
 #  define ELF_TARGET_386    /* Used inside <elf.h> */
+#elif defined(x86_64_TARGET_ARCH)
+#  define ELF_TARGET_X64_64
+#  define ELF_64BIT
 #elif defined (ia64_TARGET_ARCH)
 #  define ELF_TARGET_IA64   /* Used inside <elf.h> */
 #  define ELF_64BIT
@@ -3024,13 +3039,16 @@ static int resolveImports(
            return 0;
        }
        ASSERT(addr);
+       checkProddableBlock(oc,((void**)(image + sect->offset)) + i);
        ((void**)(image + sect->offset))[i] = addr;
     }
     
     return 1;
 }
 
-static int relocateSection(char *image, 
+static int relocateSection(
+    ObjectCode* oc,
+    char *image, 
     struct symtab_command *symLC, struct nlist *nlist,
     struct section* sections, struct section *sect)
 {
@@ -3058,6 +3076,7 @@ static int relocateSection(char *image,
                {
                    unsigned long* word = (unsigned long*) (image + sect->offset + scat->r_address);
                    
+                   checkProddableBlock(oc,word);
                    *word = scat->r_value + sect->offset + ((long) image);
                }
            }
@@ -3075,6 +3094,7 @@ static int relocateSection(char *image,
                unsigned long word = 0;
 
                unsigned long* wordPtr = (unsigned long*) (image + sect->offset + reloc->r_address);
+               checkProddableBlock(oc,wordPtr);
                
                if(reloc->r_type == GENERIC_RELOC_VANILLA)
                {
@@ -3209,6 +3229,10 @@ static int ocGetNames_MachO(ObjectCode* oc)
            addSection(oc, SECTIONKIND_RWDATA, 
                (void*) (image + sections[i].offset),
                (void*) (image + sections[i].offset + sections[i].size));
+               
+       if(sections[i].size > 0)    // size 0 segments do exist
+           addProddableBlock(oc, (void*) (image + sections[i].offset),
+                                           sections[i].size);
     }
 
        // count external symbols defined here
@@ -3325,7 +3349,7 @@ static int ocResolve_MachO(ObjectCode* oc)
     
     for(i=0;i<segLC->nsects;i++)
     {
-       if(!relocateSection(image,symLC,nlist,sections,&sections[i]))
+       if(!relocateSection(oc,image,symLC,nlist,sections,&sections[i]))
            return 0;
     }