Changeset 4402 for trunk/tools/common/kFileDef.cpp

Timestamp:

Oct 3, 2000, 7:42:41 AM (25 years ago)

Author:

bird

Message:

Implemented .Def to WLINK directives/options converter.

File:

• trunk/tools/common/kFileDef.cpp (modified) (19 diffs)

trunk/tools/common/kFileDef.cpp

@@ -18 +18 @@
 #include <string.h>
 #include <stdlib.h>
-
+#include <assert.h>
+
+#include "kFile.h"
 #include "kFileFormatBase.h"
 #include "kFileDef.h"
@@ -26 +28 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
-static char *dupeString(const char *psz);
+static char *dupeString(const char *psz, BOOL fSkipFirstWord = FALSE);
 static char *trim(char *psz);
+static char *ltrim(const char *psz);
 static char *removeFnutts(char *pszStr);
+inline char  upcase(char ch);
+static char *stristr(const char *pszStr, const char *pszSubStr);
+
 
 /**
  * Duplicates a string.
- * @returns   Pointer to stringcopy. Remeber to delete this!
- * @param     psz  Pointer to string to duplicate.
- */
-static char *dupeString(const char *psz)
+ * @returns Pointer to stringcopy. Remeber to delete this!
+ * @param   psz             Pointer to string to duplicate.
+ * @param   fSkipFirstWord  Skips the first word before duplicating the string.
+ */
+static char *dupeString(const char *psz, BOOL fSkipFirstWord/* = FALSE*/)
 {
     char *pszDupe;
     if (psz == NULL)
         return NULL;
+
+    if (fSkipFirstWord)
+    {
+        while (*psz != ' ' && *psz != '\t' && *psz != '\n' && *psz != '\r' && *psz != '\0')
+            psz++;
+        psz = ltrim(psz);
+    }
+
     pszDupe = new char[strlen(psz)+1];
-    return strcpy(pszDupe, psz);
+    strcpy(pszDupe, psz);
+    if (fSkipFirstWord)
+        return removeFnutts(pszDupe);
+    return pszDupe;
 }
 
@@ -56 +74 @@
     if (psz == NULL)
         return NULL;
-    while (*psz == ' ')
+    while (*psz == ' ' || *psz == '\t')
         psz++;
     i = strlen(psz) - 1;
-    while (i >= 0 && psz[i] == ' ')
+    while (i >= 0 && (psz[i] == ' ' || psz[i] == '\t'))
         i--;
     psz[i+1] = '\0';
@@ -66 +84 @@
 
 
-kFileDef::kFileDef(FILE *phFile) throw(int)
-    :pszType(NULL), pszBase(NULL), pszCode(NULL), pszData(NULL), pszDescription(NULL),
+/**
+ * Trims a string, that is removing blank spaces at start and end.
+ * @returns   Pointer to first non-blank char.
+ * @param     psz  Pointer to string.
+ * @result    Blank at end of string is removed. ('\0' is moved to the left.)
+ */
+static char *ltrim(const char *psz)
+{
+    if (psz == NULL)
+        return NULL;
+
+    while (*psz == ' ' || *psz == '\t')
+        psz++;
+    return (char *)psz;
+}
+
+
+
+kFileDef::kFileDef(kFile *pFile) throw(int)
+    :pszType(NULL), pszModName(NULL), pszBase(NULL), pszCode(NULL), pszData(NULL), pszDescription(NULL),
     pszExeType(NULL), pszHeapSize(NULL), pszOld(NULL), pszProtmode(NULL), pszStackSize(NULL),
-    pszStub(NULL), pSegments(NULL), pImports(NULL), pExports(NULL)
+    pszStub(NULL), pSegments(NULL), pImports(NULL), pExports(NULL),
+    fProgram(FALSE), fLibrary(FALSE), fPhysicalDevice(FALSE), fVirtualDevice(FALSE),
+    fInitInstance(FALSE), fTermInstance(FALSE), fInitGlobal(FALSE), fTermGlobal(FALSE),
+    chAppType(kFileDef::unknown)
 {
     /* determin file size */
-    if (!fseek(phFile, 0, SEEK_SET))
-    {
-        this->read(phFile);
+
+    if (pFile->start())
+    {
+        this->read(pFile);
     }
     else
@@ -126 +166 @@
 /**
  * Read/parse the Definition file.
- * @param     phFile  Handle to file.
- * @remark    throws errorcode on error (TODO: errorhandling)
- */
-void kFileDef::read(FILE *phFile) throw (int)
+ * @param   pFile   Pointer to fileobject.
+ * @remark  throws errorcode on error (TODO: errorhandling)
+ */
+void kFileDef::read(kFile *pFile) throw (int)
 {
     char *pszTmp;
@@ -136 +176 @@
 
     /* readloop */
-    psz = readln(phFile, &szBuffer[0], sizeof(szBuffer));
+    psz = readln(pFile, &szBuffer[0], sizeof(szBuffer));
     while (psz != NULL)
     {
@@ -146 +186 @@
             if (pszType != NULL) throw (0x101);
             pszType = dupeString(psz);
+            fLibrary = TRUE;
+            if (!setModuleName())
+                throw (0x107);
+            fInitInstance = stristr(pszType, "INITINSTANCE") != NULL;
+            fInitGlobal   = stristr(pszType, "INITGLOBAL")   != NULL || !fInitInstance;
+            fTermInstance = stristr(pszType, "TERMINSTANCE") != NULL;
+            fTermGlobal   = stristr(pszType, "TERMGLOBAL")   != NULL || !fTermInstance;
         }
         else if (StringCase(psz, "NAME"))
@@ -151 +198 @@
             if (pszType != NULL) throw (0x101);
             pszType = dupeString(psz);
+            fProgram = TRUE;
+            setModuleName();
+            if (stristr(pszType, "WINDOWAPI"))
+                chAppType = kFileDef::pm;
+            else if (stristr(pszType, "NOTWINDOWCOMPAT"))
+                chAppType = kFileDef::fullscreen;
+            else if (stristr(pszType, "WINDOWCOMPAT"))
+                chAppType = kFileDef::pmvio;
+            else
+                chAppType = kFileDef::unknown;
         }
         else if (StringCase(psz, "PHYSICAL DEVICE")) //gap is fixed to one space, this may be fixed in readln.
@@ -156 +213 @@
             if (pszType != NULL) throw (0x101);
             pszType = dupeString(psz);
+            fPhysicalDevice = TRUE;
+            setModuleName();
         }
         else if (StringCase(psz, "VIRTUAL DEVICE")) //gap is fixed to one space, this may be fixed in readln.
@@ -161 +220 @@
             if (pszType != NULL) throw (0x101);
             pszType = dupeString(psz);
+            fVirtualDevice = TRUE;
+            setModuleName();
         }
         else if (StringCase(psz, "BASE"))
-            pszBase = dupeString(psz);
+            pszBase = dupeString(psz, TRUE);
         else if (StringCase(psz, "CODE"))
-            pszCode = dupeString(psz);
+            pszCode = dupeString(psz, TRUE);
         else if (StringCase(psz, "DATA"))
-            pszData = dupeString(psz);
+            pszData = dupeString(psz, TRUE);
         else if (StringCase(psz, "DESCRIPTION"))
-            pszDescription = dupeString(psz);
+            pszDescription = dupeString(psz, TRUE);
         else if (StringCase(psz, "EXETYPE"))
-            pszExeType = dupeString(psz);
+            pszExeType = dupeString(psz, TRUE);
         else if (StringCase(psz, "HEAPSIZE"))
-            pszHeapSize = dupeString(psz);
+            pszHeapSize = dupeString(psz, TRUE);
         else if (StringCase(psz, "OLD"))
-            pszOld = dupeString(psz);
+            pszOld = dupeString(psz, TRUE);
         else if (StringCase(psz, "PROTMODE"))
-            pszProtmode = dupeString(psz);
+            pszProtmode = dupeString(psz, TRUE);
         else if (StringCase(psz, "STACKSIZE"))
-            pszStackSize = dupeString(psz);
+            pszStackSize = dupeString(psz, TRUE);
         else if (StringCase(psz, "STUB"))
-            pszStub = dupeString(psz);
+            pszStub = dupeString(psz, TRUE);
         else if (StringCase(psz, "SEGMENTS"))
         {
             PDEFSEGMENT *pps = &pSegments;
-            while (!isKeyword(psz = readln(phFile, &szBuffer[0], sizeof(szBuffer))) && psz != NULL)
+            while (!isKeyword(psz = readln(pFile, &szBuffer[0], sizeof(szBuffer))) && psz != NULL)
             {
                 *pps = new DEFSEGMENT; memset(*pps, 0, sizeof(**pps));
@@ -196 +257 @@
         {
             PDEFIMPORT *ppi = &pImports;
-            while (!isKeyword(psz = readln(phFile, &szBuffer[0], sizeof(szBuffer))) && psz != NULL)
+            while (!isKeyword(psz = readln(pFile, &szBuffer[0], sizeof(szBuffer))) && psz != NULL)
             {
                 //DOSCALL1.154 or DosQueryHeaderInfo = DOSCALL1.154
@@ -229 +290 @@
         {
             PDEFEXPORT *ppe = &pExports;
-            while (!isKeyword(psz = readln(phFile, &szBuffer[0], sizeof(szBuffer))) && psz != NULL)
+            while (!isKeyword(psz = readln(pFile, &szBuffer[0], sizeof(szBuffer))) && psz != NULL)
             {
                 /* CloseHandle = CloseHandle@4 @1234 RESIDENTNAME 2 */
@@ -312 +373 @@
         /* next ? */
         if (fNext)
-            psz = readln(phFile, &szBuffer[0], sizeof(szBuffer));
+            psz = readln(pFile, &szBuffer[0], sizeof(szBuffer));
     }
 
     /* sanity check */
     if (pszType == NULL)
-        throw (0x106);
+        throw ((int)0x106);
 }
 
@@ -324 +385 @@
  * Reads first meaning full line from a file into a buffer.
  * @returns   Pointer to buffer on success;  NULL on error.
- * @param     phFile     Filea handle.
+ * @param     pFile      Pointer to fileobject to read line from.
  * @param     pszBuffer  Pointer to buffer.
  * @param     cbBuffer   Size of buffer.
  * @remark    tabs are expanded. string is trimmed. comments removed.
  */
-char *kFileDef::readln(FILE *phFile, char *pszBuffer, int cbBuffer) throw (int)
+char *kFileDef::readln(kFile *pFile, char *pszBuffer, int cbBuffer) throw (int)
 {
     int i;
@@ -337 +398 @@
     {
         /* read line */
-        if (!fgets(pszBuffer, cbBuffer, phFile))
-        {
-            if (feof(phFile))
-                return FALSE;
-            else
+        if (!pFile->readln(pszBuffer, cbBuffer))
+        {
+            if (!pFile->isEOF())
                 throw (0x201);
+            return FALSE;
         }
 
@@ -378 +438 @@
                 memmove(pszBuffer, &pszBuffer[i], cch + 1);
         }
-    } while ((*pszBuffer == ';' || cch == 0) && !feof(phFile));
+    } while ((*pszBuffer == ';' || cch == 0) && !pFile->isEOF());
 
     return !(*pszBuffer == ';' || cch == 0) ? pszBuffer : NULL;
@@ -416 +476 @@
 
 /**
- * Queries the module name.
+ * Extracts the module name from the pszType string.
  * @returns   Success indicator.
  * @param     pszBuffer  Pointer to string buffer which is to hold the module name upon return.
  * @remark    Assumes that pszBuffer is large enough.
  */
+BOOL  kFileDef::setModuleName(void)
+{
+    char *pszEnd;
+    char *pszStart;
+
+    assert(pszType);
+
+    /* skip the first word */
+    pszStart = strpbrk(pszType, " \t");
+    if (pszStart != NULL)
+    {
+        pszStart = ltrim(pszStart);
+        pszEnd = strpbrk(pszStart, " \t");
+        if (pszEnd == NULL)
+            pszEnd = pszStart + strlen(pszEnd);
+        pszModName = new char[pszEnd - pszStart + 1];
+        memcpy(pszModName, pszStart, pszEnd - pszStart);
+        pszModName[pszEnd - pszStart] = '\0';
+    }
+    else
+        return !StringCase(pszType, "LIBRARY");
+    return TRUE;
+}
+
+
+/**
+ * Query for the module name.
+ * @returns   Success indicator. TRUE / FALSE.
+ * @param     pszBuffer  Pointer to buffer which to put the name into.
+ */
 BOOL  kFileDef::queryModuleName(char *pszBuffer)
 {
-    char *psz;
-
-    if (pszType != NULL && StringCase(pszType, "LIBRARY"))
-    {
-        psz = pszType + sizeof("LIBRARY") - 1;
-        while (*psz == ' ')
-            psz++;
-        while (*psz != '\0' && *psz != ' ')
-            *pszBuffer++ = *psz++;
-        *pszBuffer = '\0';
-    }
-    else
+    if (pszModName == NULL)
         return FALSE;
+
+    strcpy(pszBuffer, pszModName);
+
     return TRUE;
 }
@@ -497 +579 @@
 
 /**
+ * Make a Watcom Linker parameter file addtition of this definition file.
+ * @returns Success indicator.
+ * @param   pFile   File which we're to write to (append).
+ *                  Appends at current posistion.
+ * @sketch
+ * @status
+ * @author  knut st. osmundsen (knut.stange.osmundsen@mynd.no)
+ * @remark
+ */
+BOOL  kFileDef::makeWatcomLinkFileAddtion(kFile *pFile) throw(int)
+{
+    PDEFSEGMENT pSeg;
+    PDEFIMPORT  pImp;
+    PDEFEXPORT  pExp;
+    pFile->setThrowOnErrors();
+
+    /*
+     * Write a little remark first to tell that converted stuff starts here.
+     */
+    pFile->printf("#\n# Directives generated from .DEF-file.\n#\n");
+
+    /* Format - Module type */
+    pFile->printf("FORMAT OS2 LX %s %s %s\n",
+                  fLibrary                               ? "DLL" :
+                    (fProgram ? (chAppType == pm         ? "PM"
+                              : (chAppType == fullscreen ? "FULLSCREEN"
+                                                         : "PMCOMPATIBLE"))
+                    : (fVirtualDevice                    ? "VIRTDEVICE"
+                                                         : "PHYSDEVICE" )),
+                  fLibrary ? (fInitGlobal ? "INITGLOBAL" : "INITINSTANCE") : "",
+                  fLibrary ? (fTermGlobal ? "TERMGLOBAL" : "TERMINSTANCE") : "");
+
+
+    /* Module name */
+    if (pszModName)
+        pFile->printf("OPTION MODNAME=%s\n", pszModName);
+
+    /* Description */
+    if (pszDescription)
+        pFile->printf("OPTION DESCRIPTION '%s'\n", pszDescription);
+
+    /* Base */
+    if (pszBase)
+        pFile->printf("OPTION OFFSET=%s\n", pszBase);
+
+    /* Stub */
+    if (pszStub)
+        pFile->printf("OPTION STUB='%s'\n", pszStub);
+
+    /* Old */
+    if (pszOld)
+        pFile->printf("OPTION OLDLIBRARY=%s\n", pszOld);
+
+    /* Protected mode */
+    if (pszProtmode)
+        pFile->printf("OPTION PROTMODE\n", pszProtmode);
+
+    /* Stacksize */
+    if (pszStackSize)
+        pFile->printf("OPTION STACK=%s\n", pszStackSize);
+
+    /* HeapSize */
+    if (pszHeapSize)
+        pFile->printf("OPTION HEAPSIZE=%s\n", pszHeapSize);
+
+    /* Code  -  not supported */
+
+    /* Data  -  not supported */
+
+    /*
+     * Segments.
+     */
+    pSeg = pSegments;
+    while (pSeg != NULL)
+    {
+        pFile->printf("SEGMENT %s\n", pSeg->psz);
+        pSeg = pSeg->pNext;
+    }
+
+    /*
+     * Imports.
+     */
+    pImp = pImports;
+    while (pImp != NULL)
+    {
+        if (pImp->pszName == NULL)
+            pFile->printf("IMPORT '%s' '%s'.%d\n", pImp->pszIntName, pImp->pszDll, pImp->ulOrdinal);
+        else
+            pFile->printf("IMPORT '%s' '%s'.'%s'\n", pImp->pszIntName, pImp->pszDll, pImp->pszName);
+        pImp = pImp->pNext;
+    }
+
+    /*
+     * Exports.
+     */
+    pExp = pExports;
+    while (pExp != NULL)
+    {
+        pFile->printf("EXPORT '%s'", pExp->pszName);
+        if (pExp->ulOrdinal != ~0UL)
+            pFile->printf(".%d", pExp->ulOrdinal);
+        if (pExp->pszIntName)
+            pFile->printf("='%s'", pExp->pszIntName);
+        if (pExp->fResident)
+            pFile->printf(" RESIDENT");
+        if (pExp->cParam != ~0UL)
+            pFile->printf(" %d", pExp->cParam * 2); /* .DEFs this is number of words. Watcom should have bytes. */
+        pFile->printf("\n");
+        pExp = pExp->pNext;
+    }
+
+    return TRUE;
+}
+
+
+
+
+/**
  * Removes '"' and ''' at start and end of the string.
  * @returns     pszStr!
@@ -514 +714 @@
     return pszStr;
 }
+
+
+/**
+ * Upcases a char.
+ * @returns   Upper case of the char given in ch.
+ * @param     ch  Char to capitalize.
+ */
+inline char upcase(char ch)
+{
+    return ch >= 'a' && ch <= 'z' ? (char)(ch - ('a' - 'A')) : ch;
+}
+
+
+/**
+ * Searches for a substring in a string.
+ * @returns   Pointer to start of substring when found, NULL when not found.
+ * @param     pszStr     String to be searched.
+ * @param     pszSubStr  String to be searched.
+ * @remark    Depends on the upcase function.
+ */
+static char *stristr(const char *pszStr, const char *pszSubStr)
+{
+    int cchSubStr = strlen(pszSubStr);
+    int i = 0;
+
+    while (*pszStr != '\0' && i < cchSubStr)
+    {
+        i = 0;
+        while (i < cchSubStr && pszStr[i] != '\0' &&
+               (upcase(pszStr[i]) == upcase(pszSubStr[i])))
+            i++;
+        pszStr++;
+    }
+
+    return (char*)(*pszStr != '\0' ? pszStr - 1 : NULL);
+}
+