summaryrefslogtreecommitdiff
path: root/coroutine/win32
diff options
context:
space:
mode:
authorsamuel <samuel@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-20 10:17:39 +0000
committersamuel <samuel@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-20 10:17:39 +0000
commitd97c9280671444215da845bb71c2d624a08be4df (patch)
tree6f2a00145bf000f8cb2bf22c1a7e7ae7d7b183e3 /coroutine/win32
parent904af4aef28709933bf54e5f73761c4b1cf6169d (diff)
Better (?) support for Windows TIB.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65867 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'coroutine/win32')
-rw-r--r--coroutine/win32/Context.asm22
-rw-r--r--coroutine/win32/Context.h7
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;