Initial support for x64-mingw32

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65868 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 7 insertions, 5 deletions

diff --git a/coroutine/win32/Context.asm b/coroutine/win32/Context.asm
index b024b22fc7..22b56c0568 100644
--- a/coroutine/win32/Context.asm
+++ b/coroutine/win32/Context.asm
@@ -9,6 +9,8 @@
 
 .code
 
+assume fs:nothing
+
 ; Using fastcall is a big win (and it's the same has how x64 works).
 ; In coroutine transfer, the arguments are passed in ecx and edx. We don't need
 ; to touch these in order to pass them to the destination coroutine.
diff --git a/coroutine/win32/Context.h b/coroutine/win32/Context.h
index ba6b1fd07b..95b4ccdba1 100644
--- a/coroutine/win32/Context.h
+++ b/coroutine/win32/Context.h
@@ -24,7 +24,7 @@ struct coroutine_context
 	void **stack_pointer;
 };
 
-typedef COROUTINE(* coroutine_start)(coroutine_context *from, coroutine_context *self);
+typedef void(__fastcall * coroutine_start)(coroutine_context *from, coroutine_context *self);
 
 static inline void coroutine_initialize(
 	coroutine_context *context,
@@ -40,12 +40,12 @@ static inline void coroutine_initialize(
 		return;
 	}
 
+	*--context->stack_pointer = (void*)start;
+
 	/* Windows Thread Information Block */
 	*--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;
+	*--context->stack_pointer = (void*)stack_pointer; /* fs:[4] */
+	*--context->stack_pointer = (void*)((char *)stack_pointer - stack_size);  /* fs:[8] */
 
 	context->stack_pointer -= COROUTINE_REGISTERS;
 	memset(context->stack_pointer, 0, sizeof(void*) * COROUTINE_REGISTERS);