ObjFW  Check-in [0b417fb86f]

Overview
Comment:Make use of @PLT in x86/ELF ASM
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 0b417fb86f16499e6ee5c0db2a757a8085c07bb42edd570809e6e1f60eafc35e
User & Date: js on 2020-06-30 00:11:12
Other Links: manifest | tags
Context
2020-06-30
00:37
Minor cleanup of x86/ELF ASM check-in: b194a9a226 user: js tags: trunk
00:11
Make use of @PLT in x86/ELF ASM check-in: 0b417fb86f user: js tags: trunk
2020-06-29
23:14
Convert all x86/ELF ASM files to Intel syntax check-in: 2073a345ba user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified src/forwarding/forwarding-x86-elf.S from [2e098aafbd] to [1b2ac8ff28].

︙︙
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


	call	get_eip
0:
	add	ebx, offset _GLOBAL_OFFSET_TABLE_

	mov	eax, [ebp+8]
	mov	[esp], eax
	mov	eax, [ebx+object_getClass@GOT]
	call	eax

	mov	[esp], eax
	lea	eax, [ebx+sel_forwardingTargetForSelector_@GOTOFF]
	mov	[esp+4], eax
	mov	eax, [ebx+class_respondsToSelector@GOT]
	call	eax

	test	eax, eax
	jz	short 1f

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

	test	eax, eax
	jz	short 1f
	cmp	eax, [ebp+8]
	je	short 1f

	mov	[ebp+8], eax
	mov	[esp], eax
	mov	eax, [ebp+12]
	mov	[esp+4], eax
	mov	eax, [ebx+objc_msg_lookup@GOT]
	call	eax

	add	esp, 20
	pop	ebx
	pop	ebp

	jmp	eax









|
<




|
<








|
<


















|
<








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


	call	get_eip
0:
	add	ebx, offset _GLOBAL_OFFSET_TABLE_

	mov	eax, [ebp+8]
	mov	[esp], eax
	call	object_getClass@PLT


	mov	[esp], eax
	lea	eax, [ebx+sel_forwardingTargetForSelector_@GOTOFF]
	mov	[esp+4], eax
	call	class_respondsToSelector@PLT


	test	eax, eax
	jz	short 1f

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


	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

	test	eax, eax
	jz	short 1f
	cmp	eax, [ebp+8]
	je	short 1f

	mov	[ebp+8], eax
	mov	[esp], eax
	mov	eax, [ebp+12]
	mov	[esp+4], eax
	call	objc_msg_lookup@PLT


	add	esp, 20
	pop	ebx
	pop	ebp

	jmp	eax
︙︙
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

	push	ebp
	mov	ebp, esp

	push	ebx
	sub	esp, 20

	call	get_eip
0:
	add	ebx, offset _GLOBAL_OFFSET_TABLE_

	mov	eax, [ebp+12]
	mov	[esp], eax
	mov	eax, [ebx+object_getClass@GOT]
	call	eax

	mov	[esp], eax
	lea	eax, [ebx+sel_forwardingTargetForSelector_@GOTOFF]
	mov	[esp+4], eax
	mov	eax, [ebx+class_respondsToSelector@GOT]
	call	eax

	test	eax, eax
	jz	short 1f

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

	test	eax, eax
	jz	short 1f
	cmp	eax, [ebp+12]
	je	short 1f

	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

	add	esp, 20
	pop	ebx
	pop	ebp

	jmp	eax









<




|
<




|
<








|
<


















|
<








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

	push	ebp
	mov	ebp, esp

	push	ebx
	sub	esp, 20

	call	get_eip

	add	ebx, offset _GLOBAL_OFFSET_TABLE_

	mov	eax, [ebp+12]
	mov	[esp], eax
	call	object_getClass@PLT


	mov	[esp], eax
	lea	eax, [ebx+sel_forwardingTargetForSelector_@GOTOFF]
	mov	[esp+4], eax
	call	class_respondsToSelector@PLT


	test	eax, eax
	jz	short 1f

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


	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

	test	eax, eax
	jz	short 1f
	cmp	eax, [ebp+12]
	je	short 1f

	mov	[ebp+12], eax
	mov	[esp], eax
	mov	eax, [ebp+16]
	mov	[esp+4], eax
	call	objc_msg_lookup_stret@PLT


	add	esp, 20
	pop	ebx
	pop	ebp

	jmp	eax
︙︙
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187

	push	ebp
	mov	ebp, esp

	push	ebx
	sub	esp, 4

	call	get_eip
0:
	add	ebx, offset _GLOBAL_OFFSET_TABLE_

	lea	eax, [ebx+module@GOTOFF]
	mov	[esp], eax
	mov	eax, [ebx+__objc_exec_class@GOT]
	call	eax

	add	esp, 4
	pop	ebx
	pop	ebp
	ret

get_eip:








<




|
<








158
159
160
161
162
163
164

165
166
167
168
169

170
171
172
173
174
175
176

	push	ebp
	mov	ebp, esp

	push	ebx
	sub	esp, 4

	call	get_eip

	add	ebx, offset _GLOBAL_OFFSET_TABLE_

	lea	eax, [ebx+module@GOTOFF]
	mov	[esp], eax
	call	__objc_exec_class@PLT


	add	esp, 4
	pop	ebx
	pop	ebp
	ret

get_eip:
︙︙

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

︙︙
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65

	test	eax, eax
	jz	short 0f

	ret

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









<








51
52
53
54
55
56
57

58
59
60
61
62
63
64

	test	eax, eax
	jz	short 0f

	ret

0:
	call	get_eip

	add	eax, offset _GLOBAL_OFFSET_TABLE_
	mov	eax, [eax+\not_found@GOT]
	jmp	eax
.type \name, %function
.size \name, .-\name
.endm
︙︙
81
82
83
84
85
86
87
88

89
90
91
92
93
94
95
96
97
98
99
100
101
102

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:

	add	eax, nil_method-0b
	ret

nil_method:
	xor	eax, eax
	ret

get_eip:
	mov	eax, [esp]
	ret

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








<
>
|














80
81
82
83
84
85
86

87
88
89
90
91
92
93
94
95
96
97
98
99
100
101

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

	add	eax, offset _GLOBAL_OFFSET_TABLE_
	mov	eax, [eax+nil_method@GOT]
	ret

nil_method:
	xor	eax, eax
	ret

get_eip:
	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.018s