From 622f1be099f434f89819876d1931f80c1a3e47e7 Mon Sep 17 00:00:00 2001 From: Kartik Agaram Date: Sun, 19 Jan 2020 17:36:50 -0800 Subject: 5898 - strengthen slice-empty? check Anytime we create a slice, the first check tends to be whether it's empty. If we handle ill-formed slices here where start > end, that provides a measure of safety. In the Mu translator (mu.subx) we often check for a trailing ':' or ',' and decrement slice->end to ignore it. But that could conceivably yield ill-formed slices if the slice started out empty. Now we make sure we never operate on such ill-formed slices. --- 072slice.subx | 43 ++++++++++++++++++++++++++++++++++++------- apps/assort | Bin 40055 -> 40163 bytes apps/braces | Bin 41749 -> 41857 bytes apps/calls | Bin 46459 -> 46567 bytes apps/crenshaw2-1 | Bin 39463 -> 39571 bytes apps/crenshaw2-1b | Bin 40010 -> 40118 bytes apps/dquotes | Bin 43705 -> 43813 bytes apps/factorial | Bin 38482 -> 38590 bytes apps/handle | Bin 39380 -> 39488 bytes apps/hex | Bin 42302 -> 42410 bytes apps/mu | Bin 80108 -> 80216 bytes apps/pack | Bin 52447 -> 52555 bytes apps/sigils | Bin 54134 -> 54242 bytes apps/survey | Bin 49296 -> 49404 bytes apps/tests | Bin 38853 -> 38961 bytes 15 files changed, 36 insertions(+), 7 deletions(-) diff --git a/072slice.subx b/072slice.subx index 65db1c16..f7299074 100644 --- a/072slice.subx +++ b/072slice.subx @@ -14,13 +14,13 @@ slice-empty?: # s : (addr slice) -> eax : boolean 51/push-ecx # ecx = s 8b/copy 1/mod/*+disp8 5/rm32/ebp . . . 1/r32/ecx 8/disp8 . # copy *(ebp+8) to ecx - # if (s->start == s->end) return true + # if (s->start >= s->end) return true # . eax = s->start 8b/copy 0/mod/indirect 1/rm32/ecx . . . 0/r32/eax . . # copy *ecx to eax - # . compare eax and s->end - 39/compare 1/mod/*+disp8 1/rm32/ecx . . . 0/r32/eax 4/disp8 . # compare eax and *(ecx+4) + # . if (eax >= s->end) return true + 3b/compare 1/mod/*+disp8 1/rm32/ecx . . . 0/r32/eax 4/disp8 . # compare eax with *(ecx+4) b8/copy-to-eax 1/imm32/true - 74/jump-if-= $slice-empty?:end/disp8 + 73/jump-if-addr>= $slice-empty?:end/disp8 b8/copy-to-eax 0/imm32/false $slice-empty?:end: # . restore registers @@ -63,9 +63,9 @@ test-slice-empty-false: # . prologue 55/push-ebp 89/copy 3/mod/direct 5/rm32/ebp . . . 4/r32/esp . . # copy esp to ebp - # var slice/ecx : slice = {34, 23} - 68/push 23/imm32/end - 68/push 34/imm32/start + # var slice/ecx : slice = {32, 34} + 68/push 34/imm32/end + 68/push 32/imm32/start 89/copy 3/mod/direct 1/rm32/ecx . . . 4/r32/esp . . # copy esp to ecx # slice-empty?(slice) # . . push args @@ -88,6 +88,35 @@ test-slice-empty-false: 5d/pop-to-ebp c3/return +test-slice-empty-if-start-greater-than-end: + # . prologue + 55/push-ebp + 89/copy 3/mod/direct 5/rm32/ebp . . . 4/r32/esp . . # copy esp to ebp + # var slice/ecx : slice = {34, 32} + 68/push 32/imm32/end + 68/push 34/imm32/start + 89/copy 3/mod/direct 1/rm32/ecx . . . 4/r32/esp . . # copy esp to ecx + # slice-empty?(slice) + # . . push args + 51/push-ecx + # . . call + e8/call slice-empty?/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 4/imm32 # add to esp + # check-ints-equal(eax, 1, msg) + # . . push args + 68/push "F - test-slice-empty-if-start-greater-than-end"/imm32 + 68/push 1/imm32 + 50/push-eax + # . . call + e8/call check-ints-equal/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 0xc/imm32 # add to esp + # . epilogue + 89/copy 3/mod/direct 4/rm32/esp . . . 5/r32/ebp . . # copy ebp to esp + 5d/pop-to-ebp + c3/return + slice-equal?: # s : (addr slice), p : (addr array byte) -> eax : boolean # pseudocode: # if (p == 0) return (s == 0) diff --git a/apps/assort b/apps/assort index d01f02bd..76e175d5 100755 Binary files a/apps/assort and b/apps/assort differ diff --git a/apps/braces b/apps/braces index a096d0c6..144ee6fe 100755 Binary files a/apps/braces and b/apps/braces differ diff --git a/apps/calls b/apps/calls index 05ba61ef..d8e95bcd 100755 Binary files a/apps/calls and b/apps/calls differ diff --git a/apps/crenshaw2-1 b/apps/crenshaw2-1 index 239d70e0..feef8d4b 100755 Binary files a/apps/crenshaw2-1 and b/apps/crenshaw2-1 differ diff --git a/apps/crenshaw2-1b b/apps/crenshaw2-1b index 259bda92..16591ef0 100755 Binary files a/apps/crenshaw2-1b and b/apps/crenshaw2-1b differ diff --git a/apps/dquotes b/apps/dquotes index db166f7a..9d1dabf3 100755 Binary files a/apps/dquotes and b/apps/dquotes differ diff --git a/apps/factorial b/apps/factorial index 19772bad..b9e7d7be 100755 Binary files a/apps/factorial and b/apps/factorial differ diff --git a/apps/handle b/apps/handle index d9fc3aa9..30310ff3 100755 Binary files a/apps/handle and b/apps/handle differ diff --git a/apps/hex b/apps/hex index 9c91ac4b..71615baa 100755 Binary files a/apps/hex and b/apps/hex differ diff --git a/apps/mu b/apps/mu index 23497954..a298670a 100755 Binary files a/apps/mu and b/apps/mu differ diff --git a/apps/pack b/apps/pack index fef9cef2..56575b68 100755 Binary files a/apps/pack and b/apps/pack differ diff --git a/apps/sigils b/apps/sigils index 402e3af1..7b72e401 100755 Binary files a/apps/sigils and b/apps/sigils differ diff --git a/apps/survey b/apps/survey index 386a49c7..33669c5b 100755 Binary files a/apps/survey and b/apps/survey differ diff --git a/apps/tests b/apps/tests index 729a3f9e..7941b9f0 100755 Binary files a/apps/tests and b/apps/tests differ -- cgit 1.4.1-2-gfad0 dcdb0d374c4eb6f'>c112b8f ^ 
e1c5a42 ^













4ab901c ^

a54e594 ^

e1c5a42 ^



4ab901c ^

e1c5a42 ^




d141822 ^

4ab901c ^


9013eaa ^

bc464fe ^

9013eaa ^


bc464fe ^

9013eaa ^

36bde53 ^

9013eaa ^

b00232e ^



e1c5a42 ^



d141822 ^





















bc464fe ^

9013eaa ^


bc464fe ^

4ab901c ^

5c0ce8e ^






9013eaa ^





4ab901c ^

9013eaa ^




89b30a6 ^

e1c5a42 ^

89b30a6 ^

e1c5a42 ^

4b3f359 ^

89b30a6 ^

fd7d36f ^

89b30a6 ^


e1c5a42 ^

4ab901c ^

9013eaa ^


e1c5a42 ^


fd7d36f ^

690a1c3 ^

6ed6084 ^

715c6fd ^

fd7d36f ^



690a1c3 ^


007b965 ^

690a1c3 ^




fd7d36f ^







2b3e09c ^

21b1583 ^

bc464fe ^

e1c5a42 ^

fd7d36f ^

e1c5a42 ^

fd7d36f ^

d141822 ^






e1c5a42 ^








21b1583 ^




e1c5a42 ^


21b1583 ^

bc464fe ^










4ab901c ^

bc464fe ^
















4ab901c ^

bc464fe ^










4ab901c ^

bc464fe ^







21b1583 ^



















4ab901c ^

21b1583 ^

















4ab901c ^

21b1583 ^























d141822 ^

2b3e09c ^

d141822 ^



1
2
3
4
5
6
7
8
9
10
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
167
168
169
170
171

172
173
174
175

176
177

178

179
180
181
182
183
184
185
186
187
188

189

190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205

206

207
208
209
210
211
212
213
214
215
216

217

218
219
220
221
222
223
224

225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243

244

245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261

262

263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285

286

287

288
289
290