Changeset 1678 for trunk/src/win32k/dev32/d32init.c

Timestamp:

Nov 10, 1999, 2:45:38 AM (26 years ago)

Author:

bird

Message:

Some bugsfixes - Yield is disabled.
Added parameters.
Correcte moduleheaders.
Introduced a new base class for virtual lx modules + some elf sketches.

File:

• trunk/src/win32k/dev32/d32init.c (modified) (9 diffs)

trunk/src/win32k/dev32/d32init.c

@@ -1 @@
-/* $Id: d32init.c,v 1.3 1999-10-31 23:57:02 bird Exp $
+/* $Id: d32init.c,v 1.4 1999-11-10 01:45:30 bird Exp $
  *
  * d32init.c - 32-bits init routines.
  *
  * Copyright (c) 1998-1999 knut st. osmundsen
+ *
+ * Project Odin Software License can be found in LICENSE.TXT
  *
  */
@@ -40 +42 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
-static int  interpretFunctionProlog(char *p);
-static int  procInit(void);
+static ULONG    readnum(const char *pszNum);
+static int      interpretFunctionProlog(char *p);
+static int      procInit(void);
 
 
@@ -70 +73 @@
 USHORT _loadds _Far32 _Pascal R0Init32(RP32INIT *pRpInit)
 {
-    char *pszTmp2;
-    char *pszTmp;
+    char   *pszTmp2;
+    char   *pszTmp;
+    ULONG   ul;
 
     pulTKSSBase32 = (PULONG)_TKSSBase16;
@@ -114 +118 @@
                 break;
 
+            case 'h':
+            case 'H': /* Heap options */
+                pszTmp2 = strpbrk(pszTmp, ":=/- ");
+                if (pszTmp2 != NULL && (int)(pszTmp2-pszTmp) < cch-1
+                    && (*pszTmp2 == ':' || *pszTmp2 == '='))
+                {
+                    ul = readnum(pszTmp2 + 1);
+                    if (ul > 0x1000UL && ul < 0x2000000UL) /* 4KB < ul < 32MB */
+                    {
+                        if (strnicmp(pszTmp, "heapm", 5) == 0)
+                            options.cbHeapMax = ul;
+                        else
+                            options.cbHeap = ul;
+                    }
+                }
+                break;
+
             case 'l':
             case 'L': /* -L[..]<:|=| >[<Y..|E..| > | <N..|D..>] */
@@ -133 +154 @@
             case 'P': /* PE */
                 pszTmp2 = strpbrk(pszTmp, ":=/- ");
-                if (pszTmp2 != NULL && (*pszTmp == ':' || *pszTmp == '='))
+                if (pszTmp2 != NULL && (int)(pszTmp2-pszTmp) < cch-1
+                    && (*pszTmp2 == ':' || *pszTmp2 == '='))
                 {
                     pszTmp++;
@@ -156 +178 @@
                 break;
 
+            case 'r':
+            case 'R': /* ResHeap options */
+                pszTmp2 = strpbrk(pszTmp, ":=/- ");
+                if (pszTmp2 != NULL && (int)(pszTmp2-pszTmp) < cch-1
+                    && (*pszTmp2 == ':' || *pszTmp2 == '='))
+                {
+                    ul = readnum(pszTmp2 + 1);
+                    if (ul > 0x1000UL && ul < 0x700000UL) /* 4KB < ul < 7MB */
+                    {
+                        if (strnicmp(pszTmp, "resheapm", 8) == 0)
+                            options.cbHeapMaxResident = ul;
+                        else
+                            options.cbHeapResident = ul;
+                    }
+                }
+                break;
+
             case 's':
-            case 'S': /* SMP kernel */
-                options.fKernel = KF_SMP;
+            case 'S': /* Sym:<filename> or Script:<Yes|No> or Smp */
+                /* SMP kernel */
+                if (pszTmp[1] == 'm' || pszTmp[1] == 'M')
+                    options.fKernel = KF_SMP;
+                else
+                {
+                    if (pszTmp[1] == 'c' || pszTmp[1] == 'C')
+                    {
+                        pszTmp2 = strpbrk(pszTmp, ":=/- ");
+                        options.fScript = pszTmp2 != NULL && (int)(pszTmp2-pszTmp) < cch-1
+                            && (*pszTmp2 == ':' || *pszTmp2 == '=')
+                            && (pszTmp2[1] == 'Y' || pszTmp2[1] == 'y');
+                    }
+                }
+                break;
+
+            case 'u':
+            case 'U': /* UNI kernel */
+                options.fKernel = KF_UNI;
                 break;
 
@@ -166 +222 @@
                 break;
 
-            case 'u':
-            case 'U': /* UNI kernel */
-                options.fKernel = KF_SMP;
-                break;
+            case 'w':
+            case 'W':
+                if (pszTmp[1] >= '0' && pszTmp[1] <= '4')
+                    options.ulInfoLevel = pszTmp[1] - '0';
+                else
+                {
+                    pszTmp2 = strpbrk(pszTmp, ":=/- ");
+                    if (pszTmp2 != NULL && (int)(pszTmp2-pszTmp) < cch-1
+                        && (*pszTmp2 == ':' || *pszTmp2 == '=')
+                        && pszTmp2[1] >= '0' && pszTmp2[1] <= '4'
+                        )
+                        options.ulInfoLevel = pszTmp2[1] - '0';
+                }
+                break;
+
         }
         pszTmp = strpbrk(pszTmp, "-/");
     }
+
+    /* heap min/max corrections */
+    if (options.cbHeap > options.cbHeapMax)
+        options.cbHeapMax = options.cbHeap;
+    if (options.cbHeapResident > options.cbHeapMaxResident)
+        options.cbHeapMaxResident = options.cbHeapResident;
 
     /* Transfer version and build number from 16-bit probkrnl.c */
@@ -179 +252 @@
     options.usVerMinor = _usVerMinor;
 
-    /* log option summary */
+    /* log option summary - FIXME */
     kprintf(("Options - Summary\n"));
     kprintf(("\tKernel: ver%d.%d  build %d  type %s\n",
@@ -217 +290 @@
 
     return STATUS_DONE;
+}
+
+
+/**
+ * Reads a number (unsigned long integer) for a string.
+ * @returns   number read, ~0UL on error / no number read.
+ * @param     pszNum  Pointer to the string containing the number.
+ * @status    competely implemented.
+ * @author    knut st. osmundsen
+ */
+static ULONG    readnum(const char *pszNum)
+{
+    ULONG ulRet = 0;
+    ULONG ulBase = 10;
+    int   i = 0;
+
+    if (*pszNum == '0')
+        if (pszNum[1] == 'x' || pszNum[1] == 'X')
+        {
+            ulBase == 16;
+            pszNum += 2;
+        }
+        else
+        {
+            ulBase == 8;
+            i = 1;
+        }
+
+    /* read digits */
+    while (ulBase == 16 ? (pszNum[i] >= '0' && pszNum[i] <= '9') || (pszNum[i] >= 'a' && pszNum[i] <= 'f') || (pszNum[i] >= 'A' && pszNum[i] <= 'F')
+           : (pszNum[i] >= '0' && pszNum[i] <= (ulBase == 10 ? '9' : '7'))
+           )
+    {
+        ulRet *= ulBase;
+        if (ulBase <= 10)
+            ulRet += pszNum[i] - '0';
+        else
+            ulRet += pszNum[i] - (pszNum[i] >= 'A' ? 'A' - 10 : (pszNum[i] >= 'a' ? 'a' + 9 : '0'));
+
+        i++;
+    }
+
+    return i > 0 ? ulRet : ~0UL;
 }