ObjFW  Check-in [14d5bc2bbc]

Overview
Comment:Move x86/Win32 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: 14d5bc2bbc7f6d9b77cfcb9c49c69d043dcfc1bc9f86cdfc52f846e35fd52aed
User & Date: js on 2023-10-31 22:45:13
Other Links: manifest | tags
Context
2023-10-31
23:06
Move AMD64/Mach-O assembly back to AT&T syntax check-in: 700468b00c user: js tags: trunk
22:45
Move x86/Win32 assembly back to AT&T syntax check-in: 14d5bc2bbc user: js tags: trunk
22:38
Move AMD64/Win64 assembly back to AT&T syntax check-in: ba2d42d150 user: js tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified src/forwarding/forwarding-x86-win32.S from [e2482c7f1d] to [a288f1ae82].

︙
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

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








-
-





-
-
+
+

-
-
+
+

-
-
+
+


-
-
-
+
+
+


-
+


-
-
-
-
+
+
+
+


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

-
+

-
+


-
-
-
-
+
+
+
+


-
-
-
+
+
+

-
+


-
-
-
+
+
+








-
-
+
+

-
-
+
+

-
-
+
+


-
-
-
+
+
+


-
+


-
-
-
-
+
+
+
+


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

-
+

-
+


-
-
-
-
+
+
+
+


-
-
-
+
+
+

-
+


-
-
-
+
+
+








-
-
+
+

-
-
+
+

-
-
+
+


-
-
-
+
+
+








 * 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:
	push	ebp
	mov	ebp, esp
	pushl	%ebp
	movl	%esp, %ebp

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

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

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

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

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

	mov	edx, [ebp + 8]
	mov	[esp], edx
	mov	edx, offset .Lsel_forwardingTargetForSelector_
	mov	[esp + 4], edx
	mov	edx, [ebp + 12]
	mov	[esp + 8], edx
	call	eax
	movl	8(%ebp), %edx
	movl	%edx, (%esp)
	movl	$.Lsel_forwardingTargetForSelector_, %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

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

	jmp	eax
	jmp	*%eax

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

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

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

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

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

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

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

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

	mov	edx, [ebp + 12]
	mov	[esp], edx
	mov	edx, offset .Lsel_forwardingTargetForSelector_
	mov	[esp + 4], edx
	mov	edx, [ebp + 16]
	mov	[esp + 8], edx
	call	eax
	movl	12(%ebp), %edx
	movl	%edx, (%esp)
	movl	$.Lsel_forwardingTargetForSelector_, %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

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

	jmp	eax
	jmp	*%eax

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

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

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

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

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

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

.section .ctors, "aw"
	.long .Linit

.section .rodata
.Lstr_forwardingTargetForSelector_:
︙

Modified src/runtime/lookup-asm/lookup-asm-x86-win32.S from [8858e35bdf] to [15ce3f96a4].

︙
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

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








-
-








-
-
+
+


-
+


-
-
+
+


-
+


-
-
+
+

-
-
-
-
+
+
+
+

-
+





-
-
-
+
+
+

-
-
+
+










-
-
-
+
+
+


-
-
-
+
+
+













-
+



-
+


 * 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:
	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	\notFound

	ret

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

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

	jmp	.Lmain_\name
.def \name
.scl 2
.type 32
.endef
.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
	test	%eax, %eax
	jz	.LreturnNilMethod

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

.LreturnNilMethod:
	mov	eax, offset .LnilMethod
	movl	$.LnilMethod, %eax
	ret

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

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