Changeset 1563

Timestamp:

Oct 10, 2004, 4:51:49 AM (21 years ago)

Author:

bird

Message:

Convert imports.

File:

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

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

@@ -917 +917 @@
 
 
-/* Put the null-terminated string pszName into the current OMF record.  
+/* Put the null-terminated string pszName into the current OMF record.
    In the OMF record, the string is preceded by a length byte.  The
    string length must not exceed 255; if it is too long, display a
@@ -929 +929 @@
     if (cch > 255)
     {
-        /* Hash the symbol to help making it unique. 
+        /* Hash the symbol to help making it unique.
          * NOTE that the hash algorithm is not fixed, so is the !_%X marker too.
          *      the weakld is parsing it!
@@ -1303 +1303 @@
             int cch = strlen(pszOrgName);
             int cch2;
-            
+
             /* Init the markers if not done already. */
             if (!weak_marker_simple[0])
@@ -1330 +1330 @@
                 gettimeofday(&tv, NULL);
                 memcpy(&weak_marker_ts[0], "$w$", 4);
-                ltoa(tv.tv_sec, &weak_marker_ts[3], 36); 
+                ltoa(tv.tv_sec, &weak_marker_ts[3], 36);
                 cch2 = 3 + strlen(&weak_marker_ts[3]);
                 ltoa(tv.tv_usec, &weak_marker_ts[cch2], 36);
@@ -1337 +1337 @@
                 if (tv_prev.tv_usec == tv.tv_usec && tv_prev.tv_sec == tv.tv_sec)
                 {
-                    if (!iOpaque)   
+                    if (!iOpaque)
                     {
                         unsigned short seed[3];
@@ -1363 +1363 @@
             else if (cch + 24 < 255)
                 snprintf(pachName, cchName, "%s%.16s", pszOrgName, weak_marker_ts);
-            else 
+            else
             {   /* too long. */
                 int         cch3 = weak_marker_ts_size > 24 ? 24 : weak_marker_ts_size;
                 char        szHash[16];
                 const char *psz;
-                unsigned    uHash;   
+                unsigned    uHash;
                 for (psz = pszOrgName, uHash = 5381; *psz; psz++)   /* hash alg: original djb2. */
                     uHash += (uHash << 5) + *psz;
@@ -2717 +2717 @@
 }
 
+/* Convert import entries. */
+static void write_import_i2 (void)
+{
+  int i;
+  const char *name1, *name2;
+
+  /* Search the symbol table for N_IMP1 and N_IMP2 symbols.  These are
+     unique to import modules. */
+
+  name1 = NULL; name2 = NULL;
+  for (i = 0; i < sym_count; ++i)
+    {
+      switch (sym_ptr[i].n_type)
+        {
+        case N_IMP1|N_EXT:
+          name1 = str_ptr + sym_ptr[i].n_un.n_strx;
+          break;
+        case N_IMP2|N_EXT:
+          name2 = str_ptr + sym_ptr[i].n_un.n_strx;
+          break;
+        }
+      if (name1 && name2)
+        {
+          int len1, mod_len;
+          long ord;
+          const char *proc_name, *p;
+          char mod[256], *q;
+
+          /* Parse the special symbols into module name and ordinal number.
+             name2 should look like
+
+               SYMBOL=MODULE.ORDINAL
+
+             where SYMBOL is name1, MODULE is the module name and ORDINAL is
+             the ordinal number. */
+
+          len1 = strlen (name1);
+          if (memcmp (name1, name2, len1) != 0)
+            error ("Invalid import record: names don't match");
+          name2 += len1;
+          if (*name2 != '=')
+            error ("Invalid import record: missing `='");
+          ++name2;
+          p = strchr (name2, '.');
+          if (p == NULL)
+            error ("Invalid import record: missing `.'");
+          mod_len = p - name2;
+          memcpy (mod, name2, mod_len);
+          mod[mod_len] = '\0';
+          proc_name = NULL;
+          errno = 0;
+          ord = strtol (p + 1, &q, 10);
+          if (q != p + 1 && *q == 0 && errno == 0)
+            {
+              if (ord < 1 || ord > 65535)
+                error ("Invalid import record: invalid ordinal");
+            }
+          else
+            {
+              ord = -1;
+              proc_name = p + 1;
+              if (*proc_name == 0)
+                error ("Invalid import record: invalid name");
+            }
+
+          /* Write the import definition record. */
+
+          init_rec (COMENT);
+          put_8 (0x00);
+          put_8 (IMPDEF_CLASS);
+          put_8 (IMPDEF_SUBTYPE);
+          put_8 (proc_name == NULL ? 0x01 : 0x00); /* Import by ordinal or by name */
+          put_str (name1);                         /* Underscore already removed above */
+          put_str (mod);
+          if (proc_name == NULL)
+            put_16 (ord);
+          else if (strcmp (proc_name, name1) == 0)
+            put_8 (0);
+          else
+            put_str (proc_name);
+          write_rec ();
+
+          name1 = NULL;
+          name2 = NULL;
+        }
+    }
+}
+
 
 /* If the input file is an import module (method (I1) as created by
@@ -3629 +3717 @@
   write_set_pub ();
   write_alias ();
+  write_import_i2 ();
 
   /* Write link pass separator. */