Changeset 1133 for Whitix

Timestamp:

10/14/08 19:37:36 (1 month ago)

Author:

mwhitworth

Message:

Allocate a large stack (32MB, which most apps will never use) to user applications. Fill the top 128KB with arguments.

Files:

• Whitix/branches/keobject/fs/vfs/load.c (modified) (5 diffs)

Whitix/branches/keobject/fs/vfs/load.c

@@ -34 +34 @@
  */
 
+#define NUM_ARG_PAGES           32
+#define STACK_SIZE                      32 /* megabytes */
+#define LOAD_STACK_SIZE         STACK_SIZE*1024*1024
+
 struct ExecArgs
 {
@@ -45 +49 @@
         DWORD entryPoint,stackPos;
         DWORD* stackP;
-        DWORD argPages[32];
+        DWORD argPages[NUM_ARG_PAGES];
 };
 
@@ -261 +265 @@
  ***********************************************************************/
 
-#define ARG_MAX_PAGES 32 /* Good number of arguments. */
-
 static int ExecCopyArgs(struct ExecArgs* args)
 {
         int argCount;
         
-        argCount=ExecCountArgs(args->argv, PAGE_SIZE*ARG_MAX_PAGES);
+        argCount=ExecCountArgs(args->argv, PAGE_SIZE*NUM_ARG_PAGES);
         if (argCount < 0)
                 return argCount;
@@ -336 +338 @@
         execArgs->argc=0;
 
-        ZeroMemory(execArgs->argPages, sizeof(DWORD)*32);
+        ZeroMemory(execArgs->argPages, sizeof(DWORD)*NUM_ARG_PAGES);
         execArgs->stackPos=0;
 }
@@ -427 +429 @@
 SYMBOL_EXPORT(Exec);
 
-#define ARG_PAGES 30 /* 30 pages is a good enough size for a stack */
-
 static int ExecAllocateStack(struct ExecArgs* args)
 {
-        if (!MMapDo(args->process, NULL, ARCH_STACK_TOP-(ARG_PAGES*PAGE_SIZE), ARG_PAGES*PAGE_SIZE, PAGE_RW | PAGE_PRESENT | PAGE_USER, 0, 
+        if (!MMapDo(args->process, NULL, ARCH_STACK_TOP - LOAD_STACK_SIZE,
+                LOAD_STACK_SIZE, PAGE_RW | PAGE_PRESENT | PAGE_USER, 0, 
                         MMAP_PRIVATE | MMAP_FIXED, NULL))
                 return -EFAULT;