ObjFW  Check-in [2073a345ba]

Overview
Comment:Convert all x86/ELF ASM files to Intel syntax

GAS has decent support for Intel syntax these days, so there is little
reason to stick with AT&T syntax.

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 2073a345ba9058ed9f24442c441ca7b01237187dce7d9b3ae51abfd5b8e9be60
User & Date: js on 2020-06-29 23:14:11
Other Links: manifest | tags
Context
2020-06-30
00:11
Make use of @PLT in x86/ELF ASM check-in: 0b417fb86f user: js tags: trunk
2020-06-29
23:17
Merge trunk into branch "tagged-pointers" check-in: f5be211a1b user: js tags: tagged-pointers
23:14
Convert all x86/ELF ASM files to Intel syntax check-in: 2073a345ba user: js tags: trunk
22:40
Work around older Clang not supporting jmp short check-in: d301f6fcab user: js tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified src/forwarding/forwarding-x86-elf.S from [9bcb5fc324] to [2e098aafbd].

︙
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


167
168
169


170
171
172
173

174
175
176
177
178




179
180
181
182



183
184
185
186

187
188
189
190
191
192
193

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


167
168
169


170
171
172
173
174

175
176




177
178
179
180
181



182
183
184
185
186
187

188
189
190
191
192
193
194
195








+
+





-
-
+
+

-
-
+
+



-
+

-
-
-
-
+
+
+
+

-
-
-
-
-
+
+
+
+
+

-
-
+
+

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

-
-
-
-
+
+
+
+

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

-
-
-
+
+
+

-
+


-
+

-
-
-
+
+
+

-
+




-
-
+
+

-
-
+
+



-
+

-
-
-
-
+
+
+
+

-
-
-
-
-
+
+
+
+
+

-
-
+
+

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

-
-
-
-
+
+
+
+

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

-
-
-
+
+
+

-
+


-
+

-
-
-
+
+
+

-
+




-
-
+
+

-
-
+
+



-
+

-
-
-
-
+
+
+
+

-
-
-
+
+
+



-
+








 * file.
 */

#include "config.h"

#include "platform.h"

.intel_syntax noprefix

.globl of_forward
.globl of_forward_stret

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

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

	call	get_eip
0:
	addl	$_GLOBAL_OFFSET_TABLE_, %ebx
	add	ebx, offset _GLOBAL_OFFSET_TABLE_

	movl	8(%ebp), %eax
	movl	%eax, (%esp)
	movl	object_getClass@GOT(%ebx), %eax
	call	*%eax
	mov	eax, [ebp+8]
	mov	[esp], eax
	mov	eax, [ebx+object_getClass@GOT]
	call	eax

	movl	%eax, (%esp)
	leal	sel_forwardingTargetForSelector_@GOTOFF(%ebx), %eax
	movl	%eax, 4(%esp)
	movl	class_respondsToSelector@GOT(%ebx), %eax
	call	*%eax
	mov	[esp], eax
	lea	eax, [ebx+sel_forwardingTargetForSelector_@GOTOFF]
	mov	[esp+4], eax
	mov	eax, [ebx+class_respondsToSelector@GOT]
	call	eax

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

	movl	8(%ebp), %eax
	movl	%eax, (%esp)
	leal	sel_forwardingTargetForSelector_@GOTOFF(%ebx), %eax
	movl	%eax, 4(%esp)
	movl	objc_msg_lookup@GOT(%ebx), %eax
	call	*%eax

	mov	eax, [ebp+8]
	mov	[esp], eax
	lea	eax, [ebx+sel_forwardingTargetForSelector_@GOTOFF]
	mov	[esp+4], eax
	mov	eax, [ebx+objc_msg_lookup@GOT]
	call	eax

	mov	edx, [ebp+8]
	mov	[esp], edx
	movl	8(%ebp), %edx
	movl	%edx, (%esp)
	leal	sel_forwardingTargetForSelector_@GOTOFF(%ebx), %edx
	movl	%edx, 4(%esp)
	movl	12(%ebp), %edx
	movl	%edx, 8(%esp)
	call	*%eax
	lea	edx, [ebx+sel_forwardingTargetForSelector_@GOTOFF]
	mov	[esp+4], edx
	mov	edx, [ebp+12]
	mov	[esp+8], edx
	call	eax

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

	movl	%eax, 8(%ebp)
	movl	%eax, (%esp)
	movl	12(%ebp), %eax
	movl	%eax, 4(%esp)
	movl	objc_msg_lookup@GOT(%ebx), %eax
	call	*%eax
	mov	[ebp+8], eax
	mov	[esp], eax
	mov	eax, [ebp+12]
	mov	[esp+4], eax
	mov	eax, [ebx+objc_msg_lookup@GOT]
	call	eax

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

	jmp	*%eax
	jmp	eax

1:
	movl	of_method_not_found@GOT(%ebx), %eax
	mov	eax, [ebx+of_method_not_found@GOT]

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

	jmp	*%eax
	jmp	eax
.type of_forward, %function
.size of_forward, .-of_forward

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

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

	call	get_eip
0:
	addl	$_GLOBAL_OFFSET_TABLE_, %ebx
	add	ebx, offset _GLOBAL_OFFSET_TABLE_

	movl	12(%ebp), %eax
	movl	%eax, (%esp)
	movl	object_getClass@GOT(%ebx), %eax
	call	*%eax
	mov	eax, [ebp+12]
	mov	[esp], eax
	mov	eax, [ebx+object_getClass@GOT]
	call	eax

	movl	%eax, (%esp)
	leal	sel_forwardingTargetForSelector_@GOTOFF(%ebx), %eax
	movl	%eax, 4(%esp)
	movl	class_respondsToSelector@GOT(%ebx), %eax
	call	*%eax
	mov	[esp], eax
	lea	eax, [ebx+sel_forwardingTargetForSelector_@GOTOFF]
	mov	[esp+4], eax
	mov	eax, [ebx+class_respondsToSelector@GOT]
	call	eax

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

	movl	12(%ebp), %eax
	movl	%eax, (%esp)
	leal	sel_forwardingTargetForSelector_@GOTOFF(%ebx), %eax
	movl	%eax, 4(%esp)
	movl	objc_msg_lookup@GOT(%ebx), %eax
	call	*%eax

	mov	eax, [ebp+12]
	mov	[esp], eax
	lea	eax, [ebx+sel_forwardingTargetForSelector_@GOTOFF]
	mov	[esp+4], eax
	mov	eax, [ebx+objc_msg_lookup@GOT]
	call	eax

	mov	edx, [ebp+12]
	mov	[esp], edx
	movl	12(%ebp), %edx
	movl	%edx, (%esp)
	leal	sel_forwardingTargetForSelector_@GOTOFF(%ebx), %edx
	movl	%edx, 4(%esp)
	movl	16(%ebp), %edx
	movl	%edx, 8(%esp)
	call	*%eax
	lea	edx, [ebx+sel_forwardingTargetForSelector_@GOTOFF]
	mov	[esp+4], edx
	mov	edx, [ebp+16]
	mov	[esp+8], edx
	call	eax

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

	movl	%eax, 12(%ebp)
	movl	%eax, (%esp)
	movl	16(%ebp), %eax
	movl	%eax, 4(%esp)
	movl	objc_msg_lookup_stret@GOT(%ebx), %eax
	call	*%eax
	mov	[ebp+12], eax
	mov	[esp], eax
	mov	eax, [ebp+16]
	mov	[esp+4], eax
	mov	eax, [ebx+objc_msg_lookup_stret@GOT]
	call	eax

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

	jmp	*%eax
	jmp	eax

1:
	movl	of_method_not_found_stret@GOT(%ebx), %eax
	mov	eax, [ebx+of_method_not_found_stret@GOT]

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

	jmp	*%eax
	jmp	eax
.type of_forward_stret, %function
.size of_forward_stret, .-of_forward_stret

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

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

	call	get_eip
0:
	add	$_GLOBAL_OFFSET_TABLE_, %ebx
	add	ebx, offset _GLOBAL_OFFSET_TABLE_

	leal	module@GOTOFF(%ebx), %eax
	movl	%eax, (%esp)
	movl	__objc_exec_class@GOT(%ebx), %eax
	call	*%eax
	lea	eax, [ebx+module@GOTOFF]
	mov	[esp], eax
	mov	eax, [ebx+__objc_exec_class@GOT]
	call	eax

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

get_eip:
	movl	(%esp), %ebx
	mov	ebx, [esp]
	ret

#ifdef OF_SOLARIS
.section .init_array, "aw"
#else
.section .ctors, "aw", %progbits
#endif
︙

Modified src/runtime/lookup-asm/lookup-asm-x86-elf.S from [6c4a8f6d7c] to [65ed1dc5ee].

︙
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

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








+
+








-
-
-
+
+
+

-
-
+
+


-
+


-
-
+
+

-
-
-
-
+
+
+
+

-
-
+
+






-
-
-
+
+
+






-
-
-
-
+
+
+
+

-
-
-
-
+
+
+
+












-
+



-
+



-
+






 * file.
 */

#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:
	movl	4(%esp), %edx
	testl	%edx, %edx
	jz	ret_nil
	mov	edx, [esp+4]
	test	edx, edx
	jz	short ret_nil

	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+ecx*4]
#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+ecx*4]
	movzx	ecx, byte ptr [eax]
	mov	eax, [edx+ecx*4]

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

	ret

0:
	call	get_eip
1:
	addl	$_GLOBAL_OFFSET_TABLE_, %eax
	movl	\not_found@GOT(%eax), %eax
	jmp	*%eax
	add	eax, offset _GLOBAL_OFFSET_TABLE_
	mov	eax, [eax+\not_found@GOT]
	jmp	eax
.type \name, %function
.size \name, .-\name
.endm

.macro generate_lookup_super name lookup
\name:
	movl	4(%esp), %edx
	movl	(%edx), %eax
	cmpl	$0, %eax
	je	ret_nil
	mov	edx, [esp+4]
	mov	eax, [edx]
	test	eax, eax
	jz	short ret_nil

	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
.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:
	call	get_eip
0:
	addl	$nil_method-0b, %eax
	add	eax, nil_method-0b
	ret

nil_method:
	xorl	%eax, %eax
	xor	eax, eax
	ret

get_eip:
	movl	(%esp), %eax
	mov	eax, [esp]
	ret

#ifdef OF_LINUX
.section .note.GNU-stack, "", %progbits
#endif

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