ObjFW  Check-in [357bcde965]

Overview
Comment:Move x86/Win32 assembly back to Intel syntax

This used to be in Intel syntax, but was moved back to AT&T syntax for
consistency with the Mach-O version, where the assembler doesn't support
the Intel syntax properly. However, it makes more sense to use Intel
syntax where possible.

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 357bcde965acc2f7a5487086a59b476fc613c99b20fc802aa40ddd81852b61b8
User & Date: js on 2023-10-25 00:50:36
Other Links: manifest | tags
Context
2023-10-25
22:26
Move x86/ELF assembly back to Intel syntax check-in: a338982b3b user: js tags: trunk
00:50
Move x86/Win32 assembly back to Intel syntax check-in: 357bcde965 user: js tags: trunk
00:23
Move AMD64/Win64 assembly back to Intel syntax check-in: 70a7617023 user: js tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified src/forwarding/forwarding-x86-win32.S from [ad61e372be] to [c9c79ec3ea].

︙
11
12
13
14
15
16
17


18
19
20
21
22
23
24


25
26
27


28
29
30


31
32
33
34
35



36
37
38
39


40
41
42
43
44




45
46
47
48
49
50
51
52
53







54
55
56


57
58


59
60
61
62
63




64
65
66
67
68



69
70

71
72
73
74
75



76
77
78
79
80
81
82
83
84
85


86
87
88


89
90
91


92
93
94
95
96



97
98
99
100


101
102
103
104
105




106
107
108
109
110
111
112
113
114







115
116
117
118
119




120
121
122
123
124




125
126
127
128
129



130
131

132
133
134
135
136



137
138
139
140
141
142
143
144
145
146


147
148
149


150
151
152


153
154
155
156
157



158
159
160
161
162
163
164

11
12
13
14
15
16
17
18
19
20
21
22
23
24


25
26
27


28
29
30


31
32
33
34



35
36
37
38
39


40
41
42




43
44
45
46
47
48







49
50
51
52
53
54
55
56


57
58


59
60
61




62
63
64
65
66
67



68
69
70
71

72
73
74



75
76
77
78
79
80
81
82
83
84
85


86
87
88


89
90
91


92
93
94
95



96
97
98
99
100


101
102
103




104
105
106
107
108
109







110
111
112
113
114
115
116
117




118
119
120
121
122




123
124
125
126
127
128



129
130
131
132

133
134
135



136
137
138
139
140
141
142
143
144
145
146


147
148
149


150
151
152


153
154
155
156



157
158
159
160
161
162
163
164
165
166








+
+





-
-
+
+

-
-
+
+

-
-
+
+


-
-
-
+
+
+


-
-
+
+

-
-
-
-
+
+
+
+


-
-
-
-
-
-
-
+
+
+
+
+
+
+

-
-
+
+
-
-
+
+

-
-
-
-
+
+
+
+


-
-
-
+
+
+

-
+


-
-
-
+
+
+








-
-
+
+

-
-
+
+

-
-
+
+


-
-
-
+
+
+


-
-
+
+

-
-
-
-
+
+
+
+


-
-
-
-
-
-
-
+
+
+
+
+
+
+

-
-
-
-
+
+
+
+

-
-
-
-
+
+
+
+


-
-
-
+
+
+

-
+


-
-
-
+
+
+








-
-
+
+

-
-
+
+

-
-
+
+


-
-
-
+
+
+








 * Public License, either version 2 or 3, which can be found in the file
 * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
 * file.
 */

#include "config.h"

.intel_syntax noprefix

.globl _OFForward
.globl _OFForward_stret

.section .text
_OFForward:
	pushl	%ebp
	movl	%esp, %ebp
	push	ebp
	mov	ebp, esp

	pushl	%ebx
	subl	$20, %esp
	push	ebx
	sub	esp, 20

	movl	8(%ebp), %eax
	movl	%eax, (%esp)
	mov	eax, [ebp + 8]
	mov	[esp], eax
	call	_object_getClass

	movl	%eax, (%esp)
	movl	$sel_forwardingTargetForSelector_, %eax
	movl	%eax, 4(%esp)
	mov	[esp], eax
	mov	eax, offset sel_forwardingTargetForSelector_
	mov	[esp + 4], eax
	call	_class_respondsToSelector

	testl	%eax, %eax
	jz	0f
	test	eax, eax
	jz	short 0f

	movl	8(%ebp), %eax
	movl	%eax, (%esp)
	movl	$sel_forwardingTargetForSelector_, %eax
	movl	%eax, 4(%esp)
	mov	eax, [ebp + 8]
	mov	[esp], eax
	mov	eax, offset sel_forwardingTargetForSelector_
	mov	[esp + 4], eax
	call	_objc_msg_lookup

	movl	8(%ebp), %edx
	movl	%edx, (%esp)
	movl	$sel_forwardingTargetForSelector_, %edx
	movl	%edx, 4(%esp)
	movl	12(%ebp), %edx
	movl	%edx, 8(%esp)
	call	*%eax
	mov	edx, [ebp + 8]
	mov	[esp], edx
	mov	edx, offset sel_forwardingTargetForSelector_
	mov	[esp + 4], edx
	mov	edx, [ebp + 12]
	mov	[esp + 8], edx
	call	eax

	testl	%eax, %eax
	jz	0f
	test	eax, eax
	jz	short 0f
	cmpl	8(%ebp), %eax
	je	0f
	cmp	eax, [ebp + 8]
	je	short 0f

	movl	%eax, 8(%ebp)
	movl	%eax, (%esp)
	movl	12(%ebp), %eax
	movl	%eax, 4(%esp)
	mov	[ebp + 8], eax
	mov	[esp], eax
	mov	eax, [ebp + 12]
	mov	[esp + 4], eax
	call	_objc_msg_lookup

	addl	$20, %esp
	popl	%ebx
	popl	%ebp
	add	esp, 20
	pop	ebx
	pop	ebp

	jmp	*%eax
	jmp	eax

0:
	addl	$20, %esp
	popl	%ebx
	popl	%ebp
	add	esp, 20
	pop	ebx
	pop	ebp

	jmp	_OFMethodNotFound
.def _OFForward
.scl 2
.type 32
.endef

_OFForward_stret:
	pushl	%ebp
	movl	%esp, %ebp
	push	ebp
	mov	ebp, esp

	pushl	%ebx
	subl	$20, %esp
	push	ebx
	sub	esp, 20

	movl	12(%ebp), %eax
	movl	%eax, (%esp)
	mov	eax, [ebp + 12]
	mov	[esp], eax
	call	_object_getClass

	movl	%eax, (%esp)
	movl	$sel_forwardingTargetForSelector_, %eax
	movl	%eax, 4(%esp)
	mov	[esp], eax
	mov	eax, offset sel_forwardingTargetForSelector_
	mov	[esp + 4], eax
	call	_class_respondsToSelector

	testl	%eax, %eax
	jz	0f
	test	eax, eax
	jz	short 0f

	movl	12(%ebp), %eax
	movl	%eax, (%esp)
	movl	$sel_forwardingTargetForSelector_, %eax
	movl	%eax, 4(%esp)
	mov	eax, [ebp + 12]
	mov	[esp], eax
	mov	eax, offset sel_forwardingTargetForSelector_
	mov	[esp + 4], eax
	call	_objc_msg_lookup

	movl	12(%ebp), %edx
	movl	%edx, (%esp)
	movl	$sel_forwardingTargetForSelector_, %edx
	movl	%edx, 4(%esp)
	movl	16(%ebp), %edx
	movl	%edx, 8(%esp)
	call	*%eax
	mov	edx, [ebp + 12]
	mov	[esp], edx
	mov	edx, offset sel_forwardingTargetForSelector_
	mov	[esp + 4], edx
	mov	edx, [ebp + 16]
	mov	[esp + 8], edx
	call	eax

	testl	%eax, %eax
	jz	0f
	cmpl	12(%ebp), %eax
	je	0f
	test	eax, eax
	jz	short 0f
	cmp	eax, [ebp + 12]
	je	short 0f

	movl	%eax, 12(%ebp)
	movl	%eax, (%esp)
	movl	16(%ebp), %eax
	movl	%eax, 4(%esp)
	mov	[ebp + 12], eax
	mov	[esp], eax
	mov	eax, [ebp + 16]
	mov	[esp  + 4], eax
	call	_objc_msg_lookup_stret

	addl	$20, %esp
	popl	%ebx
	popl	%ebp
	add	esp, 20
	pop	ebx
	pop	ebp

	jmp	*%eax
	jmp	eax

0:
	addl	$20, %esp
	popl	%ebx
	popl	%ebp
	add	esp, 20
	pop	ebx
	pop	ebp

	jmp	_OFMethodNotFound_stret
.def _OFForward_stret
.scl 2
.type 32
.endef

init:
	pushl	%ebp
	movl	%esp, %ebp
	push	ebp
	mov	ebp, esp

	pushl	%ebx
	subl	$4, %esp
	push	ebx
	sub	esp, 4

	movl	$module, %eax
	movl	%eax, (%esp)
	mov	eax, offset module
	mov	[esp], eax
	call	___objc_exec_class

	addl	$4, %esp
	popl	%ebx
	popl	%ebp
	add	esp, 4
	pop	ebx
	pop	ebp
	ret

.section .ctors, "aw"
	.long init

.section .rodata
str_forwardingTargetForSelector_:
︙

Modified src/runtime/lookup-asm/lookup-asm-x86-win32.S from [bbc35eaa38] to [045420d8bf].

︙
10
11
12
13
14
15
16


17
18
19
20
21
22
23
24
25
26
27
28



29
30
31


32
33
34


35
36
37

38
39
40
41


42
43
44
45
46




47
48
49


50
51
52
53
54
55
56



57
58
59


60
61

62
63
64
65
66
67
68
69
70
71
72
73




74
75
76
77
78




79
80
81
82
83
84
85
86
87
88
89
90
91

92
93
94
95

96

10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27



28
29
30
31


32
33
34


35
36
37
38

39
40
41


42
43
44




45
46
47
48
49


50
51
52
53
54
55



56
57
58
59


60
61
62

63
64
65
66
67
68
69
70
71




72
73
74
75
76




77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92

93
94
95
96

97
98








+
+









-
-
-
+
+
+

-
-
+
+

-
-
+
+


-
+


-
-
+
+

-
-
-
-
+
+
+
+

-
-
+
+




-
-
-
+
+
+

-
-
+
+

-
+








-
-
-
-
+
+
+
+

-
-
-
-
+
+
+
+












-
+



-
+


 * Alternatively, it may be distributed under the terms of the GNU General
 * Public License, either version 2 or 3, which can be found in the file
 * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
 * 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 notFound
\name:
	movl	4(%esp), %edx
	testl	%edx, %edx
	jz	returnNilMethod
	mov	edx, [esp + 4]
	test	edx, edx
	jz	short returnNilMethod

	testb	$1, %dl
	jnz	.LtaggedPointer_\name
	test	dl, 1
	jnz	short .LtaggedPointer_\name

	movl	(%edx), %edx
	movl	32(%edx), %edx
	mov	edx, [edx]
	mov	edx, [edx + 32]

.Lmain_\name:
	movl	8(%esp), %eax
	mov	eax, [esp + 8]

#ifdef OF_SELUID24
	movzbl	2(%eax), %ecx
	movl	(%edx,%ecx,4), %edx
	movzx	ecx, byte ptr [eax + 2]
	mov	edx, [edx + 4 * ecx]
#endif
	movzbl	1(%eax), %ecx
	movl	(%edx,%ecx,4), %edx
	movzbl	(%eax), %ecx
	movl	(%edx,%ecx,4), %eax
	movzx	ecx, byte ptr [eax + 1]
	mov	edx, [edx + 4 * ecx]
	movzx	ecx, byte ptr [eax]
	mov	eax, [edx + 4 * ecx]

	testl	%eax, %eax
	jz	\notFound
	test	eax, eax
	jz	short \notFound

	ret

.LtaggedPointer_\name:
	xorl	_objc_taggedPointerSecret, %edx
	andb	$0xE, %dl
	movzbl	%dl, %edx
	xor	edx, _objc_taggedPointerSecret
	and	dl, 0xE
	movzx	edx, dl

	movl	_objc_taggedPointerClasses(,%edx,2), %edx
	movl	32(%edx), %edx
	mov	edx, [_objc_taggedPointerClasses + 2 * edx]
	mov	edx, [edx + 32]

	jmp	.Lmain_\name
	jmp	short .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
	mov	edx, [esp + 4]
	mov	eax, [edx]
	test	eax, eax
	jz	short returnNilMethod

	movl	%eax, 4(%esp)
	movl	4(%edx), %edx
	movl	32(%edx), %edx
	jmp	.Lmain_\lookup
	mov	[esp + 4], eax
	mov	edx, [edx  + 4]
	mov	edx, [edx + 32]
	jmp	short .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
	mov	eax, offset nilMethod
	ret

nilMethod:
	xorl	%eax, %eax
	xor	eax, eax
	ret

Fossil 2.23 [47362306a7] 2023-11-01 18:56:47
This page was generated in about 0.016s