Ignore:
Timestamp:
Aug 21, 2021, 5:39:14 PM (3 years ago)
Author:
Andrew Beach <ajbeach@…>
Branches:
ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, pthread-emulation, qualifiedEnum
Children:
7372065
Parents:
1a6a6f2 (diff), e56eabac (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into 'andrew-mmath', collecting Peter's updates.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • doc/theses/andrew_beach_MMath/resumption-marking.fig

    r1a6a6f2 rd8f8d08  
    88-2
    991200 2
    10 6 5985 1530 6165 3105
    11 1 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 6075 1620 90 90 6075 1620 6075 1710
    12 1 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 6075 2340 90 90 6075 2340 6075 2430
    13 1 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 6075 3015 90 90 6075 3015 6075 3105
    14 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
    15         1 1 1.00 60.00 120.00
    16          6075 1755 6075 2205
    17 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
    18         1 1 1.00 60.00 120.00
    19          6075 2475 6075 2925
    20 -6
    21 6 3465 1530 3645 3105
    22 1 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 3555 1620 90 90 3555 1620 3555 1710
    23 1 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 3555 2340 90 90 3555 2340 3555 2430
    24 1 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 3555 3015 90 90 3555 3015 3555 3105
    25 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
    26         1 1 1.00 60.00 120.00
    27          3555 1755 3555 2205
    28 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
    29         1 1 1.00 60.00 120.00
    30          3555 2475 3555 2925
    31 -6
    32 6 2115 1530 2295 3105
    33 1 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 2205 1620 90 90 2205 1620 2205 1710
    34 1 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 2205 2340 90 90 2205 2340 2205 2430
    35 1 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 2205 3015 90 90 2205 3015 2205 3105
    36 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
    37         1 1 1.00 60.00 120.00
    38          2205 1755 2205 2205
    39 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
    40         1 1 1.00 60.00 120.00
    41          2205 2475 2205 2925
    42 -6
    43101 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 4905 1620 90 90 4905 1620 4905 1710
    44 1 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 4905 3015 90 90 4905 3015 4905 3105
    45111 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 4905 945 90 90 4905 945 4905 1035
    46121 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 4905 2340 90 90 4905 2340 4905 2430
    47 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
    48         1 1 1.00 60.00 120.00
    49          2790 1620 2430 1620
    50 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
    51         1 1 1.00 60.00 120.00
    52          4095 2340 3735 2340
    53 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
    54         1 1 1.00 60.00 120.00
    55          6660 1620 6300 1620
    56 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
    57         1 1 1.00 60.00 120.00
    58          5490 945 5130 945
     131 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 1665 1620 90 90 1665 1620 1665 1710
     141 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 1665 2340 90 90 1665 2340 1665 2430
     151 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 1665 3060 90 90 1665 3060 1665 3150
     161 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 3195 1620 90 90 3195 1620 3195 1710
     171 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 3195 2340 90 90 3195 2340 3195 2430
     181 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 3195 3060 90 90 3195 3060 3195 3150
     191 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 6525 1620 90 90 6525 1620 6525 1710
     201 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 6525 2340 90 90 6525 2340 6525 2430
     211 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 4905 3060 90 90 4905 3060 4905 3150
     221 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 6525 3060 90 90 6525 3060 6525 3150
    59232 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
    6024        1 1 1.00 60.00 120.00
     
    6630        1 1 1.00 60.00 120.00
    6731         4770 1080 4590 1260 4590 2070 4770 2250
    68 4 0 0 50 -1 0 12 0.0000 4 135 1170 1980 3375 Initial State\001
    69 4 0 0 50 -1 0 12 0.0000 4 135 1170 3420 3375 Found Handler\001
    70 4 0 0 50 -1 0 12 0.0000 4 165 810 4770 3375 Try block\001
    71 4 0 0 50 -1 0 12 0.0000 4 135 900 4770 3555 in Handler\001
    72 4 0 0 50 -1 0 12 0.0000 4 165 1530 5940 3375 Handling Complete\001
     322 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
     33        1 1 1.00 60.00 120.00
     34         2205 1620 1845 1620
     352 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
     36        1 1 1.00 60.00 120.00
     37         3735 2340 3375 2340
     382 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
     39        1 1 1.00 60.00 120.00
     40         5445 945 5085 945
     412 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
     42        1 1 1.00 60.00 120.00
     43         7065 1620 6705 1620
     442 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
     45        1 1 1.00 60.00 120.00
     46         1665 1755 1665 2205
     472 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
     48        1 1 1.00 60.00 120.00
     49         1665 2475 1665 2925
     502 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
     51        1 1 1.00 60.00 120.00
     52         3195 1755 3195 2205
     532 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
     54        1 1 1.00 60.00 120.00
     55         3195 2475 3195 2925
     562 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
     57        1 1 1.00 60.00 120.00
     58         6525 1755 6525 2205
     592 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
     60        1 1 1.00 60.00 120.00
     61         6525 2475 6525 2925
     624 1 0 50 -1 0 12 0.0000 0 135 945 1665 3375 Initial State\001
     634 1 0 50 -1 0 12 0.0000 0 135 1215 3195 3375 Found Handler\001
     644 1 0 50 -1 0 12 0.0000 0 180 1605 6570 3375 Handling Complete\001
     654 0 0 50 -1 0 12 0.0000 0 135 390 3825 2385 head\001
     664 0 0 50 -1 0 12 0.0000 0 135 390 5535 990 head\001
     674 0 0 50 -1 0 12 0.0000 0 135 390 7155 1665 head\001
     684 2 0 50 -1 0 12 0.0000 0 135 690 1485 2385 handlers\001
     694 1 0 50 -1 0 12 0.0000 0 135 855 4905 3375 Handler in\001
     704 1 0 50 -1 0 12 0.0000 0 180 795 4905 3600 Try block\001
     714 0 0 50 -1 0 12 0.0000 0 135 390 2295 1665 head\001
     724 0 0 50 -1 0 12 0.0000 0 135 390 2295 1395 head\001
Note: See TracChangeset for help on using the changeset viewer.