ObjFW  Check-in [4c866f0320]

Overview
Comment:Move x86/ELF assembly back to AT&T syntax

Support for the Intel syntax is too buggy in toolchains to be usable.

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 4c866f0320dab2f9bb8436dba4e7fac06dedef0a57b4b268e802876d3b7d192f
User & Date: js on 2023-10-31 22:27:16
Other Links: manifest | tags
Context
2023-10-31
22:38
Move AMD64/Win64 assembly back to AT&T syntax check-in: ba2d42d150 user: js tags: trunk
22:27
Move x86/ELF assembly back to AT&T syntax check-in: 4c866f0320 user: js tags: trunk
22:14
OFMatrix4x4: Add #pragma GCC target("3dnow") check-in: fa3c89f802 user: js tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified src/forwarding/forwarding-x86-elf.S from [6488f750ac] to [a38fecfc48].

︙
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
167
168
169
170



171
172
173
174

175
176
177
178
179
180
181

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
167
168
169
170
171

172
173
174
175
176
177
178
179








-
-





-
-
+
+

-
-
+
+


-
+

-
-
+
+


-
-
-
+
+
+


-
+


-
-
-
-
+
+
+
+


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

-
+

-
+


-
-
-
-
+
+
+
+


-
-
-
+
+
+

-
+


-
+

-
-
-
+
+
+

-
+




-
-
+
+

-
-
+
+


-
+

-
-
+
+


-
-
-
+
+
+


-
+


-
-
-
-
+
+
+
+


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

-
+

-
+


-
-
-
-
+
+
+
+


-
-
-
+
+
+

-
+


-
+

-
-
-
+
+
+

-
+




-
-
+
+

-
-
+
+


-
+

-
-
+
+


-
-
-
+
+
+



-
+








 * file.
 */

#include "config.h"

#include "platform.h"

.intel_syntax noprefix

.globl OFForward
.globl OFForward_stret

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

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

	call	.LgetEIP
	add	ebx, offset _GLOBAL_OFFSET_TABLE_
	addl	$_GLOBAL_OFFSET_TABLE_, %ebx

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

	mov	[esp], eax
	lea	eax, [ebx + .Lsel_forwardingTargetForSelector_@GOTOFF]
	mov	[esp + 4], eax
	movl	%eax, (%esp)
	leal	.Lsel_forwardingTargetForSelector_@GOTOFF(%ebx), %eax
	movl	%eax, 4(%esp)
	call	class_respondsToSelector@PLT

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

	mov	eax, [ebp + 8]
	mov	[esp], eax
	lea	eax, [ebx + .Lsel_forwardingTargetForSelector_@GOTOFF]
	mov	[esp + 4], eax
	movl	8(%ebp), %eax
	movl	%eax, (%esp)
	leal	.Lsel_forwardingTargetForSelector_@GOTOFF(%ebx), %eax
	movl	%eax, 4(%esp)
	call	objc_msg_lookup@PLT

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

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

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

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

	jmp	eax
	jmp	*%eax

0:
	mov	eax, [ebx + OFMethodNotFound@GOT]
	movl	OFMethodNotFound@GOT(%ebx), %eax

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

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

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

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

	call	.LgetEIP
	add	ebx, offset _GLOBAL_OFFSET_TABLE_
	addl	$_GLOBAL_OFFSET_TABLE_, %ebx

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

	mov	[esp], eax
	lea	eax, [ebx + .Lsel_forwardingTargetForSelector_@GOTOFF]
	mov	[esp + 4], eax
	movl	%eax, (%esp)
	leal	.Lsel_forwardingTargetForSelector_@GOTOFF(%ebx), %eax
	movl	%eax, 4(%esp)
	call	class_respondsToSelector@PLT

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

	mov	eax, [ebp + 12]
	mov	[esp], eax
	lea	eax, [ebx + .Lsel_forwardingTargetForSelector_@GOTOFF]
	mov	[esp + 4], eax
	movl	12(%ebp), %eax
	movl	%eax, (%esp)
	leal	.Lsel_forwardingTargetForSelector_@GOTOFF(%ebx), %eax
	movl	%eax, 4(%esp)
	call	objc_msg_lookup@PLT

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

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

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

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

	jmp	eax
	jmp	*%eax

0:
	mov	eax, [ebx + OFMethodNotFound_stret@GOT]
	movl	OFMethodNotFound_stret@GOT(%ebx), %eax

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

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

.Linit:
	push	ebp
	mov	ebp, esp
	pushl	%ebp
	movl	%esp, %ebp

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

	call	.LgetEIP
	add	ebx, offset _GLOBAL_OFFSET_TABLE_
	addl	$_GLOBAL_OFFSET_TABLE_, %ebx

	lea	eax, [ebx + .Lmodule@GOTOFF]
	mov	[esp], eax
	leal	.Lmodule@GOTOFF(%ebx), %eax
	movl	%eax, (%esp)
	call	__objc_exec_class@PLT

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

.LgetEIP:
	mov	ebx, [esp]
	movl	(%esp), %ebx
	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 [657ef9388f] to [60aff4bcff].

︙
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

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








-
-








-
-
+
+


-
+


-
-
+
+


-
+


-
-
+
+

-
-
-
-
+
+
+
+

-
+






-
-
-
+
+
+



-
+

-
-
-
-
+
+
+
+

-
-
-
+
+
+








-
-
-
+
+
+


-
-
-
+
+
+












-
-
+
+



-
+



-
+






 * 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 notFound
\name:
	mov	edx, [esp + 4]
	test	edx, edx
	movl	4(%esp), %edx
	testl	%edx, %edx
	jz	.LreturnNilMethod

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

	mov	edx, [edx]
	mov	edx, [edx + 32]
	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 + 4 * ecx]
	movzbl	2(%eax), %ecx
	movl	(%edx,%ecx,4), %edx
#endif
	movzx	ecx, byte ptr [eax + 1]
	mov	edx, [edx + 4 * ecx]
	movzx	ecx, byte ptr [eax]
	mov	eax, [edx + 4 * ecx]
	movzbl	1(%eax), %ecx
	movl	(%edx,%ecx,4), %edx
	movzbl	(%eax), %ecx
	movl	(%edx,%ecx,4), %eax

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

	ret

0:
	call	.LgetEIP
	add	eax, offset _GLOBAL_OFFSET_TABLE_
	mov	eax, [eax + \notFound@GOT]
	jmp	eax
	addl	$_GLOBAL_OFFSET_TABLE_, %eax
	movl	\notFound@GOT(%eax), %eax
	jmp	*%eax

.LtaggedPointer_\name:
	call	.LgetEIP
	add	eax, offset _GLOBAL_OFFSET_TABLE_
	addl	$_GLOBAL_OFFSET_TABLE_, %eax

	mov	ecx, [eax + objc_taggedPointerSecret@GOT]
	xor	edx, [ecx]
	and	dl, 0xE
	movzx	edx, dl
	movl	objc_taggedPointerSecret@GOT(%eax), %ecx
	xorl	(%ecx), %edx
	andb	$0xE, %dl
	movzbl	%dl, %edx

	mov	eax, [eax + objc_taggedPointerClasses@GOT]
	mov	edx, [eax + 2 * edx]
	mov	edx, [edx + 32]
	movl	objc_taggedPointerClasses@GOT(%eax), %eax
	movl	(%eax,%edx,2), %edx
	movl	32(%edx), %edx

	jmp	.Lmain_\name
.type \name, %function
.size \name, .-\name
.endm

.macro GENERATE_LOOKUP_SUPER name lookup
\name:
	mov	edx, [esp + 4]
	mov	eax, [edx]
	test	eax, eax
	movl	4(%esp), %edx
	movl	(%edx), %eax
	testl	%eax, %eax
	jz	.LreturnNilMethod

	mov	[esp + 4], eax
	mov	edx, [edx + 4]
	mov	edx, [edx + 32]
	movl	%eax, 4(%esp)
	mov	4(%edx), %edx
	mov	32(%edx), %edx
	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

.LreturnNilMethod:
	call	.LgetEIP
	add	eax, offset _GLOBAL_OFFSET_TABLE_
	lea	eax, [eax + .LnilMethod@GOTOFF]
	addl	$_GLOBAL_OFFSET_TABLE_, %eax
	leal	.LnilMethod@GOTOFF(%eax), %eax
	ret

.LnilMethod:
	xor	eax, eax
	xorl	%eax, %eax
	ret

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

#if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD)
.section .note.GNU-stack, "", %progbits
#endif

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