diff options
Diffstat (limited to 'coroutine/win32')
-rw-r--r-- | coroutine/win32/Context.asm | 22 | ||||
-rw-r--r-- | coroutine/win32/Context.h | 7 |
2 files changed, 20 insertions, 9 deletions
diff --git a/coroutine/win32/Context.asm b/coroutine/win32/Context.asm index 4917faf9d7..b024b22fc7 100644 --- a/coroutine/win32/Context.asm +++ b/coroutine/win32/Context.asm @@ -14,28 +14,38 @@ ; to touch these in order to pass them to the destination coroutine. @coroutine_transfer@8 proc - ; Save caller registers + ; Save the thread information block: + push fs:[0] + push fs:[4] + push fs:[8] + + ; Save caller registers: push ebp push ebx push edi push esi - ; Save caller stack pointer + ; Save caller stack pointer: mov dword ptr [ecx], esp - ; Restore callee stack pointer + ; Restore callee stack pointer: mov esp, dword ptr [edx] - ; Restore callee stack + ; Restore callee stack: pop esi pop edi pop ebx pop ebp - ; Save the first argument as the return value + ; Restore the thread information block: + pop fs:[8] + pop fs:[4] + pop fs:[0] + + ; Save the first argument as the return value: mov eax, dword ptr ecx - ; Jump to the address on the stack + ; Jump to the address on the stack: ret @coroutine_transfer@8 endp diff --git a/coroutine/win32/Context.h b/coroutine/win32/Context.h index 8dd47696c5..ba6b1fd07b 100644 --- a/coroutine/win32/Context.h +++ b/coroutine/win32/Context.h @@ -16,6 +16,7 @@ extern "C" { #define COROUTINE __declspec(noreturn) void __fastcall +/* This doesn't include thread information block */ const size_t COROUTINE_REGISTERS = 4; struct coroutine_context @@ -40,9 +41,9 @@ static inline void coroutine_initialize( } /* Windows Thread Information Block */ - *--context->stack_pointer = 0; - *--context->stack_pointer = stack_pointer; - *--context->stack_pointer = (void*)stack_size; + *--context->stack_pointer = 0; /* fs:[0] */ + *--context->stack_pointer = stack_pointer + stack_size; /* fs:[4] */ + *--context->stack_pointer = (void*)stack_pointer; /* fs:[8] */ *--context->stack_pointer = (void*)start; |