X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FLinker.c;h=789093d8503aed77e8bba3ec170047a2ea6e4cb8;hb=e576ba5d31fbae54c43e88316fb0dbdba9cbd4ff;hp=207d48564779c66a10db925853f492d6b2a02669;hpb=9d0c072038f79d66cd1fc47d9cc7c16fb10d5219;p=ghc-hetmet.git diff --git a/rts/Linker.c b/rts/Linker.c index 207d485..789093d 100644 --- a/rts/Linker.c +++ b/rts/Linker.c @@ -10,7 +10,7 @@ #include "PosixSource.h" #endif -/* Linux needs _GNU_SOURCE to get RTLD_DEFAULT from and +/* Linux needs _GNU_SOURCE to get RTLD_DEFAULT from and MREMAP_MAYMOVE from . */ #ifdef __linux__ @@ -95,6 +95,11 @@ static /*Str*/HashTable *symhash; /* Hash table mapping symbol names to StgStablePtr */ static /*Str*/HashTable *stablehash; +#if defined(DEBUGGER) +/* Hash table mapping info table ptrs to DataCon names */ +static HashTable *dchash; +#endif + /* List of currently loaded objects */ ObjectCode *objects = NULL; /* initially empty */ @@ -397,7 +402,11 @@ typedef struct _RtsSymbolVal { #define RTS_USER_SIGNALS_SYMBOLS \ SymX(setIOManagerPipe) #else -#define RTS_USER_SIGNALS_SYMBOLS /* nothing */ +#define RTS_USER_SIGNALS_SYMBOLS \ + SymX(sendIOManagerEvent) \ + SymX(readIOManagerEvent) \ + SymX(getIOManagerEvent) \ + SymX(console_handler) #endif #ifdef TABLES_NEXT_TO_CODE @@ -517,6 +526,8 @@ typedef struct _RtsSymbolVal { SymX(hs_free_stable_ptr) \ SymX(hs_free_fun_ptr) \ SymX(initLinker) \ + SymX(infoPtrzh_fast) \ + SymX(closurePayloadzh_fast) \ SymX(int2Integerzh_fast) \ SymX(integer2Intzh_fast) \ SymX(integer2Wordzh_fast) \ @@ -535,6 +546,7 @@ typedef struct _RtsSymbolVal { SymX(insertStableSymbol) \ SymX(insertSymbol) \ SymX(lookupSymbol) \ + SymX(lookupDataCon) \ SymX(makeStablePtrzh_fast) \ SymX(minusIntegerzh_fast) \ SymX(mkApUpd0zh_fast) \ @@ -802,10 +814,11 @@ static RtsSymbolVal rtsSyms[] = { - /* ----------------------------------------------------------------------------- * Insert symbols into hash tables, checking for duplicates. */ +int isSuffixOf(char* x, char* suffix); + static void ghciInsertStrHashTable ( char* obj_name, HashTable *table, char* key, @@ -815,6 +828,15 @@ static void ghciInsertStrHashTable ( char* obj_name, if (lookupHashTable(table, (StgWord)key) == NULL) { insertStrHashTable(table, (StgWord)key, data); +#if defined(DEBUGGER) + // Insert the reverse pair in the datacon hash if it is a closure + { + if(isSuffixOf(key, "static_info") || isSuffixOf(key, "con_info")) { + insertHashTable(dchash, (StgWord)data, key); + // debugBelch("DChash addSymbol: %s (%p)\n", key, data); + } + } +#endif return; } debugBelch( @@ -835,8 +857,6 @@ static void ghciInsertStrHashTable ( char* obj_name, ); exit(1); } - - /* ----------------------------------------------------------------------------- * initialize the object linker */ @@ -862,6 +882,9 @@ initLinker( void ) stablehash = allocStrHashTable(); symhash = allocStrHashTable(); +#if defined(DEBUGGER) + dchash = allocHashTable(); +#endif /* populate the symbol table with stuff from the RTS */ for (sym = rtsSyms; sym->lbl != NULL; sym++) { @@ -1080,6 +1103,24 @@ lookupSymbol( char *lbl ) } } +#if defined(DEBUGGER) +char * +lookupDataCon( StgWord addr ) +{ + void *val; + initLinker() ; + ASSERT(dchash != NULL); + val = lookupHashTable(dchash, addr); + + return val; +} +#else +char* lookupDataCon( StgWord addr ) +{ + return NULL; +} +#endif + static __attribute((unused)) void * @@ -1157,13 +1198,12 @@ loadObj( char *path ) void *map_addr = NULL; #else FILE *f; - int misalignment; #endif initLinker(); /* debugBelch("loadObj %s\n", path ); */ - /* Check that we haven't already loaded this object. + /* Check that we haven't already loaded this object. Ignore requests to load multiple times */ { ObjectCode *o; @@ -1253,7 +1293,7 @@ loadObj( char *path ) #define EXTRA_MAP_FLAGS 0 #endif - oc->image = mmap(map_addr, n, PROT_EXEC|PROT_READ|PROT_WRITE, + oc->image = mmap(map_addr, n, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|EXTRA_MAP_FLAGS, fd, 0); if (oc->image == MAP_FAILED) barf("loadObj: can't map `%s'", path); @@ -1267,7 +1307,12 @@ loadObj( char *path ) if (!f) barf("loadObj: can't read `%s'", path); -#ifdef darwin_HOST_OS +# if defined(mingw32_HOST_OS) + // TODO: We would like to use allocateExec here, but allocateExec + // cannot currently allocate blocks large enough. + oc->image = VirtualAlloc(NULL, oc->fileSize, MEM_RESERVE | MEM_COMMIT, + PAGE_EXECUTE_READWRITE); +# elif defined(darwin_HOST_OS) // In a Mach-O .o file, all sections can and will be misaligned // if the total size of the headers is not a multiple of the // desired alignment. This is fine for .o files that only serve @@ -1277,15 +1322,13 @@ loadObj( char *path ) // We calculate the correct alignment from the header before // reading the file, and then we misalign oc->image on purpose so // that the actual sections end up aligned again. - misalignment = machoGetMisalignment(f); - oc->misalignment = misalignment; -#else - misalignment = 0; -#endif - - oc->image = stgMallocBytes(oc->fileSize + misalignment, "loadObj(image)"); + oc->misalignment = machoGetMisalignment(f); + oc->image = stgMallocBytes(oc->fileSize + oc->misalignment, "loadObj(image)"); oc->image += misalignment; - +# else + oc->image = stgMallocBytes(oc->fileSize, "loadObj(image)"); +# endif + n = fread ( oc->image, 1, oc->fileSize, f ); if (n != oc->fileSize) barf("loadObj: error whilst reading `%s'", path); @@ -1398,9 +1441,13 @@ unloadObj( char *path ) prev->next = oc->next; } - /* We're going to leave this in place, in case there are - any pointers from the heap into it: */ - /* stgFree(oc->image); */ + // We're going to leave this in place, in case there are + // any pointers from the heap into it: + // #ifdef mingw32_HOST_OS + // VirtualFree(oc->image); + // #else + // stgFree(oc->image); + // #endif stgFree(oc->fileName); stgFree(oc->symbols); stgFree(oc->sections); @@ -1475,7 +1522,7 @@ static void addSection ( ObjectCode* oc, SectionKind kind, /* ocAllocateJumpIslands - + Allocate additional space at the end of the object file image to make room for jump islands. @@ -4350,3 +4397,18 @@ static int machoGetMisalignment( FILE * f ) } #endif + +int isSuffixOf(char* x, char* suffix) { + int suffix_len = strlen (suffix); + int x_len = strlen (x); + + if (x_len == 0) + return 0; + if (suffix_len > x_len) + return 0; + if (suffix_len == 0) + return 1; + + char* x_suffix = &x[strlen(x)-strlen(suffix)]; + return strcmp(x_suffix, suffix) == 0; + }