Changeset 4164 for trunk/src/win32k/libconv.c

Timestamp:

Sep 2, 2000, 11:08:23 PM (25 years ago)

Author:

bird

Message:

Merged in the Grace branch. New Win32k!

File:

• trunk/src/win32k/libconv.c (modified) (11 diffs)

trunk/src/win32k/libconv.c

@@ -1 @@
-/* $Id: libconv.c,v 1.2 1999-11-10 01:45:29 bird Exp $
+/* $Id: libconv.c,v 1.3 2000-09-02 21:07:53 bird Exp $
  *
  * Very simple OMF/LIB dumper.
@@ -21 +21 @@
 
 int fCodeToCode16 = 0;
+int fRemoveExtra = 0;
 
 /*@IntFunc**********************************************************************
@@ -26 +27 @@
 *******************************************************************************/
 int processFile(const char *pszFilename, const char *pszFilenameOut);
-void *processRecord(void *pvRecord, void *pvBase, FILE *phNew);
+void *processRecord(void *pvRecord, void *pvBase, FILE *phNew, unsigned short *ausTrans);
 
 
@@ -35 +36 @@
     int argi = 1;
 
+    if (argc == 4)
+    {
+        argi = 2;
+        fRemoveExtra = 1;
+    }
     if (argc != 3)
         printf("syntax error - requires two filename, in.lib and out.lib\n");
@@ -78 +84 @@
                 if (fread(pvFile, cbFile, 1, phFile) == 1)
                 {
+                    unsigned short * ausTrans = calloc(sizeof(unsigned short), cbFile / 16 ); /* Assumes page size of 16 FIXME! */
                     void *pvNew = pvFile;
+
 
                     /*  main loop */
                     while (pvNew < (void*)(cbFile + (int)pvFile))
-                        pvNew = processRecord(pvNew, pvFile, phNew);
+                        pvNew = processRecord(pvNew, pvFile, phNew, ausTrans);
                 }
                 else
@@ -103 +111 @@
 
 
-void *processRecord(void *pvRecord, void *pvBase, FILE *phNew)
+void *processRecord(void *pvRecord, void *pvBase, FILE *phNew, unsigned short *ausTrans)
 {
     static char *apszLNames[256];
     static int   cpszLNames = 0;
     static int   iCode16 = 0;
+    static int   cbPage = 16;       /* fixme todo TODO FIXME ASSUMES: pagesize = 16 */
     void *pvRet = pvRecord;
     int  cbRecord;
@@ -116 +125 @@
     {
        case LIBHDR:
-            fChanged = 1;
-            fwrite(pvRecord, 1, 3, phNew);
             if (*(unsigned short*)((int)pvRecord+1) < 6)
-                fwrite((char*)pvRecord+3, 1, *(unsigned short*)((int)pvRecord+1), phNew);
-            else
-            {
-                i = 0;
-                fwrite(&i, 1, 2, phNew);
-                fwrite(&i, 1, 2, phNew);
-                fwrite(&i, 1, 2, phNew);
-                fwrite((char*)pvRecord+3+6, 1, *(unsigned short*)((int)pvRecord+1) - 6, phNew);
-            }
-            cbRecord = *((unsigned short*)((int)pvRecord+1)) + 3;
-            break;
-
-        case 0x98: /* 16-bit segdef */
-            cbRecord = *((unsigned short*)((int)pvRecord+1)) + 3;
+                fprintf(stderr, "error: not supported LIBHDR\n");
+            cbRecord = *((unsigned short*)((int)pvRecord+1)) + 3;
+            break;
+
+        case THEADR:
+            /* Add entry to the translation table - used to translate block numbers in the dictionary */
+            ausTrans[((char*)pvRecord - (char*)pvBase) / cbPage] = (unsigned short)(ftell(phNew) / cbPage);
+            cbRecord = *((unsigned short*)((int)pvRecord+1)) + 3;
+            break;
+
+        case SEGDEF: /* 16-bit segdef */
+            cbRecord = *((unsigned short*)((int)pvRecord+1)) + 3;
+            *((char*)pvRecord + 9) =  0;
             i = *(char*)((int)pvRecord + 6);
             if (cbRecord == 10 && i <= cpszLNames && strcmp(apszLNames[i-1], "CODE") == 0)
-                {
+            {
                 *(char*)((int)pvRecord + 6) = iCode16+1;
-                }
+            }
+            i = *(char*)((int)pvRecord + 6);
+            if (cbRecord == 10 &&  (*((char *)pvRecord + 3) & 0xE0) == 0x20 && i <= cpszLNames && strcmp(apszLNames[i-1], "CODE16_IOSEG") == 0)
+            {   /* change alignment of this segment... */
+                /* fprintf(stderr, "debug %s 0x%02x\n", apszLNames[*(char*)((int)pvRecord + 6) - 1], (*((char *)pvRecord + 3) & 0xFF)); */
+                *((char*)pvRecord + 3) =  0x40 | (*((char*)pvRecord + 3) & 0x1F);
+            }
             break;
 
@@ -148 +160 @@
             /* it seems to be somthing funny here! - lets try aligning it to on a 16 bytes boundrary... */
             /* PS. I know this I have a wrong approch to the lib files, not using the directory... */
+            /* Aug 13 2000 4:24am: The alignment of modules are found in the library header.
+             *    It's the size of the library header.
+             *    Not implemented yet. TODO FIXME BUGBUG ASSUMES
+             */
             fChanged = 1;
             fwrite(pvRecord, 1, cbRecord, phNew);
@@ -153 +169 @@
             if (*((unsigned char*)((int)pvRecord+cbRecord)) == 0x00)
             {
-                if ((ul % 16) > 0)
-                    cbRecord += 16 - (ul % 16);
+                if ((ul % cbPage) > 0)
+                    cbRecord += cbPage - (ul % cbPage);
             }
             /*if (*((unsigned char*)pvRecord + cbRecord) != LIBEND)*/
             {
                 ul = ftell(phNew);
-                while (ul++ % 16 != 0)
+                while (ul++ % cbPage != 0)
                     fputc(0, phNew);
             }
@@ -166 +182 @@
         } break;
 
+        case PUBDEF:
+        {
+            cbRecord = *((unsigned short*)((int)pvRecord+1)) + 3;
+            *((char*)pvRecord + cbRecord - 1) = 0;
+            break;
+        }
+
         case LNAMES:
-            {
+        {
             char *apszConv[] =
             {
-                "CODE",     "CODE",
-                "_CODE",    "CODE16",
-                "TEXT",     "CODE16",
-                "_TEXT",    "CODE16",
-                "DATA",     "FAR_DATA",
-                "_DATA",    "DATA16",
-                "DGROUP",   "DATA16_GROUP",
-                "_BSS",     "DATA16BSS",
-                "BSS",      "DATA16BSS",
-                "_CONST",   "DATA16CONST",
-                "CONST",    "DATA16CONST",
+                /* classes */
+                "CODE",         "CODE",
+                "IOSEG_CODE",   "CODE",
+                "DATA",         "FAR_DATA",
+                "BSS",          "DATA16BSS",
+                "CONST",        "DATA16CONST",
+                /* segment names */
+                "_TEXT",        "CODE16",
+                "_IOSEG",       "CODE16_IOSEG",
+                "_CODE",        "CODE16",           /* dhcalls */
+                "_DATA",        "DATA16",
+                "_BSS",         "DATA16BSS",
+                "_CONST",       "DATA16CONST",
+                /* groups */
+                "DGROUP",       "DATA16_GROUP",
                 NULL, NULL
             };
@@ -242 +269 @@
             fputc(0, phNew);
             break;
-            }
+        }
 
         case LIBEND:
-            cbRecord = *((unsigned short*)((int)pvRecord+1)) + 3;
-            fwrite(pvRecord, 1, cbRecord, phNew);
+        {
+            /* align dictionary at 512 byte (3 is min size of this record) */
+            int cBlocks;
+            unsigned short int cbSize  = (((ftell(phNew) + 3 + 0x1ff) & ~0x1ff) - ftell(phNew)) - 3;
+            unsigned long int  offDict = ftell(phNew) + cbSize + 3;
+            cbRecord = cbSize + 3;
+            fwrite(pvRecord, 1, 1, phNew);
+            fwrite(&cbSize, 1, sizeof(cbSize), phNew);
+            while (cbSize-- > 0)
+                fwrite("\0", 1, 1, phNew);
+
+            /* update header record. */
+            fseek(phNew, 3, SEEK_SET);
+            fwrite(&offDict, 1, sizeof(offDict), phNew);
+            fseek(phNew, offDict, SEEK_SET);
+
+            /* Translate the dictionary */
+            pvRecord = (void*)((char*)pvRecord + *(unsigned short*)((char*)pvRecord + 1) + 3);
+            cBlocks = *(unsigned short *)((char*)pvBase + 7);
+            for (i = 0; i < cBlocks; i++)
+            {
+                int j;
+                char *pchBlock = (char*)pvRecord + i * 512;
+                for (j = 0; j < 37; j++)
+                {
+                    if (pchBlock[j] > 19 && pchBlock[j] < 0xff)
+                    {
+                        unsigned short *pusBlock = (unsigned short*)&pchBlock[pchBlock[j] * 2];
+                        pusBlock = (unsigned short *) ((char*)pusBlock + *(char*)pusBlock + 1);
+                        if (ausTrans[*pusBlock] == 0)
+                            fprintf(stderr, "error: dictionary entry don't point to a THEADR page!\n");
+                        else
+                            *pusBlock = ausTrans[*pusBlock];
+                    }
+                }
+
+            }
+
+            /* Write the dictionary */
+            fwrite(pvRecord, 512, cBlocks, phNew);
             return (void*)0xffffffff; /* FINE */
-            break;
+        }
+
+        case COMENT:
+        {
+            cbRecord = *((unsigned short*)((int)pvRecord+1)) + 3;
+            switch (*((unsigned char*)((int)pvRecord+4)))
+            {
+                /* remove "Link Pass Separator" */
+                case 0xA2:
+                /* remove "LIBMOD" - The VAC 3.6.5 Linker don't like these! */
+                case 0xA3:
+                    fChanged = fRemoveExtra;
+                    break;
+            }
+            break;
+        }
+
+        /*
+         * Remove checksum
+         */
+        /*
+        case GRPDEF:
+        case FIXUPP:
+        case FIXUPP2:
+        case LEDATA:
+        {
+            cbRecord = *((unsigned short*)((int)pvRecord+1)) + 3;
+            *((char*)pvRecord + cbRecord - 1) = 0;
+            break;
+        }
+        */
 
         default: