/* -----------------------------------------------------------------------------
- * $Id: Linker.c,v 1.64 2001/09/04 16:49:12 sewardj Exp $
+ * $Id: Linker.c,v 1.68 2001/10/01 13:10:53 simonmar Exp $
*
* (c) The GHC Team, 2000, 2001
*
#include "LinkerInternals.h"
#include "RtsUtils.h"
#include "StoragePriv.h"
+#include "Schedule.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#define RTS_SYMBOLS \
- SymX(MainRegTable) \
+ Maybe_ForeignObj \
+ Maybe_Stable_Names \
+ Sym(StgReturn) \
+ Sym(__stginit_PrelGHC) \
+ Sym(init_stack) \
+ Sym(stg_chk_0) \
+ Sym(stg_chk_1) \
+ Sym(stg_enterStackTop) \
+ Sym(stg_gc_d1) \
Sym(stg_gc_enter_1) \
+ Sym(stg_gc_f1) \
Sym(stg_gc_noregs) \
Sym(stg_gc_seq_1) \
- Sym(stg_gc_d1) \
- Sym(stg_gc_f1) \
- Sym(stg_gc_ut_1_0) \
- Sym(stg_gc_ut_0_1) \
- Sym(stg_gc_unpt_r1) \
Sym(stg_gc_unbx_r1) \
- Sym(stg_chk_0) \
- Sym(stg_chk_1) \
+ Sym(stg_gc_unpt_r1) \
+ Sym(stg_gc_ut_0_1) \
+ Sym(stg_gc_ut_1_0) \
Sym(stg_gen_chk) \
- SymX(stg_exit) \
- SymX(stg_update_PAP) \
+ Sym(stg_yield_to_interpreter) \
+ SymX(ErrorHdrHook) \
+ SymX(MainRegTable) \
+ SymX(MallocFailHook) \
+ SymX(NoRunnableThreadsHook) \
+ SymX(OnExitHook) \
+ SymX(OutOfHeapHook) \
+ SymX(PatErrorHdrHook) \
+ SymX(PostTraceHook) \
+ SymX(PreTraceHook) \
+ SymX(StackOverflowHook) \
+ SymX(__encodeDouble) \
+ SymX(__encodeFloat) \
+ SymX(__gmpn_gcd_1) \
+ SymX(__gmpz_cmp) \
+ SymX(__gmpz_cmp_si) \
+ SymX(__gmpz_cmp_ui) \
+ SymX(__gmpz_get_si) \
+ SymX(__gmpz_get_ui) \
+ SymX(__int_encodeDouble) \
+ SymX(__int_encodeFloat) \
+ SymX(andIntegerzh_fast) \
+ SymX(blockAsyncExceptionszh_fast) \
+ SymX(catchzh_fast) \
+ SymX(cmp_thread) \
+ SymX(complementIntegerzh_fast) \
+ SymX(createAdjustor) \
+ SymX(decodeDoublezh_fast) \
+ SymX(decodeFloatzh_fast) \
+ SymX(defaultsHook) \
+ SymX(delayzh_fast) \
+ SymX(divExactIntegerzh_fast) \
+ SymX(divModIntegerzh_fast) \
+ SymX(forkzh_fast) \
+ SymX(freeHaskellFunctionPtr) \
+ SymX(gcdIntegerzh_fast) \
+ SymX(getProgArgv) \
+ SymX(getStablePtr) \
+ SymX(int2Integerzh_fast) \
+ SymX(isDoubleDenormalized) \
+ SymX(isDoubleInfinite) \
+ SymX(isDoubleNaN) \
+ SymX(isDoubleNegativeZero) \
+ SymX(isFloatDenormalized) \
+ SymX(isFloatInfinite) \
+ SymX(isFloatNaN) \
+ SymX(isFloatNegativeZero) \
+ SymX(killThreadzh_fast) \
+ SymX(minusIntegerzh_fast) \
+ SymX(mkApUpd0zh_fast) \
+ SymX(newArrayzh_fast) \
+ SymX(newBCOzh_fast) \
+ SymX(newByteArrayzh_fast) \
+ SymX(newCAF) \
+ SymX(newMVarzh_fast) \
+ SymX(newMutVarzh_fast) \
+ SymX(newPinnedByteArrayzh_fast) \
+ SymX(orIntegerzh_fast) \
+ SymX(performGC) \
+ SymX(plusIntegerzh_fast) \
+ SymX(prog_argc) \
+ SymX(prog_argv) \
+ SymX(putMVarzh_fast) \
+ SymX(quotIntegerzh_fast) \
+ SymX(quotRemIntegerzh_fast) \
+ SymX(raisezh_fast) \
+ SymX(remIntegerzh_fast) \
+ SymX(resetNonBlockingFd) \
+ SymX(resumeThread) \
+ SymX(rts_apply) \
+ SymX(rts_checkSchedStatus) \
+ SymX(rts_eval) \
+ SymX(rts_evalIO) \
+ SymX(rts_evalLazyIO) \
+ SymX(rts_eval_) \
+ SymX(rts_getAddr) \
+ SymX(rts_getBool) \
+ SymX(rts_getChar) \
+ SymX(rts_getDouble) \
+ SymX(rts_getFloat) \
+ SymX(rts_getInt) \
+ SymX(rts_getInt32) \
+ SymX(rts_getPtr) \
+ SymX(rts_getStablePtr) \
+ SymX(rts_getWord) \
+ SymX(rts_getWord32) \
+ SymX(rts_mkAddr) \
+ SymX(rts_mkBool) \
+ SymX(rts_mkChar) \
+ SymX(rts_mkDouble) \
+ SymX(rts_mkFloat) \
+ SymX(rts_mkInt) \
+ SymX(rts_mkInt16) \
+ SymX(rts_mkInt32) \
+ SymX(rts_mkInt64) \
+ SymX(rts_mkInt8) \
+ SymX(rts_mkPtr) \
+ SymX(rts_mkStablePtr) \
+ SymX(rts_mkString) \
+ SymX(rts_mkWord) \
+ SymX(rts_mkWord16) \
+ SymX(rts_mkWord32) \
+ SymX(rts_mkWord64) \
+ SymX(rts_mkWord8) \
+ SymX(run_queue_hd) \
+ SymX(setProgArgv) \
+ SymX(shutdownHaskellAndExit) \
+ SymX(stable_ptr_table) \
+ SymX(stackOverflow) \
+ SymX(stg_CAF_BLACKHOLE_info) \
+ SymX(stg_CHARLIKE_closure) \
+ SymX(stg_EMPTY_MVAR_info) \
+ SymX(stg_IND_STATIC_info) \
+ SymX(stg_INTLIKE_closure) \
+ SymX(stg_MUT_ARR_PTRS_FROZEN_info) \
+ SymX(stg_WEAK_info) \
SymX(stg_ap_1_upd_info) \
SymX(stg_ap_2_upd_info) \
SymX(stg_ap_3_upd_info) \
SymX(stg_ap_6_upd_info) \
SymX(stg_ap_7_upd_info) \
SymX(stg_ap_8_upd_info) \
+ SymX(stg_exit) \
SymX(stg_sel_0_upd_info) \
+ SymX(stg_sel_10_upd_info) \
+ SymX(stg_sel_11_upd_info) \
+ SymX(stg_sel_12_upd_info) \
+ SymX(stg_sel_13_upd_info) \
+ SymX(stg_sel_14_upd_info) \
+ SymX(stg_sel_15_upd_info) \
SymX(stg_sel_1_upd_info) \
SymX(stg_sel_2_upd_info) \
SymX(stg_sel_3_upd_info) \
SymX(stg_sel_7_upd_info) \
SymX(stg_sel_8_upd_info) \
SymX(stg_sel_9_upd_info) \
- SymX(stg_sel_10_upd_info) \
- SymX(stg_sel_11_upd_info) \
- SymX(stg_sel_12_upd_info) \
- SymX(stg_sel_13_upd_info) \
- SymX(stg_sel_14_upd_info) \
- SymX(stg_sel_15_upd_info) \
- SymX(stg_upd_frame_info) \
SymX(stg_seq_frame_info) \
- SymX(stg_CAF_BLACKHOLE_info) \
- SymX(stg_IND_STATIC_info) \
- SymX(stg_EMPTY_MVAR_info) \
- SymX(stg_MUT_ARR_PTRS_FROZEN_info) \
- SymX(stg_WEAK_info) \
- SymX(stg_CHARLIKE_closure) \
- SymX(stg_INTLIKE_closure) \
- SymX(newCAF) \
- SymX(newBCOzh_fast) \
- SymX(mkApUpd0zh_fast) \
- SymX(putMVarzh_fast) \
- SymX(newMVarzh_fast) \
+ SymX(stg_upd_frame_info) \
+ SymX(stg_update_PAP) \
+ SymX(suspendThread) \
SymX(takeMVarzh_fast) \
- SymX(tryTakeMVarzh_fast) \
+ SymX(timesIntegerzh_fast) \
SymX(tryPutMVarzh_fast) \
- SymX(catchzh_fast) \
- SymX(raisezh_fast) \
- SymX(forkzh_fast) \
- SymX(delayzh_fast) \
- SymX(yieldzh_fast) \
- SymX(killThreadzh_fast) \
+ SymX(tryTakeMVarzh_fast) \
+ SymX(unblockAsyncExceptionszh_fast) \
+ SymX(unsafeThawArrayzh_fast) \
SymX(waitReadzh_fast) \
SymX(waitWritezh_fast) \
- SymX(suspendThread) \
- SymX(resumeThread) \
- SymX(stackOverflow) \
- SymX(int2Integerzh_fast) \
SymX(word2Integerzh_fast) \
- Maybe_ForeignObj \
- SymX(__encodeDouble) \
- SymX(decodeDoublezh_fast) \
- SymX(decodeFloatzh_fast) \
- SymX(gcdIntegerzh_fast) \
- SymX(newArrayzh_fast) \
- SymX(unsafeThawArrayzh_fast) \
- SymX(newByteArrayzh_fast) \
- SymX(newPinnedByteArrayzh_fast) \
- SymX(newMutVarzh_fast) \
- SymX(quotRemIntegerzh_fast) \
- SymX(quotIntegerzh_fast) \
- SymX(remIntegerzh_fast) \
- SymX(divExactIntegerzh_fast) \
- SymX(divModIntegerzh_fast) \
- SymX(timesIntegerzh_fast) \
- SymX(minusIntegerzh_fast) \
- SymX(plusIntegerzh_fast) \
- SymX(andIntegerzh_fast) \
- SymX(orIntegerzh_fast) \
SymX(xorIntegerzh_fast) \
- SymX(complementIntegerzh_fast) \
- Maybe_Stable_Names \
- SymX(blockAsyncExceptionszh_fast) \
- SymX(unblockAsyncExceptionszh_fast) \
- SymX(isDoubleNaN) \
- SymX(isDoubleInfinite) \
- SymX(isDoubleDenormalized) \
- SymX(isDoubleNegativeZero) \
- SymX(__encodeFloat) \
- SymX(isFloatNaN) \
- SymX(isFloatInfinite) \
- SymX(isFloatDenormalized) \
- SymX(isFloatNegativeZero) \
- SymX(__int_encodeFloat) \
- SymX(__int_encodeDouble) \
- SymX(__gmpz_cmp_si) \
- SymX(__gmpz_cmp_ui) \
- SymX(__gmpz_cmp) \
- SymX(__gmpn_gcd_1) \
- SymX(__gmpz_get_si) \
- SymX(__gmpz_get_ui) \
- SymX(prog_argv) \
- SymX(prog_argc) \
- SymX(getProgArgv) \
- SymX(setProgArgv) \
- SymX(resetNonBlockingFd) \
- SymX(performGC) \
- SymX(getStablePtr) \
- SymX(stable_ptr_table) \
- SymX(shutdownHaskellAndExit) \
- Sym(stg_enterStackTop) \
- Sym(stg_yield_to_interpreter) \
- Sym(StgReturn) \
- Sym(init_stack) \
- SymX(cmp_thread) \
- Sym(__init_PrelGHC) \
- SymX(freeHaskellFunctionPtr) \
- SymX(OnExitHook) \
- SymX(ErrorHdrHook) \
- SymX(NoRunnableThreadsHook) \
- SymX(StackOverflowHook) \
- SymX(OutOfHeapHook) \
- SymX(MallocFailHook) \
- SymX(PatErrorHdrHook) \
- SymX(defaultsHook) \
- SymX(PreTraceHook) \
- SymX(PostTraceHook) \
- SymX(createAdjustor) \
- SymX(rts_mkChar) \
- SymX(rts_mkInt) \
- SymX(rts_mkInt8) \
- SymX(rts_mkInt16) \
- SymX(rts_mkInt32) \
- SymX(rts_mkInt64) \
- SymX(rts_mkWord) \
- SymX(rts_mkWord8) \
- SymX(rts_mkWord16) \
- SymX(rts_mkWord32) \
- SymX(rts_mkWord64) \
- SymX(rts_mkPtr) \
- SymX(rts_mkFloat) \
- SymX(rts_mkDouble) \
- SymX(rts_mkStablePtr) \
- SymX(rts_mkBool) \
- SymX(rts_mkString) \
- SymX(rts_apply) \
- SymX(rts_mkAddr) \
- SymX(rts_getChar) \
- SymX(rts_getInt) \
- SymX(rts_getInt32) \
- SymX(rts_getWord) \
- SymX(rts_getWord32) \
- SymX(rts_getPtr) \
- SymX(rts_getFloat) \
- SymX(rts_getDouble) \
- SymX(rts_getStablePtr) \
- SymX(rts_getBool) \
- SymX(rts_getAddr) \
- SymX(rts_eval) \
- SymX(rts_eval_) \
- SymX(rts_evalIO) \
- SymX(rts_evalLazyIO) \
- SymX(rts_checkSchedStatus)
+ SymX(yieldzh_fast)
#ifndef SUPPORT_LONG_LONGS
#define RTS_LONG_LONG_SYMS /* nothing */
it, and set its .sh_offset field such that
ehdrC + .sh_offset == addr_of_zeroed_space. */
char* zspace = stgCallocBytes(1, shdr[i].sh_size,
- "ocGetNames_ELF(anonymous bss)");
+ "ocGetNames_ELF(BSS)");
shdr[i].sh_offset = ((char*)zspace) - ((char*)ehdrC);
- /*
+ /*
fprintf(stderr, "BSS section at 0x%x, size %d\n",
zspace, shdr[i].sh_size);
- */
+ */
}
/* fill in the section info */
"ocGetNames_ELF(oc->symbols)");
for (j = 0; j < nent; j++) {
+
+ char isLocal = FALSE; /* avoids uninit-var warning */
+ char* ad = NULL;
+ char* nm = strtab + stab[j].st_name;
+ int secno = stab[j].st_shndx;
+
+ /* Figure out if we want to add it; if so, set ad to its
+ address. Otherwise leave ad == NULL. */
+
+ if (secno == SHN_COMMON) {
+ isLocal = FALSE;
+ ad = stgCallocBytes(1, stab[j].st_size, "ocGetNames_ELF(COMMON)");
+ /*
+ fprintf(stderr, "COMMON symbol, size %d name %s\n",
+ stab[j].st_size, nm);
+ */
+ /* Pointless to do addProddableBlock() for this area,
+ since the linker should never poke around in it. */
+ }
+ else
if ( ( ELF32_ST_BIND(stab[j].st_info)==STB_GLOBAL
|| ELF32_ST_BIND(stab[j].st_info)==STB_LOCAL
)
ELF32_ST_TYPE(stab[j].st_info)==STT_NOTYPE
)
) {
- char* nm;
- char* ad;
- int secno = stab[j].st_shndx;
/* Section 0 is the undefined section, hence > and not >=. */
ASSERT(secno > 0 && secno < ehdr->e_shnum);
- nm = strtab + stab[j].st_name;
- /*
+ /*
if (shdr[secno].sh_type == SHT_NOBITS) {
- fprintf(stderr, "bss symbol, size %d off %d name %s\n",
- stab[j].st_size, stab[j].st_value, nm);
+ fprintf(stderr, " BSS symbol, size %d off %d name %s\n",
+ stab[j].st_size, stab[j].st_value, nm);
}
*/
ad = ehdrC + shdr[ secno ].sh_offset + stab[j].st_value;
- ASSERT(nm != NULL);
- ASSERT(ad != NULL);
- oc->symbols[j] = nm;
if (ELF32_ST_BIND(stab[j].st_info)==STB_LOCAL) {
IF_DEBUG(linker,belch( "addOTabName(LOCL): %10p %s %s",
ad, oc->fileName, nm ));
- insertStrHashTable(oc->lochash, nm, ad);
+ isLocal = TRUE;
} else {
IF_DEBUG(linker,belch( "addOTabName(GLOB): %10p %s %s",
ad, oc->fileName, nm ));
- insertStrHashTable(symhash, nm, ad);
+ isLocal = FALSE;
}
}
- else {
+
+ /* And the decision is ... */
+
+ if (ad != NULL) {
+ ASSERT(nm != NULL);
+ oc->symbols[j] = nm;
+ /* Acquire! */
+ if (isLocal) {
+ insertStrHashTable(oc->lochash, nm, ad);
+ } else {
+ insertStrHashTable(symhash, nm, ad);
+ }
+ } else {
+ /* Skip. */
IF_DEBUG(linker,belch( "skipping `%s'",
strtab + stab[j].st_name ));
/*
*/
oc->symbols[j] = NULL;
}
+
}
}
for (j = 0; j < nent; j++) {
Elf32_Addr offset = rtab[j].r_offset;
Elf32_Word info = rtab[j].r_info;
+ Elf32_Sword addend = rtab[j].r_addend;
Elf32_Addr P = ((Elf32_Addr)targ) + offset;
+ Elf32_Addr A = addend;
Elf32_Addr S;
# if defined(sparc_TARGET_ARCH)
/* This #ifdef only serves to avoid unused-var warnings. */
- Elf32_Sword addend = rtab[j].r_addend;
- Elf32_Addr A = addend;
Elf32_Word* pP = (Elf32_Word*)P;
Elf32_Word w1, w2;
# endif
projects / ghc-hetmet.git / blobdiff