Changeset 1207

Timestamp:

Feb 9, 2004, 1:10:15 AM (22 years ago)

Author:

bird

Message:

#883: Fixed crash due to fixup to weak symbol.

File:

• trunk/src/emx/src/ld/ld.c (modified) (7 diffs, 1 prop)

trunk/src/emx/src/ld/ld.c

@@ -2026 +2026 @@
           if (!s || !s->defined)
             enter_global_ref (p, p->n_un.n_strx + entry->strings, entry);
+          else if (s) /* hack! */
+              p->n_un.n_name = (char*)s;
+#ifdef DEBUG
+          else fprintf(stderr, "dbg-warning: %s - sym %d: '%s' no such symbol...\n",
+                       entry->filename,
+                       p - entry->symbols,
+                       p->n_un.n_strx + entry->strings);
+#endif
         }
       else if (p->n_type & N_EXT)
@@ -2036 +2044 @@
         }
       else debugger_sym_count++;
+#ifdef DEBUG_BIRD
+      fprintf(stderr, "dbg: %s sym #%3d: un=%08lx typ=%02x\n",
+              entry->filename,
+              p - entry->symbols,
+              p->n_un.n_strx,
+              p->n_type);
+#endif
     }
 
@@ -2154 +2169 @@
     text_start = nlist_p->n_value;
 
+#ifdef DEBUG_BIRD
+  sp->trace = 1;
+#endif
   if (sp->trace)
     {
@@ -2228 +2246 @@
         }
 
-      fprintf (stderr, "symbol %s %s in ", sp->name, reftype);
+
+      fprintf (stderr, "symbol in ");
       print_file_name (entry, stderr);
-      fprintf (stderr, "\n");
+      fprintf (stderr, ": %3d %s %s\n",
+               nlist_p - entry->symbols, sp->name, reftype);
     }
 }
@@ -4075 +4095 @@
 void perform_relocation ( char *data, int pc_relocation, int data_size,
     struct relocation_info *reloc_info, int reloc_size, struct file_entry *entry);
+#ifdef DEBUG_BIRD
+void dbg_dump_rel(struct file_entry *entry, struct relocation_info * rel,
+                  size_t reloc_size, const char *desc);
+#endif
 
 /* Relocate the text segment of each input file
@@ -4137 +4161 @@
       entry->datarel = reloc;
     }
+#ifdef DEBUG_BIRD
+  dbg_dump_rel(entry, entry->textrel, entry->text_reloc_size, "text");
+  dbg_dump_rel(entry, entry->datarel, entry->data_reloc_size, "data");
+#endif
 }
 
@@ -4191 +4219 @@
   mywrite (bytes, 1, entry->text_size, outdesc);
 }
+
+#ifdef DEBUG_BIRD
+void dbg_dump_rel(struct file_entry *entry, struct relocation_info * rel,
+                  size_t reloc_size, const char *desc)
+{
+  struct relocation_info   *relend = (struct relocation_info *)((char*)rel + reloc_size);
+  int                       i;
+
+  fprintf(stderr,
+          "dbg: %s relocations %s:\n"
+          "dbg: rel - Address  len sym#   attrs\n",
+          desc, entry->filename);
+  i = 0;
+  while (rel < relend)
+    {
+      fprintf(stderr, "dbg: %3d - %08x 2^%d %06x %s%s",
+              i,
+              rel->r_address,
+              rel->r_length,
+              rel->r_symbolnum,
+              rel->r_extern ? "Extrn " : "      ",
+              rel->r_pcrel  ? "PCRel " : "      "
+              );
+      if (rel->r_extern)
+        { /* find the symbol. */
+          struct nlist *s = &entry->symbols[rel->r_symbolnum];
+          fprintf(stderr, " s.val:%08lx s.typ:%02x s.des:%04x s.oth:%02x",
+                  s->n_value,
+                  (unsigned)s->n_type,
+                  s->n_desc,
+                  (unsigned)s->n_other);
+          if (s->n_un.n_strx < 0x20000)
+            fprintf(stderr, " !!bad symbol ptr %p", s->n_un.n_name);
+          else
+            {
+              struct glosym *sym = (struct glosym *)s->n_un.n_name;
+              fprintf(stderr, " %s", sym->name);
+            }
+        }
+      fprintf(stderr, "\n");
+      /* next */
+      i++;
+      rel++;
+    }
+}
+#endif