Changeset 515

Timestamp:

Aug 4, 2003, 1:05:27 AM (22 years ago)

Author:

bird

Message:

#483: Bugfixing.

File:

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

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

@@ -580 +580 @@
                 if (t == N_TEXT || t == N_DATA || t == N_BSS
                     /* kso #465 2003-06-04: Find weak symbols too. */
-                    || (t >= N_WEAKA && t <= N_WEAKB)
+                    || (sym_ptr[j].n_type >= N_WEAKA && sym_ptr[j].n_type <= N_WEAKB)
                     || (t == 0 && sym_ptr[j].n_value != 0))
                   return sym_ptr+j;
@@ -1110 +1110 @@
         add_extdef (&started, str_ptr + sym_ptr[i].n_un.n_strx);
       }
+#if 1 /* this isn't actually required if only the assembler could do what it's supposed to... */
     else if (sym_ptr[i].n_type >= N_WEAKA && sym_ptr[i].n_type <= N_WEAKB)
-      { /* Not convinced about this yet, I mean there should really be 
+      { /* Not convinced about this yet, I mean there should really be
            external records for this, perhaps...
            At least I can't see why this will be wrong. */
@@ -1118 +1119 @@
         add_extdef (&started, name);
       }
+#endif
   if (started)
     write_rec ();
@@ -1144 +1146 @@
         init_rec (COMENT);
         put_8 (0x80);
-        put_8 (0xa8);
+        put_8 (CLASS_WKEXT);
         put_idx (sym_more[i].index);
         put_idx (weak_zero_index);
@@ -1155 +1157 @@
    mark it as N_WEAKU so that it is later writen within a WKEXT record.
    Also we convert a.out-style weak symbols here as normal public symbols,
-   as the sense of weak is reverse in OMF 
-   
+   as the sense of weak is reverse in OMF
+
    Weak Hack Method 1.
    */
@@ -1205 +1207 @@
          /*SETTYPE (N_WEAKU);*/
       }
-    #endif 
+    #endif
 #undef SETTYPE
 }
@@ -1227 +1229 @@
 static const char *weak_process_name(const struct nlist *pSym, const char *pszOrgName, char *pachName, int cchName)
 {
-    switch (sym_ptr->n_type)
+    switch (pSym->n_type)
     {
         /*
@@ -1323 +1325 @@
   started = FALSE;
   for (i = 0; i < sym_count; ++i)
-    if (   (sym_ptr[i].n_type & ~N_EXT) == type
-        || (type >= N_WEAKU && type <= N_WEAKB && sym_ptr[i].n_type == type)
+    if (    sym_ptr[i].n_type == type
+        || ((type < N_WEAKU || type > N_WEAKB) && (sym_ptr[i].n_type & ~N_EXT) == type)
         )
       {
@@ -1422 +1424 @@
 {
   write_pubdef1 (N_TEXT, text_index, FALSE, 0);
-  write_pubdef1 (N_TEXT, text_index, TRUE, 0);
+  write_pubdef1 (N_TEXT, text_index, TRUE,  0);
+  write_pubdef1 (N_DATA, udat_index, FALSE, text_size);
+  write_pubdef1 (N_DATA, udat_index, TRUE,  text_size);
+  write_pubdef1 (N_BSS,  bss_index,  FALSE, text_size + data_size);
+  write_pubdef1 (N_BSS,  bss_index,  TRUE,  text_size + data_size);
   if (!weak_list_filename)
   {
       write_pubdef1 (N_WEAKT, text_index, FALSE, 0);
-      write_pubdef1 (N_WEAKT, text_index, TRUE, 0);
+      write_pubdef1 (N_WEAKT, text_index, TRUE,  0);
+      write_pubdef1 (N_WEAKD, udat_index, FALSE, text_size);
+      write_pubdef1 (N_WEAKD, udat_index, TRUE,  text_size);
+      write_pubdef1 (N_WEAKB, bss_index,  FALSE, text_size + data_size);
+      write_pubdef1 (N_WEAKB, bss_index,  TRUE,  text_size + data_size);
   }
   /* kso #456 2003-06-10: The debugger looks for 'main' not '_main'. */
   write_pubdef_main ();
-  write_pubdef1 (N_DATA, udat_index, FALSE, text_size);
-  write_pubdef1 (N_DATA, udat_index, TRUE, text_size);
-  if (!weak_list_filename)
-  {
-      write_pubdef1 (N_WEAKD, text_index, FALSE, 0);
-      write_pubdef1 (N_WEAKD, text_index, TRUE, 0);
-  }
-  write_pubdef1 (N_BSS, bss_index, FALSE, text_size + data_size);
-  write_pubdef1 (N_BSS, bss_index, TRUE, text_size + data_size);
-  if (!weak_list_filename)
-  {
-      write_pubdef1 (N_WEAKB, bss_index, FALSE, text_size + data_size);
-      write_pubdef1 (N_WEAKB, bss_index, TRUE, text_size + data_size);
-  }
 }