ObjFW  Check-in [a338982b3b]

Overview
Comment:Move x86/ELF 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: a338982b3bd051b36efa085d4b7fe2637740dca80c83f60c07114974819d5124
User & Date: js on 2023-10-25 22:26:18
Other Links: manifest | tags
Context
2023-10-26
19:16
platform/x86/OFAtomic.h: Reduce code duplication check-in: 3751618dd1 user: js tags: trunk
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
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified src/forwarding/forwarding-x86-elf.S from [b808836991] to [4b872d6763].

︙
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

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








+
+





-
-
+
+

-
-
+
+


-
+

-
-
+
+


-
-
-
+
+
+


-
-
+
+

-
-
-
-
+
+
+
+


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

-
-
-
-
+
+
+
+

-
-
-
-
+
+
+
+


-
-
-
+
+
+

-
+


-
+

-
-
-
+
+
+

-
+




-
-
+
+

-
-
+
+


-
+

-
-
+
+


-
-
-
+
+
+


-
-
+
+

-
-
-
-
+
+
+
+


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

-
-
-
-
+
+
+
+

-
-
-
-
+
+
+
+


-
-
-
+
+
+

-
+


-
+

-
-
-
+
+
+

-
+




-
-
+
+

-
-
+
+


-
+

-
-
+
+


-
-
-
+
+
+



-
+








 * file.
 */

#include "config.h"

#include "platform.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

	call	getEIP
	addl	$_GLOBAL_OFFSET_TABLE_, %ebx
	add	ebx, offset _GLOBAL_OFFSET_TABLE_

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

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

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

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

	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
	mov	edx, [ebp + 8]
	mov	[esp], edx
	lea	edx, [ebx + sel_forwardingTargetForSelector_@GOTOFF]
	mov	[esp + 4], edx
	mov	edx, [ebp + 12]
	mov	[esp + 8], edx
	call	eax

	testl	%eax, %eax
	jz	0f
	cmpl	8(%ebp), %eax
	je	0f
	test	eax, eax
	jz	short 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@PLT

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

	jmp	*%eax
	jmp	eax

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

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

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

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

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

	call	getEIP
	addl	$_GLOBAL_OFFSET_TABLE_, %ebx
	add	ebx, offset _GLOBAL_OFFSET_TABLE_

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

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

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

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

	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
	mov	edx, [ebp + 12]
	mov	[esp], edx
	lea	edx, [ebx + sel_forwardingTargetForSelector_@GOTOFF]
	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@PLT

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

	jmp	*%eax
	jmp	eax

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

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

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

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

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

	call	getEIP
	addl	$_GLOBAL_OFFSET_TABLE_, %ebx
	add	ebx, offset _GLOBAL_OFFSET_TABLE_

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

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

getEIP:
	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 [4341f730bd] to [a240f9cb41].

︙
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

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








+
+








-
-
-
+
+
+

-
-
+
+

-
-
+
+


-
+


-
-
+
+

-
-
-
-
+
+
+
+

-
-
+
+





-
-
-
+
+
+



-
+

-
-
-
-
+
+
+
+

-
-
-
+
+
+

-
+






-
-
-
-
+
+
+
+

-
-
-
-
+
+
+
+











-
-
+
+



-
+



-
+






 * 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:
	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	0f
	test	eax, eax
	jz	short 0f

	ret

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

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

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

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

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

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

	movl	%eax, 4(%esp)
	mov	4(%edx), %edx
	mov	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_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:
	call	getEIP
	addl	$_GLOBAL_OFFSET_TABLE_, %eax
	leal	nilMethod@GOTOFF(%eax), %eax
	add	eax, offset _GLOBAL_OFFSET_TABLE_
	lea	eax, [eax + nilMethod@GOTOFF]
	ret

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

getEIP:
	movl	(%esp), %eax
	mov	eax, [esp]
	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.017s