X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FLinker.c;h=8aed2868e3e1f571cbb9e58847788c500b333e13;hb=e7c3f957fd36fd9f6369183b7a31e2a4a4c21b43;hp=dbf560e89a9bb9f72b77ec26e1f0c74083bb2ff8;hpb=47ff06307547e20eff37477a9bc9be80a460917a;p=ghc-hetmet.git diff --git a/ghc/rts/Linker.c b/ghc/rts/Linker.c index dbf560e..8aed286 100644 --- a/ghc/rts/Linker.c +++ b/ghc/rts/Linker.c @@ -42,7 +42,7 @@ #include #endif -#if defined(cygwin32_TARGET_OS) +#if defined(cygwin32_HOST_OS) #ifdef HAVE_DIRENT_H #include #endif @@ -58,12 +58,12 @@ #include #endif -#if defined(ia64_TARGET_ARCH) || defined(openbsd_TARGET_OS) +#if defined(ia64_HOST_ARCH) || defined(openbsd_HOST_OS) || defined(linux_HOST_OS) || defined(freebsd_HOST_OS) #define USE_MMAP #include #include -#if defined(openbsd_TARGET_OS) +#if defined(openbsd_HOST_OS) || defined(linux_HOST_OS) || defined(freebsd_HOST_OS) #ifdef HAVE_UNISTD_H #include #endif @@ -71,13 +71,13 @@ #endif -#if defined(linux_TARGET_OS) || defined(solaris2_TARGET_OS) || defined(freebsd_TARGET_OS) || defined(netbsd_TARGET_OS) || defined(openbsd_TARGET_OS) +#if defined(linux_HOST_OS) || defined(solaris2_HOST_OS) || defined(freebsd_HOST_OS) || defined(netbsd_HOST_OS) || defined(openbsd_HOST_OS) # define OBJFORMAT_ELF -#elif defined(cygwin32_TARGET_OS) || defined (mingw32_TARGET_OS) +#elif defined(cygwin32_HOST_OS) || defined (mingw32_HOST_OS) # define OBJFORMAT_PEi386 # include # include -#elif defined(darwin_TARGET_OS) +#elif defined(darwin_HOST_OS) # include # define OBJFORMAT_MACHO # include @@ -96,6 +96,9 @@ ObjectCode *objects = NULL; /* initially empty */ static int ocVerifyImage_ELF ( ObjectCode* oc ); static int ocGetNames_ELF ( ObjectCode* oc ); static int ocResolve_ELF ( ObjectCode* oc ); +#if defined(powerpc_HOST_ARCH) +static int ocAllocateJumpIslands_ELF ( ObjectCode* oc ); +#endif #elif defined(OBJFORMAT_PEi386) static int ocVerifyImage_PEi386 ( ObjectCode* oc ); static int ocGetNames_PEi386 ( ObjectCode* oc ); @@ -131,13 +134,13 @@ typedef struct _RtsSymbolVal { #define Maybe_Stable_Names #endif -#if !defined (mingw32_TARGET_OS) +#if !defined (mingw32_HOST_OS) #define RTS_POSIX_ONLY_SYMBOLS \ SymX(stg_sig_install) \ Sym(nocldstop) #endif -#if defined (cygwin32_TARGET_OS) +#if defined (cygwin32_HOST_OS) #define RTS_MINGW_ONLY_SYMBOLS /**/ /* Don't have the ability to read import libs / archives, so * we have to stupidly list a lot of what libcygwin.a @@ -221,10 +224,10 @@ typedef struct _RtsSymbolVal { SymX(utime) \ SymX(waitpid) -#elif !defined(mingw32_TARGET_OS) +#elif !defined(mingw32_HOST_OS) #define RTS_MINGW_ONLY_SYMBOLS /**/ #define RTS_CYGWIN_ONLY_SYMBOLS /**/ -#else /* defined(mingw32_TARGET_OS) */ +#else /* defined(mingw32_HOST_OS) */ #define RTS_POSIX_ONLY_SYMBOLS /**/ #define RTS_CYGWIN_ONLY_SYMBOLS /**/ @@ -293,6 +296,7 @@ typedef struct _RtsSymbolVal { SymX(log) \ SymX(sqrt) \ SymX(memcpy) \ + SymX(stg_InstallConsoleEvent) \ Sym(mktime) \ Sym(_imp___timezone) \ Sym(_imp___tzname) \ @@ -385,13 +389,19 @@ typedef struct _RtsSymbolVal { SymX(__int_encodeDouble) \ SymX(__int_encodeFloat) \ SymX(andIntegerzh_fast) \ + SymX(atomicallyzh_fast) \ SymX(barf) \ + SymX(debugBelch) \ + SymX(errorBelch) \ SymX(blockAsyncExceptionszh_fast) \ SymX(catchzh_fast) \ + SymX(catchRetryzh_fast) \ + SymX(catchSTMzh_fast) \ + SymX(closure_flags) \ SymX(cmp_thread) \ - SymX(complementIntegerzh_fast) \ SymX(cmpIntegerzh_fast) \ SymX(cmpIntegerIntzh_fast) \ + SymX(complementIntegerzh_fast) \ SymX(createAdjustor) \ SymX(decodeDoublezh_fast) \ SymX(decodeFloatzh_fast) \ @@ -410,6 +420,7 @@ typedef struct _RtsSymbolVal { SymX(gcdIntegerIntzh_fast) \ SymX(gcdIntzh_fast) \ SymX(genSymZh) \ + SymX(genericRaise) \ SymX(getProgArgv) \ SymX(getStablePtr) \ SymX(initLinker) \ @@ -440,6 +451,7 @@ typedef struct _RtsSymbolVal { SymX_redirect(newCAF, newDynCAF) \ SymX(newMVarzh_fast) \ SymX(newMutVarzh_fast) \ + SymX(newTVarzh_fast) \ SymX(atomicModifyMutVarzh_fast) \ SymX(newPinnedByteArrayzh_fast) \ SymX(orIntegerzh_fast) \ @@ -453,10 +465,12 @@ typedef struct _RtsSymbolVal { SymX(quotRemIntegerzh_fast) \ SymX(raisezh_fast) \ SymX(raiseIOzh_fast) \ + SymX(readTVarzh_fast) \ SymX(remIntegerzh_fast) \ SymX(resetNonBlockingFd) \ SymX(resumeThread) \ SymX(resolveObjs) \ + SymX(retryzh_fast) \ SymX(rts_apply) \ SymX(rts_checkSchedStatus) \ SymX(rts_eval) \ @@ -514,6 +528,7 @@ typedef struct _RtsSymbolVal { SymX(stg_IND_STATIC_info) \ SymX(stg_INTLIKE_closure) \ SymX(stg_MUT_ARR_PTRS_FROZEN_info) \ + SymX(stg_MUT_ARR_PTRS_FROZEN0_info) \ SymX(stg_WEAK_info) \ SymX(stg_ap_0_info) \ SymX(stg_ap_v_info) \ @@ -566,6 +581,7 @@ typedef struct _RtsSymbolVal { SymX(waitReadzh_fast) \ SymX(waitWritezh_fast) \ SymX(word2Integerzh_fast) \ + SymX(writeTVarzh_fast) \ SymX(xorIntegerzh_fast) \ SymX(yieldzh_fast) @@ -584,11 +600,12 @@ typedef struct _RtsSymbolVal { Sym(__udivdi3) \ Sym(__moddi3) \ Sym(__umoddi3) \ + Sym(__muldi3) \ Sym(__ashldi3) \ Sym(__ashrdi3) \ Sym(__lshrdi3) \ Sym(__eprintf) -#elif defined(ia64_TARGET_ARCH) +#elif defined(ia64_HOST_ARCH) #define RTS_LIBGCC_SYMBOLS \ Sym(__divdi3) \ Sym(__udivdi3) \ @@ -600,7 +617,7 @@ typedef struct _RtsSymbolVal { #define RTS_LIBGCC_SYMBOLS #endif -#ifdef darwin_TARGET_OS +#ifdef darwin_HOST_OS // Symbols that don't have a leading underscore // on Mac OS X. They have to receive special treatment, // see machoInitSymbolsWithoutUnderscore() @@ -665,7 +682,7 @@ static void ghciInsertStrHashTable ( char* obj_name, insertStrHashTable(table, (StgWord)key, data); return; } - fprintf(stderr, + debugBelch( "\n\n" "GHCi runtime linker: fatal error: I found a duplicate definition for symbol\n" " %s\n" @@ -697,7 +714,7 @@ static void *dl_prog_handle; #endif /* dlopen(NULL,..) doesn't work so we grab libc explicitly */ -#if defined(openbsd_TARGET_OS) +#if defined(openbsd_HOST_OS) static void *dl_libc_handle; #endif @@ -729,7 +746,7 @@ initLinker( void ) dl_prog_handle = RTLD_DEFAULT; # else dl_prog_handle = dlopen(NULL, RTLD_LAZY); -# if defined(openbsd_TARGET_OS) +# if defined(openbsd_HOST_OS) dl_libc_handle = dlopen("libc.so", RTLD_LAZY); # endif # endif // RTLD_DEFAULT @@ -802,7 +819,7 @@ addDLL( char *dll_name ) initLinker(); - /* fprintf(stderr, "\naddDLL; dll_name = `%s'\n", dll_name); */ + /* debugBelch("\naddDLL; dll_name = `%s'\n", dll_name); */ /* See if we've already got it, and ignore if so. */ for (o_dll = opened_dlls; o_dll != NULL; o_dll = o_dll->next) { @@ -862,7 +879,7 @@ lookupSymbol( char *lbl ) if (val == NULL) { # if defined(OBJFORMAT_ELF) -# if defined(openbsd_TARGET_OS) +# if defined(openbsd_HOST_OS) val = dlsym(dl_prog_handle, lbl); return (val != NULL) ? val : dlsym(dl_libc_handle,lbl); # else /* not openbsd */ @@ -879,7 +896,7 @@ lookupSymbol( char *lbl ) OpenedDLL* o_dll; void* sym; for (o_dll = opened_dlls; o_dll != NULL; o_dll = o_dll->next) { - /* fprintf(stderr, "look in %s for %s\n", o_dll->name, lbl); */ + /* debugBelch("look in %s for %s\n", o_dll->name, lbl); */ if (lbl[0] == '_') { /* HACK: if the name has an initial underscore, try stripping it off & look that up first. I've yet to verify whether there's @@ -888,13 +905,13 @@ lookupSymbol( char *lbl ) */ sym = GetProcAddress(o_dll->instance, (lbl+1)); if (sym != NULL) { - /*fprintf(stderr, "found %s in %s\n", lbl+1,o_dll->name); fflush(stderr);*/ + /*debugBelch("found %s in %s\n", lbl+1,o_dll->name);*/ return sym; } } sym = GetProcAddress(o_dll->instance, lbl); if (sym != NULL) { - /*fprintf(stderr, "found %s in %s\n", lbl,o_dll->name); fflush(stderr);*/ + /*debugBelch("found %s in %s\n", lbl,o_dll->name);*/ return sym; } } @@ -946,7 +963,7 @@ void ghci_enquire ( char* addr ) for (i = 0; i < oc->n_symbols; i++) { sym = oc->symbols[i]; if (sym == NULL) continue; - // fprintf(stderr, "enquire %p %p\n", sym, oc->lochash); + // debugBelch("enquire %p %p\n", sym, oc->lochash); a = NULL; if (oc->lochash != NULL) { a = lookupStrHashTable(oc->lochash, sym); @@ -955,17 +972,17 @@ void ghci_enquire ( char* addr ) a = lookupStrHashTable(symhash, sym); } if (a == NULL) { - // fprintf(stderr, "ghci_enquire: can't find %s\n", sym); + // debugBelch("ghci_enquire: can't find %s\n", sym); } else if (addr-DELTA <= a && a <= addr+DELTA) { - fprintf(stderr, "%p + %3d == `%s'\n", addr, a - addr, sym); + debugBelch("%p + %3d == `%s'\n", addr, a - addr, sym); } } } } #endif -#ifdef ia64_TARGET_ARCH +#ifdef ia64_HOST_ARCH static unsigned int PLTSize(void); #endif @@ -989,7 +1006,7 @@ loadObj( char *path ) initLinker(); - /* fprintf(stderr, "loadObj %s\n", path ); */ + /* debugBelch("loadObj %s\n", path ); */ /* Check that we haven't already loaded this object. Ignore requests to load multiple times */ @@ -1003,7 +1020,7 @@ loadObj( char *path ) } } if (is_dup) { - IF_DEBUG(linker, belch( + IF_DEBUG(linker, debugBelch( "GHCi runtime linker: warning: looks like you're trying to load the\n" "same object file twice:\n" " %s\n" @@ -1048,7 +1065,7 @@ loadObj( char *path ) /* On many architectures malloc'd memory isn't executable, so we need to use mmap. */ -#if defined(openbsd_TARGET_OS) +#if defined(openbsd_HOST_OS) fd = open(path, O_RDONLY, S_IRUSR); #else fd = open(path, O_RDONLY); @@ -1058,7 +1075,7 @@ loadObj( char *path ) pagesize = getpagesize(); -#ifdef ia64_TARGET_ARCH +#ifdef ia64_HOST_ARCH /* The PLT needs to be right before the object */ n = ROUND_UP(PLTSize(), pagesize); oc->plt = mmap(NULL, n, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0); @@ -1096,6 +1113,9 @@ loadObj( char *path ) # if defined(OBJFORMAT_MACHO) r = ocAllocateJumpIslands_MachO ( oc ); if (!r) { return r; } +# elif defined(OBJFORMAT_ELF) && defined(powerpc_HOST_ARCH) + r = ocAllocateJumpIslands_ELF ( oc ); + if (!r) { return r; } #endif /* verify the in-memory image */ @@ -1208,7 +1228,7 @@ unloadObj( char *path ) } } - belch("unloadObj: can't find `%s' to unload", path); + errorBelch("unloadObj: can't find `%s' to unload", path); return 0; } @@ -1221,7 +1241,7 @@ static void addProddableBlock ( ObjectCode* oc, void* start, int size ) { ProddableBlock* pb = stgMallocBytes(sizeof(ProddableBlock), "addProddableBlock"); - /* fprintf(stderr, "aPB %p %p %d\n", oc, start, size); */ + /* debugBelch("aPB %p %p %d\n", oc, start, size); */ ASSERT(size > 0); pb->start = start; pb->size = size; @@ -1257,12 +1277,118 @@ static void addSection ( ObjectCode* oc, SectionKind kind, s->next = oc->sections; oc->sections = s; /* - fprintf(stderr, "addSection: %p-%p (size %d), kind %d\n", + debugBelch("addSection: %p-%p (size %d), kind %d\n", start, ((char*)end)-1, end - start + 1, kind ); */ } +/* -------------------------------------------------------------------------- + * PowerPC specifics (jump islands) + * ------------------------------------------------------------------------*/ + +#if defined(powerpc_HOST_ARCH) + +/* + ocAllocateJumpIslands + + Allocate additional space at the end of the object file image to make room + for jump islands. + + PowerPC relative branch instructions have a 24 bit displacement field. + As PPC code is always 4-byte-aligned, this yields a +-32MB range. + If a particular imported symbol is outside this range, we have to redirect + the jump to a short piece of new code that just loads the 32bit absolute + address and jumps there. + This function just allocates space for one 16 byte ppcJumpIsland for every + undefined symbol in the object file. The code for the islands is filled in by + makeJumpIsland below. +*/ + +static int ocAllocateJumpIslands( ObjectCode* oc, int count, int first ) +{ + int aligned; + + if( count > 0 ) + { +#ifdef USE_MMAP + #error ocAllocateJumpIslands doesnt want USE_MMAP to be defined +#endif + // round up to the nearest 4 + aligned = (oc->fileSize + 3) & ~3; + + oc->image = stgReallocBytes( oc->image, + aligned + sizeof( ppcJumpIsland ) * count, + "ocAllocateJumpIslands" ); + oc->jump_islands = (ppcJumpIsland *) (((char *) oc->image) + aligned); + memset( oc->jump_islands, 0, sizeof( ppcJumpIsland ) * count ); + } + else + oc->jump_islands = NULL; + + oc->island_start_symbol = first; + oc->n_islands = count; + + return 1; +} + +static unsigned long makeJumpIsland( ObjectCode* oc, + unsigned long symbolNumber, + unsigned long target ) +{ + ppcJumpIsland *island; + + if( symbolNumber < oc->island_start_symbol || + symbolNumber - oc->island_start_symbol > oc->n_islands) + return 0; + + island = &oc->jump_islands[symbolNumber - oc->island_start_symbol]; + + // lis r12, hi16(target) + island->lis_r12 = 0x3d80; + island->hi_addr = target >> 16; + + // ori r12, r12, lo16(target) + island->ori_r12_r12 = 0x618c; + island->lo_addr = target & 0xffff; + + // mtctr r12 + island->mtctr_r12 = 0x7d8903a6; + + // bctr + island->bctr = 0x4e800420; + + return (unsigned long) island; +} + +/* + ocFlushInstructionCache + + Flush the data & instruction caches. + Because the PPC has split data/instruction caches, we have to + do that whenever we modify code at runtime. + */ + +static void ocFlushInstructionCache( ObjectCode *oc ) +{ + int n = (oc->fileSize + sizeof( ppcJumpIsland ) * oc->n_islands + 3) / 4; + unsigned long *p = (unsigned long *) oc->image; + + while( n-- ) + { + __asm__ volatile ( "dcbf 0,%0\n\t" + "sync\n\t" + "icbi 0,%0" + : + : "r" (p) + ); + p++; + } + __asm__ volatile ( "sync\n\t" + "isync" + ); +} +#endif /* -------------------------------------------------------------------------- * PEi386 specifics (Win32 targets) @@ -1419,12 +1545,12 @@ printName ( UChar* name, UChar* strtab ) { if (name[0]==0 && name[1]==0 && name[2]==0 && name[3]==0) { UInt32 strtab_offset = * (UInt32*)(name+4); - fprintf ( stderr, "%s", strtab + strtab_offset ); + debugBelch("%s", strtab + strtab_offset ); } else { int i; for (i = 0; i < 8; i++) { if (name[i] == 0) break; - fprintf ( stderr, "%c", name[i] ); + debugBelch("%c", name[i] ); } } } @@ -1531,7 +1657,7 @@ ocVerifyImage_PEi386 ( ObjectCode* oc ) COFF_section* sectab; COFF_symbol* symtab; UChar* strtab; - /* fprintf(stderr, "\nLOADING %s\n", oc->fileName); */ + /* debugBelch("\nLOADING %s\n", oc->fileName); */ hdr = (COFF_header*)(oc->image); sectab = (COFF_section*) ( ((UChar*)(oc->image)) @@ -1545,36 +1671,36 @@ ocVerifyImage_PEi386 ( ObjectCode* oc ) + hdr->NumberOfSymbols * sizeof_COFF_symbol; if (hdr->Machine != 0x14c) { - belch("Not x86 PEi386"); + errorBelch("Not x86 PEi386"); return 0; } if (hdr->SizeOfOptionalHeader != 0) { - belch("PEi386 with nonempty optional header"); + errorBelch("PEi386 with nonempty optional header"); return 0; } if ( /* (hdr->Characteristics & MYIMAGE_FILE_RELOCS_STRIPPED) || */ (hdr->Characteristics & MYIMAGE_FILE_EXECUTABLE_IMAGE) || (hdr->Characteristics & MYIMAGE_FILE_DLL) || (hdr->Characteristics & MYIMAGE_FILE_SYSTEM) ) { - belch("Not a PEi386 object file"); + errorBelch("Not a PEi386 object file"); return 0; } if ( (hdr->Characteristics & MYIMAGE_FILE_BYTES_REVERSED_HI) /* || !(hdr->Characteristics & MYIMAGE_FILE_32BIT_MACHINE) */ ) { - belch("Invalid PEi386 word size or endiannness: %d", + errorBelch("Invalid PEi386 word size or endiannness: %d", (int)(hdr->Characteristics)); return 0; } /* If the string table size is way crazy, this might indicate that there are more than 64k relocations, despite claims to the contrary. Hence this test. */ - /* fprintf(stderr, "strtab size %d\n", * (UInt32*)strtab); */ + /* debugBelch("strtab size %d\n", * (UInt32*)strtab); */ #if 0 if ( (*(UInt32*)strtab) > 600000 ) { /* Note that 600k has no special significance other than being big enough to handle the almost-2MB-sized lumps that constitute HSwin32*.o. */ - belch("PEi386 object has suspiciously large string table; > 64k relocs?"); + debugBelch("PEi386 object has suspiciously large string table; > 64k relocs?"); return 0; } #endif @@ -1584,44 +1710,34 @@ ocVerifyImage_PEi386 ( ObjectCode* oc ) IF_DEBUG(linker, i=1); if (i == 0) return 1; - fprintf ( stderr, - "sectab offset = %d\n", ((UChar*)sectab) - ((UChar*)hdr) ); - fprintf ( stderr, - "symtab offset = %d\n", ((UChar*)symtab) - ((UChar*)hdr) ); - fprintf ( stderr, - "strtab offset = %d\n", ((UChar*)strtab) - ((UChar*)hdr) ); - - fprintf ( stderr, "\n" ); - fprintf ( stderr, - "Machine: 0x%x\n", (UInt32)(hdr->Machine) ); - fprintf ( stderr, - "# sections: %d\n", (UInt32)(hdr->NumberOfSections) ); - fprintf ( stderr, - "time/date: 0x%x\n", (UInt32)(hdr->TimeDateStamp) ); - fprintf ( stderr, - "symtab offset: %d\n", (UInt32)(hdr->PointerToSymbolTable) ); - fprintf ( stderr, - "# symbols: %d\n", (UInt32)(hdr->NumberOfSymbols) ); - fprintf ( stderr, - "sz of opt hdr: %d\n", (UInt32)(hdr->SizeOfOptionalHeader) ); - fprintf ( stderr, - "characteristics: 0x%x\n", (UInt32)(hdr->Characteristics) ); + debugBelch( "sectab offset = %d\n", ((UChar*)sectab) - ((UChar*)hdr) ); + debugBelch( "symtab offset = %d\n", ((UChar*)symtab) - ((UChar*)hdr) ); + debugBelch( "strtab offset = %d\n", ((UChar*)strtab) - ((UChar*)hdr) ); + + debugBelch("\n" ); + debugBelch( "Machine: 0x%x\n", (UInt32)(hdr->Machine) ); + debugBelch( "# sections: %d\n", (UInt32)(hdr->NumberOfSections) ); + debugBelch( "time/date: 0x%x\n", (UInt32)(hdr->TimeDateStamp) ); + debugBelch( "symtab offset: %d\n", (UInt32)(hdr->PointerToSymbolTable) ); + debugBelch( "# symbols: %d\n", (UInt32)(hdr->NumberOfSymbols) ); + debugBelch( "sz of opt hdr: %d\n", (UInt32)(hdr->SizeOfOptionalHeader) ); + debugBelch( "characteristics: 0x%x\n", (UInt32)(hdr->Characteristics) ); /* Print the section table. */ - fprintf ( stderr, "\n" ); + debugBelch("\n" ); for (i = 0; i < hdr->NumberOfSections; i++) { COFF_reloc* reltab; COFF_section* sectab_i = (COFF_section*) myindex ( sizeof_COFF_section, sectab, i ); - fprintf ( stderr, + debugBelch( "\n" "section %d\n" " name `", i ); printName ( sectab_i->Name, strtab ); - fprintf ( stderr, + debugBelch( "'\n" " vsize %d\n" " vaddr %d\n" @@ -1661,7 +1777,7 @@ ocVerifyImage_PEi386 ( ObjectCode* oc ) COFF_symbol* sym; COFF_reloc* rel = (COFF_reloc*) myindex ( sizeof_COFF_reloc, reltab, j ); - fprintf ( stderr, + debugBelch( " type 0x%-4x vaddr 0x%-8x name `", (UInt32)rel->Type, rel->VirtualAddress ); @@ -1669,35 +1785,35 @@ ocVerifyImage_PEi386 ( ObjectCode* oc ) myindex ( sizeof_COFF_symbol, symtab, rel->SymbolTableIndex ); /* Hmm..mysterious looking offset - what's it for? SOF */ printName ( sym->Name, strtab -10 ); - fprintf ( stderr, "'\n" ); + debugBelch("'\n" ); } - fprintf ( stderr, "\n" ); + debugBelch("\n" ); } - fprintf ( stderr, "\n" ); - fprintf ( stderr, "string table has size 0x%x\n", * (UInt32*)strtab ); - fprintf ( stderr, "---START of string table---\n"); + debugBelch("\n" ); + debugBelch("string table has size 0x%x\n", * (UInt32*)strtab ); + debugBelch("---START of string table---\n"); for (i = 4; i < *(Int32*)strtab; i++) { if (strtab[i] == 0) - fprintf ( stderr, "\n"); else - fprintf( stderr, "%c", strtab[i] ); + debugBelch("\n"); else + debugBelch("%c", strtab[i] ); } - fprintf ( stderr, "--- END of string table---\n"); + debugBelch("--- END of string table---\n"); - fprintf ( stderr, "\n" ); + debugBelch("\n" ); i = 0; while (1) { COFF_symbol* symtab_i; if (i >= (Int32)(hdr->NumberOfSymbols)) break; symtab_i = (COFF_symbol*) myindex ( sizeof_COFF_symbol, symtab, i ); - fprintf ( stderr, + debugBelch( "symbol %d\n" " name `", i ); printName ( symtab_i->Name, strtab ); - fprintf ( stderr, + debugBelch( "'\n" " value 0x%x\n" " 1+sec# %d\n" @@ -1714,7 +1830,7 @@ ocVerifyImage_PEi386 ( ObjectCode* oc ) i++; } - fprintf ( stderr, "\n" ); + debugBelch("\n" ); return 1; } @@ -1760,7 +1876,7 @@ ocGetNames_PEi386 ( ObjectCode* oc ) "ocGetNames_PEi386(anonymous bss)"); sectab_i->PointerToRawData = ((UChar*)zspace) - ((UChar*)(oc->image)); addProddableBlock(oc, zspace, sectab_i->VirtualSize); - /* fprintf(stderr, "BSS anon section at 0x%x\n", zspace); */ + /* debugBelch("BSS anon section at 0x%x\n", zspace); */ } /* Copy section information into the ObjectCode. */ @@ -1775,7 +1891,7 @@ ocGetNames_PEi386 ( ObjectCode* oc ) COFF_section* sectab_i = (COFF_section*) myindex ( sizeof_COFF_section, sectab, i ); - IF_DEBUG(linker, belch("section name = %s\n", sectab_i->Name )); + IF_DEBUG(linker, debugBelch("section name = %s\n", sectab_i->Name )); # if 0 /* I'm sure this is the Right Way to do it. However, the @@ -1807,7 +1923,7 @@ ocGetNames_PEi386 ( ObjectCode* oc ) && 0 != strcmp(".stab", sectab_i->Name) && 0 != strcmp(".stabstr", sectab_i->Name) ) { - belch("Unknown PEi386 section name `%s'", sectab_i->Name); + errorBelch("Unknown PEi386 section name `%s'", sectab_i->Name); return 0; } @@ -1861,26 +1977,26 @@ ocGetNames_PEi386 ( ObjectCode* oc ) addSection(oc, SECTIONKIND_RWDATA, addr, ((UChar*)addr) + symtab_i->Value - 1); addProddableBlock(oc, addr, symtab_i->Value); - /* fprintf(stderr, "BSS section at 0x%x\n", addr); */ + /* debugBelch("BSS section at 0x%x\n", addr); */ } if (addr != NULL ) { sname = cstring_from_COFF_symbol_name ( symtab_i->Name, strtab ); - /* fprintf(stderr,"addSymbol %p `%s \n", addr,sname); */ - IF_DEBUG(linker, belch("addSymbol %p `%s'\n", addr,sname);) + /* debugBelch("addSymbol %p `%s \n", addr,sname); */ + IF_DEBUG(linker, debugBelch("addSymbol %p `%s'\n", addr,sname);) ASSERT(i >= 0 && i < oc->n_symbols); /* cstring_from_COFF_symbol_name always succeeds. */ oc->symbols[i] = sname; ghciInsertStrHashTable(oc->fileName, symhash, sname, addr); } else { # if 0 - fprintf ( stderr, + debugBelch( "IGNORING symbol %d\n" " name `", i ); printName ( symtab_i->Name, strtab ); - fprintf ( stderr, + debugBelch( "'\n" " value 0x%x\n" " 1+sec# %d\n" @@ -1922,7 +2038,7 @@ ocResolve_PEi386 ( ObjectCode* oc ) /* ToDo: should be variable-sized? But is at least safe in the sense of buffer-overrun-proof. */ char symbol[1000]; - /* fprintf(stderr, "resolving for %s\n", oc->fileName); */ + /* debugBelch("resolving for %s\n", oc->fileName); */ hdr = (COFF_header*)(oc->image); sectab = (COFF_section*) ( @@ -1966,7 +2082,8 @@ ocResolve_PEi386 ( ObjectCode* oc ) COFF_reloc* rel = (COFF_reloc*) myindex ( sizeof_COFF_reloc, reltab, 0 ); noRelocs = rel->VirtualAddress; - fprintf(stderr, "WARNING: Overflown relocation field (# relocs found: %u)\n", noRelocs); fflush(stderr); + debugBelch("WARNING: Overflown relocation field (# relocs found: %u)\n", + noRelocs); j = 1; } else { noRelocs = sectab_i->NumberOfRelocations; @@ -1994,20 +2111,20 @@ ocResolve_PEi386 ( ObjectCode* oc ) myindex ( sizeof_COFF_symbol, symtab, reltab_j->SymbolTableIndex ); IF_DEBUG(linker, - fprintf ( stderr, + debugBelch( "reloc sec %2d num %3d: type 0x%-4x " "vaddr 0x%-8x name `", i, j, (UInt32)reltab_j->Type, reltab_j->VirtualAddress ); printName ( sym->Name, strtab ); - fprintf ( stderr, "'\n" )); + debugBelch("'\n" )); if (sym->StorageClass == MYIMAGE_SYM_CLASS_STATIC) { COFF_section* section_sym = findPEi386SectionCalled ( oc, sym->Name ); if (!section_sym) { - belch("%s: can't find section `%s'", oc->fileName, sym->Name); + errorBelch("%s: can't find section `%s'", oc->fileName, sym->Name); return 0; } S = ((UInt32)(oc->image)) @@ -2025,7 +2142,7 @@ ocResolve_PEi386 ( ObjectCode* oc ) (void*)S = lookupSymbol( symbol ); if ((void*)S != NULL) goto foundit; /* Newline first because the interactive linker has printed "linking..." */ - belch("\n%s: unknown symbol `%s'", oc->fileName, symbol); + errorBelch("\n%s: unknown symbol `%s'", oc->fileName, symbol); return 0; foundit: } @@ -2050,7 +2167,7 @@ ocResolve_PEi386 ( ObjectCode* oc ) *pP = S - ((UInt32)pP) - 4; break; default: - belch("%s: unhandled PEi386 relocation type %d", + debugBelch("%s: unhandled PEi386 relocation type %d", oc->fileName, reltab_j->Type); return 0; } @@ -2058,7 +2175,7 @@ ocResolve_PEi386 ( ObjectCode* oc ) } } - IF_DEBUG(linker, belch("completed %s", oc->fileName)); + IF_DEBUG(linker, debugBelch("completed %s", oc->fileName)); return 1; } @@ -2074,14 +2191,14 @@ ocResolve_PEi386 ( ObjectCode* oc ) #define FALSE 0 #define TRUE 1 -#if defined(sparc_TARGET_ARCH) +#if defined(sparc_HOST_ARCH) # define ELF_TARGET_SPARC /* Used inside */ -#elif defined(i386_TARGET_ARCH) +#elif defined(i386_HOST_ARCH) # define ELF_TARGET_386 /* Used inside */ -#elif defined(x86_64_TARGET_ARCH) +#elif defined(x86_64_HOST_ARCH) # define ELF_TARGET_X64_64 # define ELF_64BIT -#elif defined (ia64_TARGET_ARCH) +#elif defined (ia64_HOST_ARCH) # define ELF_TARGET_IA64 /* Used inside */ # define ELF_64BIT # define ELF_FUNCTION_DESC /* calling convention uses function descriptors */ @@ -2089,7 +2206,7 @@ ocResolve_PEi386 ( ObjectCode* oc ) # define ELF_NEED_PLT /* needs Procedure Linkage Tables */ #endif -#if !defined(openbsd_TARGET_OS) +#if !defined(openbsd_HOST_OS) #include #else /* openbsd elf has things in different places, with diff names */ @@ -2211,7 +2328,7 @@ copyFunctionDesc(Elf_Addr target) #endif #ifdef ELF_NEED_PLT -#ifdef ia64_TARGET_ARCH +#ifdef ia64_HOST_ARCH static void ia64_reloc_gprel22(Elf_Addr target, Elf_Addr value); static void ia64_reloc_pcrel21(Elf_Addr target, Elf_Addr value, ObjectCode *oc); @@ -2292,7 +2409,7 @@ findElfSection ( void* objImage, Elf_Word sh_type ) return ptr; } -#if defined(ia64_TARGET_ARCH) +#if defined(ia64_HOST_ARCH) static Elf_Addr findElfSegment ( void* objImage, Elf_Addr vaddr ) { @@ -2327,45 +2444,46 @@ ocVerifyImage_ELF ( ObjectCode* oc ) ehdr->e_ident[EI_MAG1] != ELFMAG1 || ehdr->e_ident[EI_MAG2] != ELFMAG2 || ehdr->e_ident[EI_MAG3] != ELFMAG3) { - belch("%s: not an ELF object", oc->fileName); + errorBelch("%s: not an ELF object", oc->fileName); return 0; } if (ehdr->e_ident[EI_CLASS] != ELFCLASS) { - belch("%s: unsupported ELF format", oc->fileName); + errorBelch("%s: unsupported ELF format", oc->fileName); return 0; } if (ehdr->e_ident[EI_DATA] == ELFDATA2LSB) { - IF_DEBUG(linker,belch( "Is little-endian" )); + IF_DEBUG(linker,debugBelch( "Is little-endian\n" )); } else if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB) { - IF_DEBUG(linker,belch( "Is big-endian" )); + IF_DEBUG(linker,debugBelch( "Is big-endian\n" )); } else { - belch("%s: unknown endiannness", oc->fileName); + errorBelch("%s: unknown endiannness", oc->fileName); return 0; } if (ehdr->e_type != ET_REL) { - belch("%s: not a relocatable object (.o) file", oc->fileName); + errorBelch("%s: not a relocatable object (.o) file", oc->fileName); return 0; } - IF_DEBUG(linker, belch( "Is a relocatable object (.o) file" )); + IF_DEBUG(linker, debugBelch( "Is a relocatable object (.o) file\n" )); - IF_DEBUG(linker,belch( "Architecture is " )); + IF_DEBUG(linker,debugBelch( "Architecture is " )); switch (ehdr->e_machine) { - case EM_386: IF_DEBUG(linker,belch( "x86" )); break; - case EM_SPARC: IF_DEBUG(linker,belch( "sparc" )); break; + case EM_386: IF_DEBUG(linker,debugBelch( "x86" )); break; + case EM_SPARC: IF_DEBUG(linker,debugBelch( "sparc" )); break; #ifdef EM_IA_64 - case EM_IA_64: IF_DEBUG(linker,belch( "ia64" )); break; + case EM_IA_64: IF_DEBUG(linker,debugBelch( "ia64" )); break; #endif - default: IF_DEBUG(linker,belch( "unknown" )); - belch("%s: unknown architecture", oc->fileName); + case EM_PPC: IF_DEBUG(linker,debugBelch( "powerpc32" )); break; + default: IF_DEBUG(linker,debugBelch( "unknown" )); + errorBelch("%s: unknown architecture", oc->fileName); return 0; } - IF_DEBUG(linker,belch( - "\nSection header table: start %d, n_entries %d, ent_size %d", + IF_DEBUG(linker,debugBelch( + "\nSection header table: start %d, n_entries %d, ent_size %d\n", ehdr->e_shoff, ehdr->e_shnum, ehdr->e_shentsize )); ASSERT (ehdr->e_shentsize == sizeof(Elf_Shdr)); @@ -2373,36 +2491,36 @@ ocVerifyImage_ELF ( ObjectCode* oc ) shdr = (Elf_Shdr*) (ehdrC + ehdr->e_shoff); if (ehdr->e_shstrndx == SHN_UNDEF) { - belch("%s: no section header string table", oc->fileName); + errorBelch("%s: no section header string table", oc->fileName); return 0; } else { - IF_DEBUG(linker,belch( "Section header string table is section %d", + IF_DEBUG(linker,debugBelch( "Section header string table is section %d\n", ehdr->e_shstrndx)); sh_strtab = ehdrC + shdr[ehdr->e_shstrndx].sh_offset; } for (i = 0; i < ehdr->e_shnum; i++) { - IF_DEBUG(linker,fprintf(stderr, "%2d: ", i )); - IF_DEBUG(linker,fprintf(stderr, "type=%2d ", (int)shdr[i].sh_type )); - IF_DEBUG(linker,fprintf(stderr, "size=%4d ", (int)shdr[i].sh_size )); - IF_DEBUG(linker,fprintf(stderr, "offs=%4d ", (int)shdr[i].sh_offset )); - IF_DEBUG(linker,fprintf(stderr, " (%p .. %p) ", + IF_DEBUG(linker,debugBelch("%2d: ", i )); + IF_DEBUG(linker,debugBelch("type=%2d ", (int)shdr[i].sh_type )); + IF_DEBUG(linker,debugBelch("size=%4d ", (int)shdr[i].sh_size )); + IF_DEBUG(linker,debugBelch("offs=%4d ", (int)shdr[i].sh_offset )); + IF_DEBUG(linker,debugBelch(" (%p .. %p) ", ehdrC + shdr[i].sh_offset, ehdrC + shdr[i].sh_offset + shdr[i].sh_size - 1)); if (shdr[i].sh_type == SHT_REL) { - IF_DEBUG(linker,fprintf(stderr, "Rel " )); + IF_DEBUG(linker,debugBelch("Rel " )); } else if (shdr[i].sh_type == SHT_RELA) { - IF_DEBUG(linker,fprintf(stderr, "RelA " )); + IF_DEBUG(linker,debugBelch("RelA " )); } else { - IF_DEBUG(linker,fprintf(stderr," ")); + IF_DEBUG(linker,debugBelch(" ")); } if (sh_strtab) { - IF_DEBUG(linker,fprintf(stderr, "sname=%s\n", sh_strtab + shdr[i].sh_name )); + IF_DEBUG(linker,debugBelch("sname=%s\n", sh_strtab + shdr[i].sh_name )); } } - IF_DEBUG(linker,belch( "\nString tables" )); + IF_DEBUG(linker,debugBelch( "\nString tables" )); strtab = NULL; nstrtab = 0; for (i = 0; i < ehdr->e_shnum; i++) { @@ -2413,71 +2531,103 @@ ocVerifyImage_ELF ( ObjectCode* oc ) debugging info. */ && 0 != memcmp(".stabstr", sh_strtab + shdr[i].sh_name, 8) ) { - IF_DEBUG(linker,belch(" section %d is a normal string table", i )); + IF_DEBUG(linker,debugBelch(" section %d is a normal string table", i )); strtab = ehdrC + shdr[i].sh_offset; nstrtab++; } } if (nstrtab != 1) { - belch("%s: no string tables, or too many", oc->fileName); + errorBelch("%s: no string tables, or too many", oc->fileName); return 0; } nsymtabs = 0; - IF_DEBUG(linker,belch( "\nSymbol tables" )); + IF_DEBUG(linker,debugBelch( "\nSymbol tables" )); for (i = 0; i < ehdr->e_shnum; i++) { if (shdr[i].sh_type != SHT_SYMTAB) continue; - IF_DEBUG(linker,belch( "section %d is a symbol table", i )); + IF_DEBUG(linker,debugBelch( "section %d is a symbol table\n", i )); nsymtabs++; stab = (Elf_Sym*) (ehdrC + shdr[i].sh_offset); nent = shdr[i].sh_size / sizeof(Elf_Sym); - IF_DEBUG(linker,belch( " number of entries is apparently %d (%d rem)", + IF_DEBUG(linker,debugBelch( " number of entries is apparently %d (%d rem)\n", nent, shdr[i].sh_size % sizeof(Elf_Sym) )); if (0 != shdr[i].sh_size % sizeof(Elf_Sym)) { - belch("%s: non-integral number of symbol table entries", oc->fileName); + errorBelch("%s: non-integral number of symbol table entries", oc->fileName); return 0; } for (j = 0; j < nent; j++) { - IF_DEBUG(linker,fprintf(stderr, " %2d ", j )); - IF_DEBUG(linker,fprintf(stderr, " sec=%-5d size=%-3d val=%5p ", + IF_DEBUG(linker,debugBelch(" %2d ", j )); + IF_DEBUG(linker,debugBelch(" sec=%-5d size=%-3d val=%5p ", (int)stab[j].st_shndx, (int)stab[j].st_size, (char*)stab[j].st_value )); - IF_DEBUG(linker,fprintf(stderr, "type=" )); + IF_DEBUG(linker,debugBelch("type=" )); switch (ELF_ST_TYPE(stab[j].st_info)) { - case STT_NOTYPE: IF_DEBUG(linker,fprintf(stderr, "notype " )); break; - case STT_OBJECT: IF_DEBUG(linker,fprintf(stderr, "object " )); break; - case STT_FUNC : IF_DEBUG(linker,fprintf(stderr, "func " )); break; - case STT_SECTION: IF_DEBUG(linker,fprintf(stderr, "section" )); break; - case STT_FILE: IF_DEBUG(linker,fprintf(stderr, "file " )); break; - default: IF_DEBUG(linker,fprintf(stderr, "? " )); break; + case STT_NOTYPE: IF_DEBUG(linker,debugBelch("notype " )); break; + case STT_OBJECT: IF_DEBUG(linker,debugBelch("object " )); break; + case STT_FUNC : IF_DEBUG(linker,debugBelch("func " )); break; + case STT_SECTION: IF_DEBUG(linker,debugBelch("section" )); break; + case STT_FILE: IF_DEBUG(linker,debugBelch("file " )); break; + default: IF_DEBUG(linker,debugBelch("? " )); break; } - IF_DEBUG(linker,fprintf(stderr, " " )); + IF_DEBUG(linker,debugBelch(" " )); - IF_DEBUG(linker,fprintf(stderr, "bind=" )); + IF_DEBUG(linker,debugBelch("bind=" )); switch (ELF_ST_BIND(stab[j].st_info)) { - case STB_LOCAL : IF_DEBUG(linker,fprintf(stderr, "local " )); break; - case STB_GLOBAL: IF_DEBUG(linker,fprintf(stderr, "global" )); break; - case STB_WEAK : IF_DEBUG(linker,fprintf(stderr, "weak " )); break; - default: IF_DEBUG(linker,fprintf(stderr, "? " )); break; + case STB_LOCAL : IF_DEBUG(linker,debugBelch("local " )); break; + case STB_GLOBAL: IF_DEBUG(linker,debugBelch("global" )); break; + case STB_WEAK : IF_DEBUG(linker,debugBelch("weak " )); break; + default: IF_DEBUG(linker,debugBelch("? " )); break; } - IF_DEBUG(linker,fprintf(stderr, " " )); + IF_DEBUG(linker,debugBelch(" " )); - IF_DEBUG(linker,fprintf(stderr, "name=%s\n", strtab + stab[j].st_name )); + IF_DEBUG(linker,debugBelch("name=%s\n", strtab + stab[j].st_name )); } } if (nsymtabs == 0) { - belch("%s: didn't find any symbol tables", oc->fileName); + errorBelch("%s: didn't find any symbol tables", oc->fileName); return 0; } return 1; } +static int getSectionKind_ELF( Elf_Shdr *hdr, int *is_bss ) +{ + *is_bss = FALSE; + + if (hdr->sh_type == SHT_PROGBITS + && (hdr->sh_flags & SHF_ALLOC) && (hdr->sh_flags & SHF_EXECINSTR)) { + /* .text-style section */ + return SECTIONKIND_CODE_OR_RODATA; + } + + if (hdr->sh_type == SHT_PROGBITS + && (hdr->sh_flags & SHF_ALLOC) && (hdr->sh_flags & SHF_WRITE)) { + /* .data-style section */ + return SECTIONKIND_RWDATA; + } + + if (hdr->sh_type == SHT_PROGBITS + && (hdr->sh_flags & SHF_ALLOC) && !(hdr->sh_flags & SHF_WRITE)) { + /* .rodata-style section */ + return SECTIONKIND_CODE_OR_RODATA; + } + + if (hdr->sh_type == SHT_NOBITS + && (hdr->sh_flags & SHF_ALLOC) && (hdr->sh_flags & SHF_WRITE)) { + /* .bss-style section */ + *is_bss = TRUE; + return SECTIONKIND_RWDATA; + } + + return SECTIONKIND_OTHER; +} + static int ocGetNames_ELF ( ObjectCode* oc ) @@ -2493,7 +2643,7 @@ ocGetNames_ELF ( ObjectCode* oc ) ASSERT(symhash != NULL); if (!strtab) { - belch("%s: no strtab", oc->fileName); + errorBelch("%s: no strtab", oc->fileName); return 0; } @@ -2502,34 +2652,8 @@ ocGetNames_ELF ( ObjectCode* oc ) /* Figure out what kind of section it is. Logic derived from Figure 1.14 ("Special Sections") of the ELF document ("Portable Formats Specification, Version 1.1"). */ - Elf_Shdr hdr = shdr[i]; - SectionKind kind = SECTIONKIND_OTHER; int is_bss = FALSE; - - if (hdr.sh_type == SHT_PROGBITS - && (hdr.sh_flags & SHF_ALLOC) && (hdr.sh_flags & SHF_EXECINSTR)) { - /* .text-style section */ - kind = SECTIONKIND_CODE_OR_RODATA; - } - else - if (hdr.sh_type == SHT_PROGBITS - && (hdr.sh_flags & SHF_ALLOC) && (hdr.sh_flags & SHF_WRITE)) { - /* .data-style section */ - kind = SECTIONKIND_RWDATA; - } - else - if (hdr.sh_type == SHT_PROGBITS - && (hdr.sh_flags & SHF_ALLOC) && !(hdr.sh_flags & SHF_WRITE)) { - /* .rodata-style section */ - kind = SECTIONKIND_CODE_OR_RODATA; - } - else - if (hdr.sh_type == SHT_NOBITS - && (hdr.sh_flags & SHF_ALLOC) && (hdr.sh_flags & SHF_WRITE)) { - /* .bss-style section */ - kind = SECTIONKIND_RWDATA; - is_bss = TRUE; - } + SectionKind kind = getSectionKind_ELF(&shdr[i], &is_bss); if (is_bss && shdr[i].sh_size > 0) { /* This is a non-empty .bss section. Allocate zeroed space for @@ -2539,7 +2663,7 @@ ocGetNames_ELF ( ObjectCode* oc ) "ocGetNames_ELF(BSS)"); shdr[i].sh_offset = ((char*)zspace) - ((char*)ehdrC); /* - fprintf(stderr, "BSS section at 0x%x, size %d\n", + debugBelch("BSS section at 0x%x, size %d\n", zspace, shdr[i].sh_size); */ } @@ -2575,7 +2699,7 @@ ocGetNames_ELF ( ObjectCode* oc ) isLocal = FALSE; ad = stgCallocBytes(1, stab[j].st_size, "ocGetNames_ELF(COMMON)"); /* - fprintf(stderr, "COMMON symbol, size %d name %s\n", + debugBelch("COMMON symbol, size %d name %s\n", stab[j].st_size, nm); */ /* Pointless to do addProddableBlock() for this area, @@ -2600,7 +2724,7 @@ ocGetNames_ELF ( ObjectCode* oc ) ASSERT(secno > 0 && secno < ehdr->e_shnum); /* if (shdr[secno].sh_type == SHT_NOBITS) { - fprintf(stderr, " BSS symbol, size %d off %d name %s\n", + debugBelch(" BSS symbol, size %d off %d name %s\n", stab[j].st_size, stab[j].st_value, nm); } */ @@ -2615,7 +2739,7 @@ ocGetNames_ELF ( ObjectCode* oc ) if (ELF_ST_TYPE(stab[j].st_info) == STT_FUNC) ad = (char *)allocateFunctionDesc((Elf_Addr)ad); #endif - IF_DEBUG(linker,belch( "addOTabName(GLOB): %10p %s %s", + IF_DEBUG(linker,debugBelch( "addOTabName(GLOB): %10p %s %s", ad, oc->fileName, nm )); isLocal = FALSE; } @@ -2634,10 +2758,10 @@ ocGetNames_ELF ( ObjectCode* oc ) } } else { /* Skip. */ - IF_DEBUG(linker,belch( "skipping `%s'", + IF_DEBUG(linker,debugBelch( "skipping `%s'\n", strtab + stab[j].st_name )); /* - fprintf(stderr, + debugBelch( "skipping bind = %d, type = %d, shndx = %d `%s'\n", (int)ELF_ST_BIND(stab[j].st_info), (int)ELF_ST_TYPE(stab[j].st_info), @@ -2671,9 +2795,19 @@ do_Elf_Rel_relocations ( ObjectCode* oc, char* ehdrC, stab = (Elf_Sym*) (ehdrC + shdr[ symtab_shndx ].sh_offset); targ = (Elf_Word*)(ehdrC + shdr[ target_shndx ].sh_offset); - IF_DEBUG(linker,belch( "relocations for section %d using symtab %d", + IF_DEBUG(linker,debugBelch( "relocations for section %d using symtab %d\n", target_shndx, symtab_shndx )); + /* Skip sections that we're not interested in. */ + { + int is_bss; + SectionKind kind = getSectionKind_ELF(&shdr[target_shndx], &is_bss); + if (kind == SECTIONKIND_OTHER) { + IF_DEBUG(linker,debugBelch( "skipping (target section not loaded)")); + return 1; + } + } + for (j = 0; j < nent; j++) { Elf_Addr offset = rtab[j].r_offset; Elf_Addr info = rtab[j].r_info; @@ -2685,10 +2819,10 @@ do_Elf_Rel_relocations ( ObjectCode* oc, char* ehdrC, void* S_tmp; Elf_Addr value; - IF_DEBUG(linker,belch( "Rel entry %3d is raw(%6p %6p)", + IF_DEBUG(linker,debugBelch( "Rel entry %3d is raw(%6p %6p)", j, (void*)offset, (void*)info )); if (!info) { - IF_DEBUG(linker,belch( " ZERO" )); + IF_DEBUG(linker,debugBelch( " ZERO" )); S = 0; } else { Elf_Sym sym = stab[ELF_R_SYM(info)]; @@ -2708,25 +2842,25 @@ do_Elf_Rel_relocations ( ObjectCode* oc, char* ehdrC, S = (Elf_Addr)S_tmp; } if (!S) { - belch("%s: unknown symbol `%s'", oc->fileName, symbol); + errorBelch("%s: unknown symbol `%s'", oc->fileName, symbol); return 0; } - IF_DEBUG(linker,belch( "`%s' resolves to %p", symbol, (void*)S )); + IF_DEBUG(linker,debugBelch( "`%s' resolves to %p\n", symbol, (void*)S )); } - IF_DEBUG(linker,belch( "Reloc: P = %p S = %p A = %p", + IF_DEBUG(linker,debugBelch( "Reloc: P = %p S = %p A = %p\n", (void*)P, (void*)S, (void*)A )); checkProddableBlock ( oc, pP ); value = S + A; switch (ELF_R_TYPE(info)) { -# ifdef i386_TARGET_ARCH +# ifdef i386_HOST_ARCH case R_386_32: *pP = value; break; case R_386_PC32: *pP = value - P; break; # endif default: - belch("%s: unhandled ELF relocation(Rel) type %d\n", + errorBelch("%s: unhandled ELF relocation(Rel) type %d\n", oc->fileName, ELF_R_TYPE(info)); return 0; } @@ -2752,11 +2886,11 @@ do_Elf_Rela_relocations ( ObjectCode* oc, char* ehdrC, stab = (Elf_Sym*) (ehdrC + shdr[ symtab_shndx ].sh_offset); targ = (Elf_Addr) (ehdrC + shdr[ target_shndx ].sh_offset); - IF_DEBUG(linker,belch( "relocations for section %d using symtab %d", + IF_DEBUG(linker,debugBelch( "relocations for section %d using symtab %d\n", target_shndx, symtab_shndx )); for (j = 0; j < nent; j++) { -#if defined(DEBUG) || defined(sparc_TARGET_ARCH) || defined(ia64_TARGET_ARCH) +#if defined(DEBUG) || defined(sparc_HOST_ARCH) || defined(ia64_HOST_ARCH) || defined(powerpc_HOST_ARCH) /* This #ifdef only serves to avoid unused-var warnings. */ Elf_Addr offset = rtab[j].r_offset; Elf_Addr P = targ + offset; @@ -2766,19 +2900,21 @@ do_Elf_Rela_relocations ( ObjectCode* oc, char* ehdrC, Elf_Addr S; void* S_tmp; Elf_Addr value; -# if defined(sparc_TARGET_ARCH) +# if defined(sparc_HOST_ARCH) Elf_Word* pP = (Elf_Word*)P; Elf_Word w1, w2; -# elif defined(ia64_TARGET_ARCH) +# elif defined(ia64_HOST_ARCH) Elf64_Xword *pP = (Elf64_Xword *)P; Elf_Addr addr; +# elif defined(powerpc_HOST_ARCH) + Elf_Sword delta; # endif - IF_DEBUG(linker,belch( "Rel entry %3d is raw(%6p %6p %6p) ", + IF_DEBUG(linker,debugBelch( "Rel entry %3d is raw(%6p %6p %6p) ", j, (void*)offset, (void*)info, (void*)A )); if (!info) { - IF_DEBUG(linker,belch( " ZERO" )); + IF_DEBUG(linker,debugBelch( " ZERO" )); S = 0; } else { Elf_Sym sym = stab[ELF_R_SYM(info)]; @@ -2807,24 +2943,24 @@ do_Elf_Rela_relocations ( ObjectCode* oc, char* ehdrC, /* If a function, already a function descriptor - we would have to copy it to add an offset. */ if (S && (ELF_ST_TYPE(sym.st_info) == STT_FUNC) && (A != 0)) - belch("%s: function %s with addend %p", oc->fileName, symbol, (void *)A); + errorBelch("%s: function %s with addend %p", oc->fileName, symbol, (void *)A); #endif } if (!S) { - belch("%s: unknown symbol `%s'", oc->fileName, symbol); + errorBelch("%s: unknown symbol `%s'", oc->fileName, symbol); return 0; } - IF_DEBUG(linker,belch( "`%s' resolves to %p", symbol, (void*)S )); + IF_DEBUG(linker,debugBelch( "`%s' resolves to %p", symbol, (void*)S )); } - IF_DEBUG(linker,fprintf ( stderr, "Reloc: P = %p S = %p A = %p\n", + IF_DEBUG(linker,debugBelch("Reloc: P = %p S = %p A = %p\n", (void*)P, (void*)S, (void*)A )); /* checkProddableBlock ( oc, (void*)P ); */ value = S + A; switch (ELF_R_TYPE(info)) { -# if defined(sparc_TARGET_ARCH) +# if defined(sparc_HOST_ARCH) case R_SPARC_WDISP30: w1 = *pP & 0xC0000000; w2 = (Elf_Word)((value - P) >> 2); @@ -2861,7 +2997,7 @@ do_Elf_Rela_relocations ( ObjectCode* oc, char* ehdrC, w2 = (Elf_Word)value; *pP = w2; break; -# elif defined(ia64_TARGET_ARCH) +# elif defined(ia64_HOST_ARCH) case R_IA64_DIR64LSB: case R_IA64_FPTR64LSB: *pP = value; @@ -2889,9 +3025,49 @@ do_Elf_Rela_relocations ( ObjectCode* oc, char* ehdrC, /* This goes with R_IA64_LTOFF22X and points to the load to * convert into a move. We don't implement relaxation. */ break; +# elif defined(powerpc_HOST_ARCH) + case R_PPC_ADDR16_LO: + *(Elf32_Half*) P = value; + break; + + case R_PPC_ADDR16_HI: + *(Elf32_Half*) P = value >> 16; + break; + + case R_PPC_ADDR16_HA: + *(Elf32_Half*) P = (value + 0x8000) >> 16; + break; + + case R_PPC_ADDR32: + *(Elf32_Word *) P = value; + break; + + case R_PPC_REL32: + *(Elf32_Word *) P = value - P; + break; + + case R_PPC_REL24: + delta = value - P; + + if( delta << 6 >> 6 != delta ) + { + value = makeJumpIsland( oc, ELF_R_SYM(info), value ); + delta = value - P; + + if( value == 0 || delta << 6 >> 6 != delta ) + { + barf( "Unable to make ppcJumpIsland for #%d", + ELF_R_SYM(info) ); + return 0; + } + } + + *(Elf_Word *) P = (*(Elf_Word *) P & 0xfc000003) + | (delta & 0x3fffffc); + break; # endif default: - belch("%s: unhandled ELF relocation(RelA) type %d\n", + errorBelch("%s: unhandled ELF relocation(RelA) type %d\n", oc->fileName, ELF_R_TYPE(info)); return 0; } @@ -2909,7 +3085,6 @@ ocResolve_ELF ( ObjectCode* oc ) char* ehdrC = (char*)(oc->image); Elf_Ehdr* ehdr = (Elf_Ehdr*) ehdrC; Elf_Shdr* shdr = (Elf_Shdr*) (ehdrC + ehdr->e_shoff); - char* sh_strtab = ehdrC + shdr[ehdr->e_shstrndx].sh_offset; /* first find "the" symbol table */ stab = (Elf_Sym*) findElfSection ( ehdrC, SHT_SYMTAB ); @@ -2918,21 +3093,13 @@ ocResolve_ELF ( ObjectCode* oc ) strtab = findElfSection ( ehdrC, SHT_STRTAB ); if (stab == NULL || strtab == NULL) { - belch("%s: can't find string or symbol table", oc->fileName); + errorBelch("%s: can't find string or symbol table", oc->fileName); return 0; } /* Process the relocation sections. */ for (shnum = 0; shnum < ehdr->e_shnum; shnum++) { - - /* Skip sections called ".rel.stab". These appear to contain - relocation entries that, when done, make the stabs debugging - info point at the right places. We ain't interested in all - dat jazz, mun. */ - if (0 == memcmp(".rel.stab", sh_strtab + shdr[shnum].sh_name, 9)) - continue; - - if (shdr[shnum].sh_type == SHT_REL ) { + if (shdr[shnum].sh_type == SHT_REL) { ok = do_Elf_Rel_relocations ( oc, ehdrC, shdr, shnum, stab, strtab ); if (!ok) return ok; @@ -2949,6 +3116,10 @@ ocResolve_ELF ( ObjectCode* oc ) freeHashTable(oc->lochash, NULL); oc->lochash = NULL; +#if defined(powerpc_HOST_ARCH) + ocFlushInstructionCache( oc ); +#endif + return 1; } @@ -2959,7 +3130,7 @@ ocResolve_ELF ( ObjectCode* oc ) * take care of the most common relocations. */ -#ifdef ia64_TARGET_ARCH +#ifdef ia64_HOST_ARCH static Elf64_Xword ia64_extract_instruction(Elf64_Xword *target) @@ -3044,6 +3215,44 @@ ia64_reloc_pcrel21(Elf_Addr target, Elf_Addr value, ObjectCode *oc) #endif /* ia64 */ +/* + * PowerPC ELF specifics + */ + +#ifdef powerpc_HOST_ARCH + +static int ocAllocateJumpIslands_ELF( ObjectCode *oc ) +{ + Elf_Ehdr *ehdr; + Elf_Shdr* shdr; + int i; + + ehdr = (Elf_Ehdr *) oc->image; + shdr = (Elf_Shdr *) ( ((char *)oc->image) + ehdr->e_shoff ); + + for( i = 0; i < ehdr->e_shnum; i++ ) + if( shdr[i].sh_type == SHT_SYMTAB ) + break; + + if( i == ehdr->e_shnum ) + { + errorBelch( "This ELF file contains no symtab" ); + return 0; + } + + if( shdr[i].sh_entsize != sizeof( Elf_Sym ) ) + { + errorBelch( "The entry size (%d) of the symtab isn't %d\n", + shdr[i].sh_entsize, sizeof( Elf_Sym ) ); + + return 0; + } + + return ocAllocateJumpIslands( oc, shdr[i].sh_size / sizeof( Elf_Sym ), 0 ); +} + +#endif /* powerpc */ + #endif /* ELF */ /* -------------------------------------------------------------------------- @@ -3062,59 +3271,49 @@ ia64_reloc_pcrel21(Elf_Addr target, Elf_Addr value, ObjectCode *oc) *) add still more sanity checks. */ - -/* - ocAllocateJumpIslands_MachO - - Allocate additional space at the end of the object file image to make room - for jump islands. - - PowerPC relative branch instructions have a 24 bit displacement field. - As PPC code is always 4-byte-aligned, this yields a +-32MB range. - If a particular imported symbol is outside this range, we have to redirect - the jump to a short piece of new code that just loads the 32bit absolute - address and jumps there. - This function just allocates space for one 16 byte jump island for every - undefined symbol in the object file. The code for the islands is filled in by - makeJumpIsland below. -*/ - -static const int islandSize = 16; - static int ocAllocateJumpIslands_MachO(ObjectCode* oc) { - char *image = (char*) oc->image; - struct mach_header *header = (struct mach_header*) image; - struct load_command *lc = (struct load_command*) (image + sizeof(struct mach_header)); + struct mach_header *header = (struct mach_header *) oc->image; + struct load_command *lc = (struct load_command *) (header + 1); unsigned i; - for(i=0;incmds;i++) - { - if(lc->cmd == LC_DYSYMTAB) + for( i = 0; i < header->ncmds; i++ ) + { + if( lc->cmd == LC_SYMTAB ) { - struct dysymtab_command *dsymLC = (struct dysymtab_command*) lc; - unsigned long nundefsym = dsymLC->nundefsym; - oc->island_start_symbol = dsymLC->iundefsym; - oc->n_islands = nundefsym; - - if(nundefsym > 0) + // Find out the first and last undefined external + // symbol, so we don't have to allocate too many + // jump islands. + struct symtab_command *symLC = (struct symtab_command *) lc; + int min = symLC->nsyms, max = 0; + struct nlist *nlist = + symLC ? (struct nlist*) ((char*) oc->image + symLC->symoff) + : NULL; + for(i=0;insyms;i++) { -#ifdef USE_MMAP - #error ocAllocateJumpIslands_MachO doesnt want USE_MMAP to be defined -#else - oc->image = stgReallocBytes( - image, oc->fileSize + islandSize * nundefsym, - "ocAllocateJumpIslands_MachO"); -#endif - oc->jump_islands = oc->image + oc->fileSize; - memset(oc->jump_islands, 0, islandSize * nundefsym); + if(nlist[i].n_type & N_STAB) + ; + else if(nlist[i].n_type & N_EXT) + { + if((nlist[i].n_type & N_TYPE) == N_UNDF + && (nlist[i].n_value == 0)) + { + if(i < min) + min = i; + if(i > max) + max = i; + } + } } + if(max >= min) + return ocAllocateJumpIslands(oc, max - min + 1, min); - break; // there can be only one LC_DSYMTAB + break; } - lc = (struct load_command *) ( ((char*)lc) + lc->cmdsize ); + + lc = (struct load_command *) ( ((char *)lc) + lc->cmdsize ); } - return 1; + return ocAllocateJumpIslands(oc,0,0); } static int ocVerifyImage_MachO(ObjectCode* oc) @@ -3149,7 +3348,7 @@ static int resolveImports( addr = lookupSymbol(nm); if(!addr) { - belch("\n%s: unknown symbol `%s'", oc->fileName, nm); + errorBelch("\n%s: unknown symbol `%s'", oc->fileName, nm); return 0; } ASSERT(addr); @@ -3160,31 +3359,6 @@ static int resolveImports( return 1; } -static void* makeJumpIsland( - ObjectCode* oc, - unsigned long symbolNumber, - void* target) -{ - if(symbolNumber < oc->island_start_symbol || - symbolNumber - oc->island_start_symbol > oc->n_islands) - return NULL; - symbolNumber -= oc->island_start_symbol; - - void *island = (void*) ((char*)oc->jump_islands + islandSize * symbolNumber); - unsigned long *p = (unsigned long*) island; - - // lis r12, hi16(target) - *p++ = 0x3d800000 | ( ((unsigned long) target) >> 16 ); - // ori r12, r12, lo16(target) - *p++ = 0x618c0000 | ( ((unsigned long) target) & 0xFFFF ); - // mtctr r12 - *p++ = 0x7d8903a6; - // bctr - *p++ = 0x4e800420; - - return (void*) island; -} - static char* relocateAddress( ObjectCode* oc, int nSections, @@ -3240,7 +3414,12 @@ static int relocateSection( // Step 1: Figure out what the relocated value should be if(scat->r_type == GENERIC_RELOC_VANILLA) { - word = scat->r_value + sect->offset + ((long) image); + word = *wordPtr + (unsigned long) relocateAddress( + oc, + nSections, + sections, + scat->r_value) + - scat->r_value; } else if(scat->r_type == PPC_RELOC_SECTDIFF || scat->r_type == PPC_RELOC_LO16_SECTDIFF @@ -3360,7 +3539,7 @@ static int relocateSection( else if(reloc->r_type == PPC_RELOC_BR24) { word = *wordPtr; - word = (word & 0x03FFFFFC) | (word & 0x02000000) ? 0xFC000000 : 0; + word = (word & 0x03FFFFFC) | ((word & 0x02000000) ? 0xFC000000 : 0); } @@ -3380,15 +3559,17 @@ static int relocateSection( unsigned long symbolAddress = (unsigned long) (lookupSymbol(nm)); if(!symbolAddress) { - belch("\nunknown symbol `%s'", nm); + errorBelch("\nunknown symbol `%s'", nm); return 0; } if(reloc->r_pcrel) { - ASSERT(word == 0); + // In the .o file, this should be a relative jump to NULL + // and we'll change it to a jump to a relative jump to the symbol + ASSERT(-word == reloc->r_address); word = symbolAddress; - jumpIsland = (long) makeJumpIsland(oc,reloc->r_symbolnum,(void*)word); + jumpIsland = makeJumpIsland(oc,reloc->r_symbolnum,word); word -= ((long)image) + sect->offset + reloc->r_address; if(jumpIsland != 0) { @@ -3430,9 +3611,11 @@ static int relocateSection( // The branch offset is too large. // Therefore, we try to use a jump island. if(jumpIsland == 0) + { barf("unconditional relative branch out of range: " "no jump island available"); - + } + word = offsetToJumpIsland; if((long)word > (long)0x01FFFFFF || (long)word < (long)0xFFE00000) barf("unconditional relative branch out of range: " @@ -3458,7 +3641,6 @@ static int ocGetNames_MachO(ObjectCode* oc) struct segment_command *segLC = NULL; struct section *sections; struct symtab_command *symLC = NULL; - struct dysymtab_command *dsymLC = NULL; struct nlist *nlist; unsigned long commonSize = 0; char *commonStorage = NULL; @@ -3470,13 +3652,12 @@ static int ocGetNames_MachO(ObjectCode* oc) segLC = (struct segment_command*) lc; else if(lc->cmd == LC_SYMTAB) symLC = (struct symtab_command*) lc; - else if(lc->cmd == LC_DYSYMTAB) - dsymLC = (struct dysymtab_command*) lc; lc = (struct load_command *) ( ((char*)lc) + lc->cmdsize ); } sections = (struct section*) (segLC+1); - nlist = (struct nlist*) (image + symLC->symoff); + nlist = symLC ? (struct nlist*) (image + symLC->symoff) + : NULL; for(i=0;insects;i++) { @@ -3514,68 +3695,81 @@ static int ocGetNames_MachO(ObjectCode* oc) // count external symbols defined here oc->n_symbols = 0; - for(i=dsymLC->iextdefsym;iiextdefsym+dsymLC->nextdefsym;i++) + if(symLC) { - if((nlist[i].n_type & N_TYPE) == N_SECT) - oc->n_symbols++; - } - for(i=0;insyms;i++) - { - if((nlist[i].n_type & N_TYPE) == N_UNDF - && (nlist[i].n_type & N_EXT) && (nlist[i].n_value != 0)) - { - commonSize += nlist[i].n_value; - oc->n_symbols++; - } + for(i=0;insyms;i++) + { + if(nlist[i].n_type & N_STAB) + ; + else if(nlist[i].n_type & N_EXT) + { + if((nlist[i].n_type & N_TYPE) == N_UNDF + && (nlist[i].n_value != 0)) + { + commonSize += nlist[i].n_value; + oc->n_symbols++; + } + else if((nlist[i].n_type & N_TYPE) == N_SECT) + oc->n_symbols++; + } + } } oc->symbols = stgMallocBytes(oc->n_symbols * sizeof(char*), "ocGetNames_MachO(oc->symbols)"); - // insert symbols into hash table - for(i=dsymLC->iextdefsym,curSymbol=0;iiextdefsym+dsymLC->nextdefsym;i++) - { - if((nlist[i].n_type & N_TYPE) == N_SECT) - { - char *nm = image + symLC->stroff + nlist[i].n_un.n_strx; - ghciInsertStrHashTable(oc->fileName, symhash, nm, image + - sections[nlist[i].n_sect-1].offset - - sections[nlist[i].n_sect-1].addr - + nlist[i].n_value); - oc->symbols[curSymbol++] = nm; - } - } - - // insert local symbols into lochash - for(i=dsymLC->ilocalsym;iilocalsym+dsymLC->nlocalsym;i++) + if(symLC) { - if((nlist[i].n_type & N_TYPE) == N_SECT) - { - char *nm = image + symLC->stroff + nlist[i].n_un.n_strx; - ghciInsertStrHashTable(oc->fileName, oc->lochash, nm, image + - sections[nlist[i].n_sect-1].offset - - sections[nlist[i].n_sect-1].addr - + nlist[i].n_value); - } + curSymbol = 0; + for(i=0;insyms;i++) + { + if(nlist[i].n_type & N_STAB) + ; + else if((nlist[i].n_type & N_TYPE) == N_SECT) + { + if(nlist[i].n_type & N_EXT) + { + char *nm = image + symLC->stroff + nlist[i].n_un.n_strx; + ghciInsertStrHashTable(oc->fileName, symhash, nm, + image + + sections[nlist[i].n_sect-1].offset + - sections[nlist[i].n_sect-1].addr + + nlist[i].n_value); + oc->symbols[curSymbol++] = nm; + } + else + { + char *nm = image + symLC->stroff + nlist[i].n_un.n_strx; + ghciInsertStrHashTable(oc->fileName, oc->lochash, nm, + image + + sections[nlist[i].n_sect-1].offset + - sections[nlist[i].n_sect-1].addr + + nlist[i].n_value); + } + } + } } - commonStorage = stgCallocBytes(1,commonSize,"ocGetNames_MachO(common symbols)"); commonCounter = (unsigned long)commonStorage; - for(i=0;insyms;i++) + if(symLC) { - if((nlist[i].n_type & N_TYPE) == N_UNDF - && (nlist[i].n_type & N_EXT) && (nlist[i].n_value != 0)) - { - char *nm = image + symLC->stroff + nlist[i].n_un.n_strx; - unsigned long sz = nlist[i].n_value; + for(i=0;insyms;i++) + { + if((nlist[i].n_type & N_TYPE) == N_UNDF + && (nlist[i].n_type & N_EXT) && (nlist[i].n_value != 0)) + { + char *nm = image + symLC->stroff + nlist[i].n_un.n_strx; + unsigned long sz = nlist[i].n_value; - nlist[i].n_value = commonCounter; + nlist[i].n_value = commonCounter; - ghciInsertStrHashTable(oc->fileName, symhash, nm, (void*)commonCounter); - oc->symbols[curSymbol++] = nm; + ghciInsertStrHashTable(oc->fileName, symhash, nm, + (void*)commonCounter); + oc->symbols[curSymbol++] = nm; - commonCounter += sz; - } + commonCounter += sz; + } + } } return 1; } @@ -3591,7 +3785,6 @@ static int ocResolve_MachO(ObjectCode* oc) struct symtab_command *symLC = NULL; struct dysymtab_command *dsymLC = NULL; struct nlist *nlist; - unsigned long *indirectSyms; for(i=0;incmds;i++) { @@ -3605,7 +3798,8 @@ static int ocResolve_MachO(ObjectCode* oc) } sections = (struct section*) (segLC+1); - nlist = (struct nlist*) (image + symLC->symoff); + nlist = symLC ? (struct nlist*) (image + symLC->symoff) + : NULL; for(i=0;insects;i++) { @@ -3615,15 +3809,19 @@ static int ocResolve_MachO(ObjectCode* oc) nl_ptrs = §ions[i]; } - indirectSyms = (unsigned long*) (image + dsymLC->indirectsymoff); - - if(la_ptrs) - if(!resolveImports(oc,image,symLC,la_ptrs,indirectSyms,nlist)) - return 0; - if(nl_ptrs) - if(!resolveImports(oc,image,symLC,nl_ptrs,indirectSyms,nlist)) - return 0; - + if(dsymLC) + { + unsigned long *indirectSyms + = (unsigned long*) (image + dsymLC->indirectsymoff); + + if(la_ptrs) + if(!resolveImports(oc,image,symLC,la_ptrs,indirectSyms,nlist)) + return 0; + if(nl_ptrs) + if(!resolveImports(oc,image,symLC,nl_ptrs,indirectSyms,nlist)) + return 0; + } + for(i=0;insects;i++) { if(!relocateSection(oc,image,symLC,nlist,segLC->nsects,sections,§ions[i])) @@ -3634,22 +3832,10 @@ static int ocResolve_MachO(ObjectCode* oc) freeHashTable(oc->lochash, NULL); oc->lochash = NULL; - /* - Flush the data & instruction caches. - Because the PPC has split data/instruction caches, we have to - do that whenever we modify code at runtime. - */ - { - int n = (oc->fileSize + islandSize * oc->n_islands) / 4; - unsigned long *p = (unsigned long*)oc->image; - while(n--) - { - __asm__ volatile ("dcbf 0,%0\n\tsync\n\ticbi 0,%0" - : : "r" (p)); - p++; - } - __asm__ volatile ("sync\n\tisync"); - } +#if defined (powerpc_HOST_ARCH) + ocFlushInstructionCache( oc ); +#endif + return 1; } @@ -3664,14 +3850,24 @@ static int ocResolve_MachO(ObjectCode* oc) static void machoInitSymbolsWithoutUnderscore() { - void *p; + extern void* symbolsWithoutUnderscore[]; + void **p = symbolsWithoutUnderscore; + __asm__ volatile(".data\n_symbolsWithoutUnderscore:"); #undef Sym -#define Sym(x) \ - __asm__ ("lis %0,hi16(" #x ")\n\tori %0,%0,lo16(" #x ")" : "=r" (p)); \ - ghciInsertStrHashTable("(GHCi built-in symbols)", symhash, #x, p); +#define Sym(x) \ + __asm__ volatile(".long " # x); RTS_MACHO_NOUNDERLINE_SYMBOLS + __asm__ volatile(".text"); + +#undef Sym +#define Sym(x) \ + ghciInsertStrHashTable("(GHCi built-in symbols)", symhash, #x, *p++); + + RTS_MACHO_NOUNDERLINE_SYMBOLS + +#undef Sym } #endif