X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FLinker.c;h=92d0106def244ff1cfeb60f55c9203363bcaac61;hb=28a464a75e14cece5db40f2765a29348273ff2d2;hp=0bc7ac48266805b4a91377804ea51f2f43a805b9;hpb=12694df2b002fe264d1e9e8209e0fbb6914ffe50;p=ghc-hetmet.git diff --git a/ghc/rts/Linker.c b/ghc/rts/Linker.c index 0bc7ac4..92d0106 100644 --- a/ghc/rts/Linker.c +++ b/ghc/rts/Linker.c @@ -26,6 +26,7 @@ #include "RtsUtils.h" #include "Schedule.h" #include "Storage.h" +#include "Sparks.h" #ifdef HAVE_SYS_TYPES_H #include @@ -302,6 +303,19 @@ typedef struct _RtsSymbolVal { SymX(exp) \ SymX(log) \ SymX(sqrt) \ + SymX(powf) \ + SymX(tanhf) \ + SymX(coshf) \ + SymX(sinhf) \ + SymX(atanf) \ + SymX(acosf) \ + SymX(asinf) \ + SymX(tanf) \ + SymX(cosf) \ + SymX(sinf) \ + SymX(expf) \ + SymX(logf) \ + SymX(sqrtf) \ SymX(memcpy) \ SymX(rts_InstallConsoleEvent) \ SymX(rts_ConsoleHandlerDone) \ @@ -388,7 +402,6 @@ typedef struct _RtsSymbolVal { #define RTS_RET_SYMBOLS \ SymX(stg_enter_ret) \ SymX(stg_gc_fun_ret) \ - SymX(stg_ap_0_ret) \ SymX(stg_ap_v_ret) \ SymX(stg_ap_f_ret) \ SymX(stg_ap_d_ret) \ @@ -474,9 +487,11 @@ typedef struct _RtsSymbolVal { SymX(delayzh_fast) \ SymX(deRefWeakzh_fast) \ SymX(deRefStablePtrzh_fast) \ + SymX(dirty_MUT_VAR) \ SymX(divExactIntegerzh_fast) \ SymX(divModIntegerzh_fast) \ SymX(forkzh_fast) \ + SymX(forkOnzh_fast) \ SymX(forkProcess) \ SymX(forkOS_createThread) \ SymX(freeHaskellFunctionPtr) \ @@ -526,6 +541,7 @@ typedef struct _RtsSymbolVal { SymX(newTVarzh_fast) \ SymX(atomicModifyMutVarzh_fast) \ SymX(newPinnedByteArrayzh_fast) \ + SymX(newSpark) \ SymX(orIntegerzh_fast) \ SymX(performGC) \ SymX(performMajorGC) \ @@ -597,10 +613,10 @@ typedef struct _RtsSymbolVal { SymX(stg_EMPTY_MVAR_info) \ SymX(stg_IND_STATIC_info) \ SymX(stg_INTLIKE_closure) \ + SymX(stg_MUT_ARR_PTRS_DIRTY_info) \ 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) \ SymX(stg_ap_f_info) \ SymX(stg_ap_d_info) \ @@ -615,6 +631,21 @@ typedef struct _RtsSymbolVal { SymX(stg_ap_pppp_info) \ SymX(stg_ap_ppppp_info) \ SymX(stg_ap_pppppp_info) \ + SymX(stg_ap_0_fast) \ + SymX(stg_ap_v_fast) \ + SymX(stg_ap_f_fast) \ + SymX(stg_ap_d_fast) \ + SymX(stg_ap_l_fast) \ + SymX(stg_ap_n_fast) \ + SymX(stg_ap_p_fast) \ + SymX(stg_ap_pv_fast) \ + SymX(stg_ap_pp_fast) \ + SymX(stg_ap_ppv_fast) \ + SymX(stg_ap_ppp_fast) \ + SymX(stg_ap_pppv_fast) \ + SymX(stg_ap_pppp_fast) \ + SymX(stg_ap_ppppp_fast) \ + SymX(stg_ap_pppppp_fast) \ SymX(stg_ap_1_upd_info) \ SymX(stg_ap_2_upd_info) \ SymX(stg_ap_3_upd_info) \ @@ -654,6 +685,19 @@ typedef struct _RtsSymbolVal { SymX(writeTVarzh_fast) \ SymX(xorIntegerzh_fast) \ SymX(yieldzh_fast) \ + SymX(stg_interp_constr_entry) \ + SymX(stg_interp_constr1_entry) \ + SymX(stg_interp_constr2_entry) \ + SymX(stg_interp_constr3_entry) \ + SymX(stg_interp_constr4_entry) \ + SymX(stg_interp_constr5_entry) \ + SymX(stg_interp_constr6_entry) \ + SymX(stg_interp_constr7_entry) \ + SymX(stg_interp_constr8_entry) \ + SymX(stgMallocBytesRWX) \ + SymX(getAllocations) \ + SymX(revertCAFs) \ + SymX(RtsFlags) \ RTS_USER_SIGNALS_SYMBOLS #ifdef SUPPORT_LONG_LONGS @@ -3639,8 +3683,19 @@ static int resolveImports( struct nlist *nlist) { unsigned i; + size_t itemSize = 4; - for(i=0;i*4size;i++) +#if i386_HOST_ARCH + int isJumpTable = 0; + if(!strcmp(sect->sectname,"__jump_table")) + { + isJumpTable = 1; + itemSize = 5; + ASSERT(sect->reserved2 == itemSize); + } +#endif + + for(i=0; i*itemSize < sect->size;i++) { // according to otool, reserved1 contains the first index into the indirect symbol table struct nlist *symbol = &nlist[indirectSyms[sect->reserved1+i]]; @@ -3660,8 +3715,21 @@ static int resolveImports( return 0; } ASSERT(addr); - checkProddableBlock(oc,((void**)(image + sect->offset)) + i); - ((void**)(image + sect->offset))[i] = addr; + +#if i386_HOST_ARCH + if(isJumpTable) + { + checkProddableBlock(oc,image + sect->offset + i*itemSize); + *(image + sect->offset + i*itemSize) = 0xe9; // jmp + *(unsigned*)(image + sect->offset + i*itemSize + 1) + = (char*)addr - (image + sect->offset + i*itemSize + 5); + } + else +#endif + { + checkProddableBlock(oc,((void**)(image + sect->offset)) + i); + ((void**)(image + sect->offset))[i] = addr; + } } return 1; @@ -4124,7 +4192,7 @@ static int ocResolve_MachO(ObjectCode* oc) struct load_command *lc = (struct load_command*) (image + sizeof(struct mach_header)); unsigned i; struct segment_command *segLC = NULL; - struct section *sections, *la_ptrs = NULL, *nl_ptrs = NULL; + struct section *sections; struct symtab_command *symLC = NULL; struct dysymtab_command *dsymLC = NULL; struct nlist *nlist; @@ -4144,29 +4212,32 @@ static int ocResolve_MachO(ObjectCode* oc) nlist = symLC ? (struct nlist*) (image + symLC->symoff) : NULL; - for(i=0;insects;i++) - { - if(!strcmp(sections[i].sectname,"__la_symbol_ptr")) - la_ptrs = §ions[i]; - else if(!strcmp(sections[i].sectname,"__nl_symbol_ptr")) - nl_ptrs = §ions[i]; - else if(!strcmp(sections[i].sectname,"__la_sym_ptr2")) - la_ptrs = §ions[i]; - else if(!strcmp(sections[i].sectname,"__la_sym_ptr3")) - la_ptrs = §ions[i]; - } - 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( !strcmp(sections[i].sectname,"__la_symbol_ptr") + || !strcmp(sections[i].sectname,"__la_sym_ptr2") + || !strcmp(sections[i].sectname,"__la_sym_ptr3")) + { + if(!resolveImports(oc,image,symLC,§ions[i],indirectSyms,nlist)) + return 0; + } + else if(!strcmp(sections[i].sectname,"__nl_symbol_ptr") + || !strcmp(sections[i].sectname,"__pointers")) + { + if(!resolveImports(oc,image,symLC,§ions[i],indirectSyms,nlist)) + return 0; + } + else if(!strcmp(sections[i].sectname,"__jump_table")) + { + if(!resolveImports(oc,image,symLC,§ions[i],indirectSyms,nlist)) + return 0; + } + } } for(i=0;insects;i++)