Changeset 489

Timestamp:

Jul 31, 2003, 5:10:56 PM (22 years ago)

Author:

bird

Message:

#483: Temporary commit (Again.).

File:

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

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

@@ -166 +166 @@
     PWLDMOD             pMod;
 
+
     /** Import module - only if WLDSF_IMPORT is set. */
     const char*         pszImpMod;
 
-    /** Ordinal - WLDSF_IMPORT or WLDSF_EXPORT. 
+    /** Import Ordinal (WLDSF_IMPORT). 
      * 0 means no ordinal. */
-    unsigned            iOrdinal;
+    unsigned            iImpOrd;
+
 
     /** Export flags */
@@ -180 +182 @@
         unsigned    fNoData : 1;        /* ?? */
         unsigned    cParams;            /* callgate stuff, # of words to push */
-    }                   fExport
+    }                   fExport;
+
+    /** Import Ordinal (WLDSF_EXPORT). 
+     * 0 means no ordinal. */
+    unsigned            iExpOrd;
+
 
     /** Symbol this is an alias for. */
@@ -425 +432 @@
     int             cch;                
     PWLDSYM         pSym;
+    PWLDSYM         pSym2;
+
 
 
@@ -443 +452 @@
             unsigned long *     pul;
             signed long *       pl;
-        } u;
+        } u, u1, u2, u3;
         /** macro for getting a OMF index out of the buffer */
         #define OMF_GETINDEX()  (*u.puch & 0x80 ? ((*u.pch++ & 0x7f) << 8) + *u.pch++ : *u.pch++)
@@ -549 +558 @@
                                 u.pch += cch;
                                 if (fOrd)
-                                    pSym->iOrdinal = OMF_WORD();
+                                    pSym->iImpOrd = OMF_WORD();
                                 break;
                             }
@@ -555 +564 @@
                             /* 
                              * Export definition.
+                             * If it have an internal name the exported name will become
+                             * an alias record.
                              */
                             case OMFEXT_EXPDEF:
                             {
-                                int fOrd = *u.pch & 1;
+                                u1 = u; u.pch++;
+                                u2 = u; u.pch+ = 1 + *u2.pch;
+                                u3 = u; u.pch+ = 1 + *u3.pch;
+                                
+                                pSym2 = NULL;
+                                if (*u3.pch)
+                                {
+                                    pSym2 = symNew(pWld, WLDSF_UNDEF, u3.pch + 1, *u3.pch);
+                                    if (!pSym2) goto failure;
+                                    pSym = symNew(pWld, WLDSF_STRONG | WLDSF_ALIAS | WLDSF_EXPORT, u2.pch + 1, *u2.pch);
+                                    if (!pSym) goto failure;
+                                    pSym->pAliasFor = pSym2;
+                                }
+                                else
+                                {
+                                    pSym = symNew(pWld, WLDSF_UNDEF | WLDSF_EXPORT, u2.pch + 1, *u2.pch);
+                                    if (!pSym) goto failure;
+                                }
+                                if (*u1.pch & 0x80)
+                                    pSym->iExpOrd = GET_BYTE();
+                                if (*u1.pch & 0x40)
+                                    pSym->fExport.fResidentName = 1;
+                                
+
                                 break;
                             }