@@ -15,86 +15,84 @@
 
 #include "config.h"
 
 #include "platform.h"
 
-.intel_syntax noprefix
-
 .globl objc_msg_lookup
 .globl objc_msg_lookup_stret
 .globl objc_msg_lookup_super
 .globl objc_msg_lookup_super_stret
 
 .section .text
-.macro generate_lookup name not_found
-\name:
-	test	rdi, rdi
-	jz	short ret_nil
-
-	bt	edi, 0
-	jc	short .Ltagged_pointer_\name
-
-	mov	r8, [rdi]
-	mov	r8, [r8+64]
-
-.Lmain_\name:
-	mov	rax, [rsi]
-	movzx	ecx, ah
-	movzx	edx, al
-#ifdef OF_SELUID24
-	shr	eax, 16
-
-	mov	r8,  [r8+rax*8]
-#endif
-	mov	r8,  [r8+rcx*8]
-	mov	rax, [r8+rdx*8]
-
-	test	rax, rax
-	jz	short \not_found@PLT
-
-	ret
-
-.Ltagged_pointer_\name:
-	mov	rax, [rip+objc_tagged_pointer_secret@GOTPCREL]
-	xor	rdi, [rax]
-	and	dil, 0xE
-	movzx	r8, dil
-
-	mov	rax, [rip+objc_tagged_pointer_classes@GOTPCREL]
-	mov	r8, [rax+r8*4]
-	mov	r8, [r8+64]
-
-	jmp	short .Lmain_\name
-.type \name, %function
-.size \name, .-\name
-.endm
-
-.macro generate_lookup_super name lookup
-\name:
-	mov	r8, rdi
-	mov	rdi, [rdi]
-	test	rdi, rdi
-	jz	short ret_nil
-
-	mov	r8, [r8+8]
-	mov	r8, [r8+64]
-	jmp	short .Lmain_\lookup
-.type \name, %function
-.size \name, .-\name
-.endm
-
-generate_lookup objc_msg_lookup objc_method_not_found
-generate_lookup objc_msg_lookup_stret objc_method_not_found_stret
-generate_lookup_super objc_msg_lookup_super objc_msg_lookup
-generate_lookup_super objc_msg_lookup_super_stret objc_msg_lookup_stret
-
-ret_nil:
-	lea	rax, [rip+nil_method]
-	ret
-
-nil_method:
-	xor	rax, rax
+.macro GENERATE_LOOKUP name notFound
+\name:
+	testq	%rdi, %rdi
+	jz	returnNilMethod
+
+	testb	$1, %dil
+	jnz	.LtaggedPointer_\name
+
+	movq	(%rdi), %r8
+	movq	64(%r8), %r8
+
+.Lmain_\name:
+	movq	(%rsi), %rax
+	movzbl	%ah, %ecx
+	movzbl	%al, %edx
+#ifdef OF_SELUID24
+	shrl	$16, %eax
+
+	movq	(%r8,%rax,8), %r8
+#endif
+	movq	(%r8,%rcx,8), %r8
+	movq	(%r8,%rdx,8), %rax
+
+	testq	%rax, %rax
+	jz	\notFound@PLT
+
+	ret
+
+.LtaggedPointer_\name:
+	movq	objc_taggedPointerSecret@GOTPCREL(%rip), %rax
+	xorq	(%rax), %rdi
+	andb	$0xE, %dil
+	movzbl	%dil, %r8d
+
+	movq	objc_taggedPointerClasses@GOTPCREL(%rip), %rax
+	movq	(%rax,%r8,4), %r8
+	movq	64(%r8), %r8
+
+	jmp	.Lmain_\name
+.type \name, %function
+.size \name, .-\name
+.endm
+
+.macro GENERATE_LOOKUP_SUPER name lookup
+\name:
+	movq	%rdi, %r8
+	movq	(%rdi), %rdi
+	testq	%rdi, %rdi
+	jz	returnNilMethod
+
+	movq	8(%r8), %r8
+	movq	64(%r8), %r8
+	jmp	.Lmain_\lookup
+.type \name, %function
+.size \name, .-\name
+.endm
+
+GENERATE_LOOKUP objc_msg_lookup objc_methodNotFound
+GENERATE_LOOKUP objc_msg_lookup_stret objc_methodNotFound_stret
+GENERATE_LOOKUP_SUPER objc_msg_lookup_super objc_msg_lookup
+GENERATE_LOOKUP_SUPER objc_msg_lookup_super_stret objc_msg_lookup_stret
+
+returnNilMethod:
+	leaq	nilMethod(%rip), %rax
+	ret
+
+nilMethod:
+	xorq	%rax, %rax
 	ret
 
 #ifdef OF_LINUX
 .section .note.GNU-stack, "", %progbits
 #endif