Changeset 1247

Timestamp:

Feb 15, 2004, 10:49:46 AM (22 years ago)

Author:

bird

Message:

#905: Implemented ABS symbols. Corrected fixups making fixups to weak symbols work. Fixed case where base_dir is missing a slash.

File:

• trunk/src/emx/src/emxomf/emxomf.c (modified) (6 diffs, 1 prop)

trunk/src/emx/src/emxomf/emxomf.c

@@ -730 +730 @@
       struct weaksym *next = cur->next;
       free (cur->name);
+      free (cur);
       free (cur->module);
-      free (cur);
       cur = next;
     }
@@ -1406 +1406 @@
                     put_idx (flat_index);
                     put_idx (index);
+                    if (!index)
+                        put_16 (0);
                     started = TRUE;
                   }
@@ -1467 +1469 @@
 static void write_pubdef (void)
 {
+  write_pubdef1 (N_ABS,  0,          FALSE, 0);
+  write_pubdef1 (N_ABS,  0,          TRUE, 0);
   write_pubdef1 (N_TEXT, text_index, FALSE, 0);
   write_pubdef1 (N_TEXT, text_index, TRUE,  0);
@@ -1475 +1479 @@
   if (!weak_list_filename)
   {
+      write_pubdef1 (N_WEAKA, 0,          FALSE, 0);
+      write_pubdef1 (N_WEAKA, 0,          TRUE, 0);
       write_pubdef1 (N_WEAKT, text_index, FALSE, 0);
       write_pubdef1 (N_WEAKT, text_index, TRUE,  0);
@@ -1744 +1750 @@
                symbol table to find the fixup type and target
                address. */
-
-            switch (sym_ptr[r->r_symbolnum].n_type)
+            const struct nlist *sym = &sym_ptr[r->r_symbolnum];
+/*#ifdef DEBUG
+            const char *psz = sym->n_un.n_strx + str_ptr;
+#endif*/
+            switch (sym->n_type)
               {
+              case N_TEXT:
+              case N_WEAKD:
+              case N_WEAKB:
+              case N_WEAKA:
+                break;
+
               case N_EXT:
               case N_WEAKU:
-                if (r->r_pcrel)
-                  *(dword *)(src + r->r_address) = 0;
-                break;
-              case N_TEXT:
-                break;
               case N_TEXT|N_EXT:
               case N_WEAKT:
-                *(dword *)(src + r->r_address) = 0;
+                if (r->r_pcrel)
+                  { /* example: r_address = 0xc, dw=0xfffffff6. disp=6 */
+                    dword dw = *(dword *)(src + r->r_address);
+                    dw += r->r_address + 4;
+                    *(dword *)(src + r->r_address) = dw;
+                  }
                 break;
               case N_DATA:
               case N_DATA|N_EXT:
-              case N_WEAKD:
                 *(dword *)(src + r->r_address) -= start_data;
                 break;
               case N_BSS:
               case N_BSS|N_EXT:
-              case N_WEAKB:
                 *(dword *)(src + r->r_address) -= start_bss;
                 break;
+
               default:
                 error ("write_seg: Invalid symbol type (0x%.2x)",
@@ -2857 +2871 @@
   /* make sure we have base_dir and that it's an abspath */
   if (!base_dir[0])
+    {
       getcwd(base_dir, sizeof(base_dir));
+      len = strlen(base_dir);
+      base_dir[len++] = '\\';
+      base_dir[len] = '\0';
+    }
   else if (   (base_dir[0] == '\\' ||  base_dir[0] == '/')
            &&  base_dir[1] != '\\' &&  base_dir[1] != '/') /* unc */