@@ -13,78 +13,76 @@
  * file.
  */
 
 #include "config.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, __text, regular, pure_instructions
-.macro generate_lookup
+.macro GENERATE_LOOKUP
 $0:
-	test	rdi, rdi
-	jz	ret_nil
-
-	bt	edi, 0
-	jc	Ltagged_pointer_$0
-
-	mov	r8, [rdi]
-	mov	r8, [r8+64]
+	testq	%rdi, %rdi
+	jz	returnNilMethod
+
+	testb	$$1, %dil
+	jnz	LtaggedPointer_$0
+
+	movq	(%rdi), %r8
+	movq	64(%r8), %r8
 
 Lmain_$0:
-	mov	rax, [rsi]
-	movzx	ecx, ah
-	movzx	edx, al
+	movq	(%rsi), %rax
+	movzbl	%ah, %ecx
+	movzbl	%al, %edx
 #ifdef OF_SELUID24
-	shr	eax, 16
+	shrl	$$16, %eax
 
-	mov	r8, [r8+rax*8]
+	movq	(%r8,%rax,8), %r8
 #endif
-	mov	r8, [r8+rcx*8]
-	mov	rax, [r8+rdx*8]
+	movq	(%r8,%rcx,8), %r8
+	movq	(%r8,%rdx,8), %rax
 
-	test	rax, rax
+	testq	%rax, %rax
 	jz	$1
 
 	ret
 
-Ltagged_pointer_$0:
-	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]
+LtaggedPointer_$0:
+	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_$0
 .endmacro
 
-.macro generate_lookup_super
-$0:
-	mov	r8, rdi
-	mov	rdi, [rdi]
-	test	rdi, rdi
-	jz	ret_nil
-
-	mov	r8, [r8+8]
-	mov	r8, [r8+64]
+.macro GENERATE_LOOKUP_SUPER
+$0:
+	movq	%rdi, %r8
+	movq	(%rdi), %rdi
+	testq	%rdi, %rdi
+	jz	returnNilMethod
+
+	movq	8(%r8), %r8
+	movq	64(%r8), %r8
 	jmp	Lmain_$1
 .endmacro
 
-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
+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
 
-ret_nil:
-	lea	rax, [rip+nil_method]
+returnNilMethod:
+	leaq	nilMethod(%rip), %rax
 	ret
 
-nil_method:
-	mov	rax, rdi
+nilMethod:
+	xorq	%rax, %rax
 	ret