Changeset 9913 for trunk/src/kernel32

Timestamp:

Mar 6, 2003, 1:49:08 PM (23 years ago)

Author:

sandervl

Message:

Don't change the stack alignment if the thread has less than 128 kb stack.

Location:

trunk/src/kernel32

Files:

• exceptutil.asm (modified) (3 diffs)
• exceptutil.h (modified) (2 diffs)
• thread.cpp (modified) (2 diffs)

trunk/src/kernel32/exceptutil.asm

@@ -1 @@
-; $Id: exceptutil.asm,v 1.24 2003-02-18 11:38:30 sandervl Exp $
+; $Id: exceptutil.asm,v 1.25 2003-03-06 12:49:08 sandervl Exp $
 
 ;/*
@@ -155 +155 @@
 
 
+;;ULONG CDECL AsmCallThreadHandler(BOOL fAlignStack, ULONG handler, LPVOID parameter);
         PUBLIC  _AsmCallThreadHandler
 _AsmCallThreadHandler proc near
         push    ebp
         mov     ebp, esp
+
+;first check if we have 128kb stack or more; if not, then skip the stack alignment code
+        mov     eax, [ebp+8]
+        cmp     eax, 0
+        je      @goodthreadstack
 
 ;We're asking for problems if our stack start near a 64kb boundary
@@ -192 +198 @@
 @goodthreadstack:
 
-        push    dword ptr [ebp+12]
-        mov     eax, dword ptr [ebp+8]
+        push    dword ptr [ebp+16]
+        mov     eax, dword ptr [ebp+12]
         call    eax
 

trunk/src/kernel32/exceptutil.h

@@ -1 @@
-/* $Id: exceptutil.h,v 1.14 2002-06-02 12:42:09 sandervl Exp $ */
+/* $Id: exceptutil.h,v 1.15 2003-03-06 12:49:08 sandervl Exp $ */
 
 /*
@@ -32 +32 @@
 #endif
 
-ULONG CDECL AsmCallThreadHandler(ULONG handler, LPVOID parameter);
+ULONG CDECL AsmCallThreadHandler(BOOL fAlignStack, ULONG handler, LPVOID parameter);
 
 DWORD CDECL CallEntryPoint(DWORD entryPoint, DWORD parameter);

trunk/src/kernel32/thread.cpp

@@ -1 @@
-/* $Id: thread.cpp,v 1.51 2003-03-06 10:22:27 sandervl Exp $ */
+/* $Id: thread.cpp,v 1.52 2003-03-06 12:49:08 sandervl Exp $ */
 
 /*
@@ -348 +348 @@
     Win32DllBase::attachThreadToAllDlls();    //send DLL_THREAD_ATTACH message to all dlls
 
+    BOOL fAlignStack = ((ULONG)winteb->stack_top - (ULONG)winteb->stack_low) >= 128*1024;
+
     //Set FPU control word to 0x27F (same as in NT)
     CONTROL87(0x27F, 0xFFF);
-    rc = AsmCallThreadHandler(threadCallback, userdata);
+    rc = AsmCallThreadHandler(fAlignStack, threadCallback, userdata);
 
     if(fExitProcess) {