From: sewardj <unknown>
Date: Fri, 26 Oct 2001 11:33:13 +0000 (+0000)
Subject: [project @ 2001-10-26 11:33:13 by sewardj]
X-Git-Tag: Approximately_9120_patches~692
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=3eb89949b29137d1706b0412373fed775b9f05a1;p=ghc-hetmet.git

[project @ 2001-10-26 11:33:13 by sewardj]
merge from stable, rev 1.60.2.10:

  Implement a debugging aid: look in GHCi's object symbol tables for
  symbols within DELTA bytes of the specified address, and show their
  names.  Only compiled with -DDEBUG.  The new fn is called ghci_enquire
  and you can call it from within a gdb session.
---

diff --git a/ghc/rts/Linker.c b/ghc/rts/Linker.c
index 289bace..8cd1b02 100644
--- 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.72 2001/10/26 11:33:13 sewardj Exp $
  *
  * (c) The GHC Team, 2000, 2001
  *
@@ -578,6 +578,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.