fix objc_msgSend.*.S for win32/win64

microsoft · Jan 22, 2018 · acd3fcc · acd3fcc
1 parent 54c0c83
commit acd3fcc
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/common.S b/common.S
@@ -1,4 +1,4 @@
-#if defined(__WIN32__) || defined(__APPLE__)
+#if (defined(_WIN32) && defined(__i386__)) || defined(__APPLE__)
 #define CDECL(symbol) _##symbol
 #else
 #define CDECL(symbol) symbol

diff --git a/objc_msgSend.x86-32.S b/objc_msgSend.x86-32.S
@@ -54,7 +54,7 @@
 	push  %ecx                           # _cmd
 	push  %eax                           # &self
 	.cfi_def_cfa_offset 12
-	call  slowMsgLookup@PLT
+	call  CDECL(slowMsgLookup)@PLT
 	add   $8, %esp                       # restore the stack
 
 
@@ -65,8 +65,14 @@
 7:
 	popl  %ebx;
 8:
+#if __ELF__
+	# ELF can support GOT-relative addressing;
+	# PE/COFF and Mach-O need a text relocation.
 	addl  $_GLOBAL_OFFSET_TABLE_+(8b-7b), %ebx
 	leal  SmallObjectClasses@GOTOFF(%ebx), %eax
+#else
+	leal  CDECL(SmallObjectClasses), %eax
+#endif
 	mov   (%eax), %eax
 	popl  %ebx
 	jmp   1b 

diff --git a/objc_msgSend.x86-64.S b/objc_msgSend.x86-64.S
@@ -246,14 +246,25 @@
 	jmp   1b 
 	.cfi_endproc
 .endm
+
+#if !defined(_WIN32)
+#define REG_ARG0 %rdi
+#define REG_ARG1 %rsi
+#define REG_ARG2 %rdx
+#else
+#define REG_ARG0 %rcx
+#define REG_ARG1 %rdx
+#define REG_ARG2 %r8
+#endif
+
 .globl CDECL(objc_msgSend)
 TYPE_DIRECTIVE(CDECL(objc_msgSend), @function)
 .globl CDECL(objc_msgSend_fpret)
 TYPE_DIRECTIVE(CDECL(objc_msgSend_fpret), @function)
 CDECL(objc_msgSend_fpret):
 CDECL(objc_msgSend):
-	MSGSEND %rdi, %rsi
+	MSGSEND REG_ARG0, REG_ARG1
 .globl CDECL(objc_msgSend_stret)
 TYPE_DIRECTIVE(CDECL(objc_msgSend_stret), @function)
 CDECL(objc_msgSend_stret):
-	MSGSEND %rsi, %rdx
+	MSGSEND REG_ARG1, REG_ARG2