Changeset 9780

Timestamp:

Feb 10, 2003, 5:05:39 PM (23 years ago)

Author:

sandervl

Message:

Touch all stack pages we skip in the out of stack workaround for 16 bits code. Jumping over the guard page causes a protection violation exception

Location:

trunk/src/kernel32

Files:

• exceptutil.asm (modified) (4 diffs)
• winexepeldr.cpp (modified) (2 diffs)

trunk/src/kernel32/exceptutil.asm

@@ -1 @@
-; $Id: exceptutil.asm,v 1.22 2003-02-05 14:04:33 sandervl Exp $
+; $Id: exceptutil.asm,v 1.23 2003-02-10 16:05:39 sandervl Exp $
 
 ;/*
@@ -161 +161 @@
 
 ;We're asking for problems if our stack start near a 64kb boundary
-;Some OS/2 thunking procedures can choke on misaligned stack addresses
+;Some OS/2 thunking procedures can choke if there's not enough stack left
         mov     eax, esp
         and     eax, 0FFFFh
@@ -167 +167 @@
         jge     @goodthreadstack
 
-        ;set ESP to the top of the next 64kb block
-        add     eax, 16
-        sub     esp, eax
+        ;set ESP to the top of the next 64kb block and touch each
+        ;page to make sure the guard page exception handler commits
+        ;those pages
+        mov     edx, esp
+        sub     edx, eax
+
+        and     esp, 0FFFFF000h
+        dec     esp
+
+@touchthreadstackpages:
+        mov     al, byte ptr [esp]
+
+        sub     esp, 1000h
+
+        cmp     esp, edx
+        jg      @touchthreadstackpages
+
+        mov     esp, edx
+        sub     esp, 16
+
 @goodthreadstack:
 
@@ -187 +204 @@
 
 ;We're asking for problems if our stack start near a 64kb boundary
-;Some OS/2 thunking procedures can choke on misaligned stack addresses
+;Some OS/2 thunking procedures can choke if there's not enough stack left
         mov     eax, esp
         and     eax, 0FFFFh
         cmp     eax, 0E000h
-        jge     @goodstack
-
-        add     eax, 1000h
-        sub     esp, eax
-@goodstack:
+        jge     @goodmainstack
+
+        ;set ESP to the top of the next 64kb block and touch each
+        ;page to make sure the guard page exception handler commits
+        ;those pages
+        mov     edx, esp
+        sub     edx, eax
+
+        and     esp, 0FFFFF000h
+        dec     esp
+
+@touchmainstackpages:
+        mov     al, byte ptr [esp]
+
+        sub     esp, 1000h
+
+        cmp     esp, edx
+        jg      @touchmainstackpages
+
+        mov     esp, edx
+        sub     esp, 16
+
+@goodmainstack:
 
         mov     eax, esp

trunk/src/kernel32/winexepeldr.cpp

@@ -1 @@
-/* $Id: winexepeldr.cpp,v 1.22 2003-01-13 16:51:40 sandervl Exp $ */
+/* $Id: winexepeldr.cpp,v 1.23 2003-02-10 16:05:39 sandervl Exp $ */
 
 /*
@@ -182 +182 @@
 ULONG Win32PeLdrExe::getDefaultStackSize()
 {
+    //Note: MUST use 128kb as a minimum. Or else the workarounds for out of
+    //      stack space in 16 bits code (thread entrypoint) might fail.
     return (oh.SizeOfStackReserve > 128*1024) ? oh.SizeOfStackReserve : 128*1024;
 }