ObjFW  Check-in [9ccac85bb4]

Overview
Comment:Remove unnecessary PIC from x86/Win32 ASM
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 9ccac85bb4c8c3bbf423f8a897d8e0c4ecf8f4cfcd448aa79c939ab49607b24c
User & Date: js on 2020-06-30 01:08:14
Other Links: manifest | tags
Context
2020-06-30
01:53
Convert all x86/Win32 ASM to Intel syntax check-in: 2630b77909 user: js tags: trunk
01:08
Remove unnecessary PIC from x86/Win32 ASM check-in: 9ccac85bb4 user: js tags: trunk
00:37
Minor cleanup of x86/ELF ASM check-in: b194a9a226 user: js tags: trunk
Changes

Modified src/forwarding/forwarding-x86-win32.S from [2062a9ecd0] to [12b660e0de].

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







-
-
-


-
+
-


-
+

-
+
-


-
+



-
+

-
+
-



-
+






-
+

-
+





-
+
-







-
-
-
+




-
+








-
-
-


-
+
-


-
+

-
+
-


-
+



-
+

-
+
-



-
+






-
+

-
+





-
+
-







-
-
-
+




-
+








-
-
-
+

-
+
-






-
-
-
-







_of_forward:
	pushl	%ebp
	movl	%esp, %ebp

	pushl	%ebx
	subl	$20, %esp

	call	get_eip
0:

	movl	8(%ebp), %eax
	movl	%eax, (%esp)
	leal	_object_getClass-0b(%ebx), %eax
	call	_object_getClass
	call	*%eax

	movl	%eax, (%esp)
	leal	sel_forwardingTargetForSelector_-0b(%ebx), %eax
	movl	$sel_forwardingTargetForSelector_, %eax
	movl	%eax, 4(%esp)
	leal	_class_respondsToSelector-0b(%ebx), %eax
	call	_class_respondsToSelector
	call	*%eax

	testl	%eax, %eax
	jz	1f
	jz	0f

	movl	8(%ebp), %eax
	movl	%eax, (%esp)
	leal	sel_forwardingTargetForSelector_-0b(%ebx), %eax
	movl	$sel_forwardingTargetForSelector_, %eax
	movl	%eax, 4(%esp)
	leal	_objc_msg_lookup-0b(%ebx), %eax
	call	_objc_msg_lookup
	call	*%eax

	movl	8(%ebp), %edx
	movl	%edx, (%esp)
	leal	sel_forwardingTargetForSelector_-0b(%ebx), %edx
	movl	$sel_forwardingTargetForSelector_, %edx
	movl	%edx, 4(%esp)
	movl	12(%ebp), %edx
	movl	%edx, 8(%esp)
	call	*%eax

	testl	%eax, %eax
	jz	1f
	jz	0f
	cmpl	8(%ebp), %eax
	je	1f
	je	0f

	movl	%eax, 8(%ebp)
	movl	%eax, (%esp)
	movl	12(%ebp), %eax
	movl	%eax, 4(%esp)
	leal	_objc_msg_lookup-0b(%ebx), %eax
	call	_objc_msg_lookup
	call	*%eax

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

	jmp	*%eax

1:
	leal	_of_method_not_found-0b(%ebx), %eax

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

	jmp	*%eax
	jmp	_of_method_not_found

_of_forward_stret:
	pushl	%ebp
	movl	%esp, %ebp

	pushl	%ebx
	subl	$20, %esp

	call	get_eip
0:

	movl	12(%ebp), %eax
	movl	%eax, (%esp)
	leal	_object_getClass-0b(%ebx), %eax
	call	_object_getClass
	call	*%eax

	movl	%eax, (%esp)
	leal	sel_forwardingTargetForSelector_-0b(%ebx), %eax
	movl	$sel_forwardingTargetForSelector_, %eax
	movl	%eax, 4(%esp)
	leal	_class_respondsToSelector-0b(%ebx), %eax
	call	_class_respondsToSelector
	call	*%eax

	testl	%eax, %eax
	jz	1f
	jz	0f

	movl	12(%ebp), %eax
	movl	%eax, (%esp)
	leal	sel_forwardingTargetForSelector_-0b(%ebx), %eax
	movl	$sel_forwardingTargetForSelector_, %eax
	movl	%eax, 4(%esp)
	leal	_objc_msg_lookup-0b(%ebx), %eax
	call	_objc_msg_lookup
	call	*%eax

	movl	12(%ebp), %edx
	movl	%edx, (%esp)
	leal	sel_forwardingTargetForSelector_-0b(%ebx), %edx
	movl	$sel_forwardingTargetForSelector_, %edx
	movl	%edx, 4(%esp)
	movl	16(%ebp), %edx
	movl	%edx, 8(%esp)
	call	*%eax

	testl	%eax, %eax
	jz	1f
	jz	0f
	cmpl	12(%ebp), %eax
	je	1f
	je	0f

	movl	%eax, 12(%ebp)
	movl	%eax, (%esp)
	movl	16(%ebp), %eax
	movl	%eax, 4(%esp)
	leal	_objc_msg_lookup_stret-0b(%ebx), %eax
	call	_objc_msg_lookup_stret
	call	*%eax

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

	jmp	*%eax

1:
	leal	_of_method_not_found_stret-0b(%ebx), %eax

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

	jmp	*%eax
	jmp	_of_method_not_found_stret

init:
	pushl	%ebp
	movl	%esp, %ebp

	pushl	%ebx
	subl	$4, %esp

	call	get_eip
0:
	leal	module-0b(%ebx), %eax
	movl	$module, %eax
	movl	%eax, (%esp)
	leal	___objc_exec_class-0b(%ebx), %eax
	call	___objc_exec_class
	call	*%eax

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

get_eip:
	movl	(%esp), %ebx
	ret

.section .ctors, "aw"
	.long init

.section .rodata
str_forwardingTargetForSelector_:
	.asciz "forwardingTargetForSelector:"

Modified src/runtime/lookup-asm/lookup-asm-x86-win32.S from [4aa81a0136] to [59e96874a5].

46
47
48
49
50
51
52
53
54
55

56
57
58
59
60
61
62
63
46
47
48
49
50
51
52



53

54
55
56
57
58
59
60







-
-
-
+
-








	testl	%eax, %eax
	jz	0f

	ret

0:
	call	get_eip
1:
	addl	$\not_found-1b, %eax
	jmp	\not_found
	jmp	*%eax
.endm

.macro generate_lookup_super name lookup
\name:
	movl	4(%esp), %edx
	movl	(%edx), %eax
	cmpl	$0, %eax
71
72
73
74
75
76
77
78
79
80

81
82
83
84
85
86
87
88
89
68
69
70
71
72
73
74



75
76
77
78
79
80











-
-
-
+





-
-
-
-

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
	movl	$nil_method, %eax
	ret

nil_method:
	xorl	%eax, %eax
	ret

get_eip:
	movl	(%esp), %eax
	ret