Skip to content

Commit ba151d4

Browse files
committed
chore: re-read the shapes with calls followed
The longest DSP-1 exchange goes from thirteen accesses to twenty five. A routine that reached the part through a helper was being read as two routines, so the helper's accesses were recorded apart from the exchange they belong to.
1 parent 2338d3e commit ba151d4

2 files changed

Lines changed: 44 additions & 39 deletions

File tree

conformance/dsp1shapes.json

Lines changed: 43 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"why": "one of the DSP-1 family cartridges. Which of the three masks a given board carries is not determinable from a dump, and does not change the protocol: the DSP-1B corrected an arithmetic fault and left the command set alone",
5858
"bytes": 524288,
5959
"layout": "hirom",
60-
"shapes": 10,
60+
"shapes": 8,
6161
"crc32": "b363fc99",
6262
"md5": "9bc21069d1c9eba86dad2ba0e994e5a1",
6363
"sha1": "d0457fc27adff1b0ad236535f60f91711b15f0db",
@@ -333,7 +333,7 @@
333333
"why": "one of the DSP-1 family cartridges. Which of the three masks a given board carries is not determinable from a dump, and does not change the protocol: the DSP-1B corrected an arithmetic fault and left the command set alone",
334334
"bytes": 1048576,
335335
"layout": "hirom",
336-
"shapes": 15,
336+
"shapes": 16,
337337
"crc32": "b846b00d",
338338
"md5": "81cee1957fa875efbedaff130848ba9e",
339339
"sha1": "d110e337a49f6a635236c9bf485759e48411cb69",
@@ -345,7 +345,7 @@
345345
"why": "one of the DSP-1 family cartridges. Which of the three masks a given board carries is not determinable from a dump, and does not change the protocol: the DSP-1B corrected an arithmetic fault and left the command set alone",
346346
"bytes": 1048576,
347347
"layout": "hirom",
348-
"shapes": 6,
348+
"shapes": 5,
349349
"crc32": "54740b9b",
350350
"md5": "9f749083058a08a63cc026542dc3a904",
351351
"sha1": "90a418a1d0a65c32ea8945c6496602f0d11514a5",
@@ -358,11 +358,6 @@
358358
"seen": 1,
359359
"cartridges": 1
360360
},
361-
{
362-
"shape": "write1 write2 write2 write2 write2 poll1 write1 write2 write2 write2 read2 read2 read2",
363-
"seen": 4,
364-
"cartridges": 4
365-
},
366361
{
367362
"shape": "write1 write2 write2 write2 write2 write2 write2 write2 poll2 read2 read2 read2 read2",
368363
"seen": 4,
@@ -388,6 +383,11 @@
388383
"seen": 4,
389384
"cartridges": 4
390385
},
386+
{
387+
"shape": "poll1 write1 write2 write2 write2 read2 read2 read2",
388+
"seen": 4,
389+
"cartridges": 4
390+
},
391391
{
392392
"shape": "write1 write2 write2 write2 poll1 read2 read2",
393393
"seen": 4,
@@ -414,50 +414,40 @@
414414
"cartridges": 4
415415
},
416416
{
417-
"shape": "poll1 read1 read1 read1 read1 poll1",
418-
"seen": 2,
417+
"shape": "write1 write2 write2 poll2 read2 read2",
418+
"seen": 3,
419419
"cartridges": 2
420420
},
421421
{
422-
"shape": "write1 write2 write2 poll2 read2 read2",
422+
"shape": "poll1 read1 read1 read1 read1 poll1",
423423
"seen": 2,
424-
"cartridges": 1
424+
"cartridges": 2
425425
},
426426
{
427427
"shape": "write1 write2 write2 write2 poll2 read2",
428428
"seen": 2,
429429
"cartridges": 1
430430
},
431431
{
432-
"shape": "write1 write2 write2 read2 read2",
433-
"seen": 5,
434-
"cartridges": 5
432+
"shape": "write1 write2 write2 write2 write2",
433+
"seen": 8,
434+
"cartridges": 4
435435
},
436436
{
437437
"shape": "poll1 write1 write2 write2 write2",
438438
"seen": 4,
439439
"cartridges": 4
440440
},
441441
{
442-
"shape": "write1 write2 write2 write2 write2",
442+
"shape": "write1 write2 write2 read2 read2",
443443
"seen": 4,
444444
"cartridges": 4
445445
},
446-
{
447-
"shape": "write1 poll2 read2 read2 read2",
448-
"seen": 2,
449-
"cartridges": 1
450-
},
451446
{
452447
"shape": "poll1 read1 read1 read1 read1",
453448
"seen": 1,
454449
"cartridges": 1
455450
},
456-
{
457-
"shape": "write1 write2 write2 read2",
458-
"seen": 16,
459-
"cartridges": 9
460-
},
461451
{
462452
"shape": "write1 write2 write2 write2",
463453
"seen": 16,
@@ -468,6 +458,11 @@
468458
"seen": 12,
469459
"cartridges": 3
470460
},
461+
{
462+
"shape": "write1 write2 write2 read2",
463+
"seen": 12,
464+
"cartridges": 5
465+
},
471466
{
472467
"shape": "poll1 read1 read1 read1",
473468
"seen": 8,
@@ -478,6 +473,11 @@
478473
"seen": 6,
479474
"cartridges": 3
480475
},
476+
{
477+
"shape": "poll1 read1 poll1 read1",
478+
"seen": 1,
479+
"cartridges": 1
480+
},
481481
{
482482
"shape": "write1 poll1 read1 read1",
483483
"seen": 1,
@@ -505,26 +505,31 @@
505505
},
506506
{
507507
"shape": "write1 poll1 poll1",
508-
"seen": 5,
509-
"cartridges": 2
508+
"seen": 4,
509+
"cartridges": 1
510+
},
511+
{
512+
"shape": "write1 write1 read1",
513+
"seen": 4,
514+
"cartridges": 4
510515
},
511516
{
512517
"shape": "poll1 poll1 poll1",
513518
"seen": 3,
514519
"cartridges": 3
515520
},
516521
{
517-
"shape": "write1 read1 read1",
522+
"shape": "read1 poll1 read1",
518523
"seen": 3,
519524
"cartridges": 3
520525
},
521526
{
522-
"shape": "read1 poll1 poll1",
523-
"seen": 2,
524-
"cartridges": 2
527+
"shape": "write1 read1 read1",
528+
"seen": 3,
529+
"cartridges": 3
525530
},
526531
{
527-
"shape": "read1 poll1 read1",
532+
"shape": "read1 poll1 poll1",
528533
"seen": 2,
529534
"cartridges": 2
530535
},
@@ -545,8 +550,8 @@
545550
},
546551
{
547552
"shape": "write1 poll1",
548-
"seen": 19,
549-
"cartridges": 14
553+
"seen": 16,
554+
"cartridges": 12
550555
},
551556
{
552557
"shape": "poll1 poll1",
@@ -590,17 +595,17 @@
590595
},
591596
{
592597
"shape": "write1",
593-
"seen": 659,
598+
"seen": 669,
594599
"cartridges": 29
595600
},
596601
{
597602
"shape": "poll1",
598-
"seen": 237,
603+
"seen": 238,
599604
"cartridges": 29
600605
},
601606
{
602607
"shape": "read1",
603-
"seen": 221,
608+
"seen": 223,
604609
"cartridges": 29
605610
}
606611
]

0 commit comments

Comments
 (0)