@@ -13,78 +13,84 @@
  * 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
-.macro generate_lookup name not_found
+.macro GENERATE_LOOKUP name notFound
 \name:
-	mov	edx, [esp+4]
-	test	edx, edx
-	jz	short ret_nil
-
-	bt	edx, 0
-	jc	short .Ltagged_pointer_\name
-
-	mov	edx, [edx]
-	mov	edx, [edx+32]
+	movl	4(%esp), %edx
+	testl	%edx, %edx
+	jz	returnNilMethod
+
+	testb	$1, %dl
+	jnz	.LtaggedPointer_\name
+
+	movl	(%edx), %edx
+	movl	32(%edx), %edx
 
 .Lmain_\name:
-	mov	eax, [esp+8]
+	movl	8(%esp), %eax
 
 #ifdef OF_SELUID24
-	movzx	ecx, byte ptr [eax+2]
-	mov	edx, [edx+ecx*4]
-#endif
-	movzx	ecx, byte ptr [eax+1]
-	mov	edx, [edx+ecx*4]
-	movzx	ecx, byte ptr [eax]
-	mov	eax, [edx+ecx*4]
-
-	test	eax, eax
-	jz	\not_found
-
-	ret
-
-.Ltagged_pointer_\name:
-	xor	edx, _objc_tagged_pointer_secret
-	and	dl, 0xE
-	movzx	edx, dl
-
-	mov	edx, [_objc_tagged_pointer_classes+edx*2]
-	mov	edx, [edx+32]
-
-	jmp	short .Lmain_\name
-.endm
-
-.macro generate_lookup_super name lookup
-\name:
-	mov	edx, [esp+4]
-	mov	eax, [edx]
-	test	eax, eax
-	jz	short ret_nil
-
-	mov	[esp+4], eax
-	mov	edx, [edx+4]
-	mov	edx, [edx+32]
-	jmp	short .Lmain_\lookup
-.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:
-	mov	eax, offset nil_method
-	ret
-
-nil_method:
-	xor	eax, eax
+	movzbl	2(%eax), %ecx
+	movl	(%edx,%ecx,4), %edx
+#endif
+	movzbl	1(%eax), %ecx
+	movl	(%edx,%ecx,4), %edx
+	movzbl	(%eax), %ecx
+	movl	(%edx,%ecx,4), %eax
+
+	testl	%eax, %eax
+	jz	\notFound
+
+	ret
+
+.LtaggedPointer_\name:
+	xorl	_objc_taggedPointerSecret, %edx
+	andb	$0xE, %dl
+	movzbl	%dl, %edx
+
+	movl	_objc_taggedPointerClasses(,%edx,2), %edx
+	movl	32(%edx), %edx
+
+	jmp	.Lmain_\name
+.def \name
+.scl 2
+.type 32
+.endef
+.endm
+
+.macro GENERATE_LOOKUP_SUPER name lookup
+\name:
+	movl	4(%esp), %edx
+	movl	(%edx), %eax
+	test	%eax, %eax
+	jz	returnNilMethod
+
+	movl	%eax, 4(%esp)
+	movl	4(%edx), %edx
+	movl	32(%edx), %edx
+	jmp	.Lmain_\lookup
+.def \name
+.scl 2
+.type 32
+.endef
+.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:
+	movl	$nilMethod, %eax
+	ret
+
+nilMethod:
+	xorl	%eax, %eax
 	ret