From 509f0a12ca3d2061b1555ded31dead23f00ed854 Mon Sep 17 00:00:00 2001 From: Kartik Agaram Date: Mon, 14 Jan 2019 17:06:10 -0800 Subject: 4926 --- subx/071hex.subx | 74 ++++++++++++++++++++++++++++++++++++++++++++++--- subx/apps/crenshaw2-1 | Bin 13641 -> 13826 bytes subx/apps/crenshaw2-1b | Bin 14200 -> 14385 bytes subx/apps/factorial | Bin 12559 -> 12744 bytes subx/apps/handle | Bin 13352 -> 13537 bytes subx/apps/hex | Bin 16620 -> 16805 bytes 6 files changed, 70 insertions(+), 4 deletions(-) (limited to 'subx') diff --git a/subx/071hex.subx b/subx/071hex.subx index 173c3dad..8c46ac49 100644 --- a/subx/071hex.subx +++ b/subx/071hex.subx @@ -410,6 +410,64 @@ test-parse-hex-int-0x-prefix: 5d/pop-to-EBP c3/return +test-parse-hex-int-zero: + # . prolog + 55/push-EBP + 89/copy 3/mod/direct 5/rm32/EBP . . . 4/r32/ESP . . # copy ESP to EBP + # var slice/ECX = "0" + 68/push _test-slice-hex-int-zero-end/imm32 + 68/push _test-slice-hex-int-zero/imm32 + 89/copy 3/mod/direct 1/rm32/ECX . . . 4/r32/ESP . . # copy ESP to ECX + # EAX = parse-hex-int(slice) + # . . push args + 51/push-ECX + # . . call + e8/call parse-hex-int/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 4/imm32 # add to ESP + # check-ints-equal(EAX, 0x34a, msg) + # . . push args + 68/push "F - test-parse-hex-int-zero"/imm32 + 68/push 0/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 + # . epilog + 89/copy 3/mod/direct 4/rm32/ESP . . . 5/r32/EBP . . # copy EBP to ESP + 5d/pop-to-EBP + c3/return + +test-parse-hex-int-0-prefix: + # . prolog + 55/push-EBP + 89/copy 3/mod/direct 5/rm32/EBP . . . 4/r32/ESP . . # copy ESP to EBP + # var slice/ECX = "03" + 68/push _test-slice-hex-int-with-0-prefix-end/imm32 + 68/push _test-slice-hex-int-with-0-prefix/imm32 + 89/copy 3/mod/direct 1/rm32/ECX . . . 4/r32/ESP . . # copy ESP to ECX + # EAX = parse-hex-int(slice) + # . . push args + 51/push-ECX + # . . call + e8/call parse-hex-int/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 4/imm32 # add to ESP + # check-ints-equal(EAX, 0x3, msg) + # . . push args + 68/push "F - test-parse-hex-int-0-prefix"/imm32 + 68/push 0x3/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 + # . epilog + 89/copy 3/mod/direct 4/rm32/ESP . . . 5/r32/EBP . . # copy EBP to ESP + 5d/pop-to-EBP + c3/return + is-hex-digit?: # c : byte -> bool/EAX # . prolog 55/push-EBP @@ -591,10 +649,6 @@ _test-slice-hex-int: 33/3 34/4 _test-slice-hex-int-end: -_test-slice-hex-int-with-0x-prefix: - 30/0 78/x 33/3 34/4 -_test-slice-hex-int-with-0x-prefix-end: - _test-slice-hex-int-letters: 33/3 34/4 61/a _test-slice-hex-int-letters-end: @@ -611,4 +665,16 @@ _test-slice-digits-and-char: 33/3 34/4 71/q _test-slice-digits-and-char-end: +_test-slice-hex-int-with-0x-prefix: + 30/0 78/x 33/3 34/4 +_test-slice-hex-int-with-0x-prefix-end: + +_test-slice-hex-int-zero: + 30/0 +_test-slice-hex-int-zero-end: + +_test-slice-hex-int-with-0-prefix: + 30/0 33/3 +_test-slice-hex-int-with-0-prefix-end: + # . . vim:nowrap:textwidth=0 diff --git a/subx/apps/crenshaw2-1 b/subx/apps/crenshaw2-1 index 13b71386..525d4983 100755 Binary files a/subx/apps/crenshaw2-1 and b/subx/apps/crenshaw2-1 differ diff --git a/subx/apps/crenshaw2-1b b/subx/apps/crenshaw2-1b index a6bc19cf..2b040406 100755 Binary files a/subx/apps/crenshaw2-1b and b/subx/apps/crenshaw2-1b differ diff --git a/subx/apps/factorial b/subx/apps/factorial index bad6fe72..924ce4bc 100755 Binary files a/subx/apps/factorial and b/subx/apps/factorial differ diff --git a/subx/apps/handle b/subx/apps/handle index 76c7950a..5cbed69e 100755 Binary files a/subx/apps/handle and b/subx/apps/handle differ diff --git a/subx/apps/hex b/subx/apps/hex index bfbba407..2cca804f 100755 Binary files a/subx/apps/hex and b/subx/apps/hex differ -- cgit 1.4.1-2-gfad0 '>74f8cd1
16d949e ^
74f8cd1


b972916 ^
a901203 ^


74f8cd1
d0111f1 ^
16d949e ^




74f8cd1



74f8cd1






74f8cd1

















1e63a57 ^

b972916 ^



d0111f1 ^
16d949e ^




1e63a57 ^



74f8cd1





















































































































74f8cd1













































74f8cd1































74f8cd1






1e63a57 ^

74f8cd1

1e63a57 ^


74f8cd1

1e63a57 ^
74f8cd1

























74f8cd1








74f8cd1



74f8cd1


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
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445