[project @ 2001-12-29 09:24:42 by sof]

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

diff --git a/ghc/rts/Linker.c b/ghc/rts/Linker.c
index 289bace..f693a5e 100644 (file)
--- a/ghc/rts/Linker.c
+++ b/ghc/rts/Linker.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Linker.c,v 1.71 2001/10/22 22:55:31 sof Exp $
+ * $Id: Linker.c,v 1.77 2001/12/29 09:24:42 sof Exp $
  *
  * (c) The GHC Team, 2000, 2001
  *
@@ -151,6 +151,11 @@ typedef struct _RtsSymbolVal {
       Sym(__umoddi3)
 #endif
 
+#ifndef SMP
+# define MAIN_CAP_SYM SymX(MainCapability)
+#else
+# define MAIN_CAP_SYM
+#endif
 
 #define RTS_SYMBOLS                            \
       Maybe_ForeignObj                         \
@@ -158,22 +163,23 @@ typedef struct _RtsSymbolVal {
       Sym(StgReturn)                           \
       Sym(__stginit_PrelGHC)                   \
       Sym(init_stack)                          \
-      Sym(stg_chk_0)                           \
-      Sym(stg_chk_1)                           \
+      SymX(__stg_chk_0)                                \
+      SymX(__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_unbx_r1)                      \
-      Sym(stg_gc_unpt_r1)                      \
-      Sym(stg_gc_ut_0_1)                       \
-      Sym(stg_gc_ut_1_0)                       \
-      Sym(stg_gen_chk)                         \
-      Sym(stg_yield_to_interpreter)            \
+      SymX(stg_gc_d1)                          \
+      SymX(stg_gc_l1)                          \
+      SymX(__stg_gc_enter_1)                   \
+      SymX(stg_gc_f1)                          \
+      SymX(stg_gc_noregs)                      \
+      SymX(stg_gc_seq_1)                       \
+      SymX(stg_gc_unbx_r1)                     \
+      SymX(stg_gc_unpt_r1)                     \
+      SymX(stg_gc_ut_0_1)                      \
+      SymX(stg_gc_ut_1_0)                      \
+      SymX(stg_gen_chk)                                \
+      SymX(stg_yield_to_interpreter)           \
       SymX(ErrorHdrHook)                       \
-      SymX(MainRegTable)                       \
+      MAIN_CAP_SYM                              \
       SymX(MallocFailHook)                     \
       SymX(NoRunnableThreadsHook)              \
       SymX(OnExitHook)                         \
@@ -197,30 +203,42 @@ typedef struct _RtsSymbolVal {
       SymX(catchzh_fast)                       \
       SymX(cmp_thread)                         \
       SymX(complementIntegerzh_fast)           \
+      SymX(cmpIntegerzh_fast)                  \
+      SymX(cmpIntegerIntzh_fast)               \
       SymX(createAdjustor)                     \
       SymX(decodeDoublezh_fast)                        \
       SymX(decodeFloatzh_fast)                 \
       SymX(defaultsHook)                       \
       SymX(delayzh_fast)                       \
+      SymX(deRefWeakzh_fast)                   \
+      SymX(deRefStablePtrzh_fast)              \
       SymX(divExactIntegerzh_fast)             \
       SymX(divModIntegerzh_fast)               \
       SymX(forkzh_fast)                                \
       SymX(freeHaskellFunctionPtr)             \
+      SymX(freeStablePtr)                      \
       SymX(gcdIntegerzh_fast)                  \
+      SymX(gcdIntegerIntzh_fast)               \
+      SymX(gcdIntzh_fast)                      \
       SymX(getProgArgv)                                \
       SymX(getStablePtr)                       \
       SymX(int2Integerzh_fast)                 \
+      SymX(integer2Intzh_fast)                 \
+      SymX(integer2Wordzh_fast)                        \
       SymX(isDoubleDenormalized)               \
       SymX(isDoubleInfinite)                   \
       SymX(isDoubleNaN)                                \
       SymX(isDoubleNegativeZero)               \
+      SymX(isEmptyMVarzh_fast)                 \
       SymX(isFloatDenormalized)                        \
       SymX(isFloatInfinite)                    \
       SymX(isFloatNaN)                         \
       SymX(isFloatNegativeZero)                        \
       SymX(killThreadzh_fast)                  \
+      SymX(makeStablePtrzh_fast)               \
       SymX(minusIntegerzh_fast)                        \
       SymX(mkApUpd0zh_fast)                    \
+      SymX(myThreadIdzh_fast)                  \
       SymX(newArrayzh_fast)                    \
       SymX(newBCOzh_fast)                      \
       SymX(newByteArrayzh_fast)                        \
@@ -255,6 +273,7 @@ typedef struct _RtsSymbolVal {
       SymX(rts_getInt32)                       \
       SymX(rts_getPtr)                         \
       SymX(rts_getStablePtr)                   \
+      SymX(rts_getThreadId)                    \
       SymX(rts_getWord)                                \
       SymX(rts_getWord32)                      \
       SymX(rts_mkAddr)                         \
@@ -314,7 +333,7 @@ typedef struct _RtsSymbolVal {
       SymX(stg_sel_9_upd_info)                 \
       SymX(stg_seq_frame_info)                 \
       SymX(stg_upd_frame_info)                 \
-      SymX(stg_update_PAP)                     \
+      SymX(__stg_update_PAP)                   \
       SymX(suspendThread)                      \
       SymX(takeMVarzh_fast)                    \
       SymX(timesIntegerzh_fast)                        \
@@ -578,6 +597,42 @@ lookupLocalSymbol( ObjectCode* oc, char *lbl )
 
 
 /* -----------------------------------------------------------------------------
+ * Debugging aid: look in GHCi's object symbol tables for symbols
+ * within DELTA bytes of the specified address, and show their names.
+ */
+#ifdef DEBUG
+void ghci_enquire ( char* addr );
+
+void ghci_enquire ( char* addr )
+{
+   int   i;
+   char* sym;
+   char* a;
+   const int DELTA = 64;
+   ObjectCode* oc;
+   for (oc = objects; oc; oc = oc->next) {
+      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); */
+         a = NULL;
+         if (oc->lochash != NULL)
+            a = lookupStrHashTable(oc->lochash, sym);
+         if (a == NULL)
+            a = lookupStrHashTable(symhash, sym);
+         if (a == NULL) {
+            /* fprintf(stderr, "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);
+         }
+      }
+   }
+}
+#endif
+
+
+/* -----------------------------------------------------------------------------
  * Load an obj (populate the global symbol table, but don't resolve yet)
  *
  * Returns: 1 if ok, 0 on error.