projects / fleet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c3291d4)
everything works, better sizing
authorAdam Megacz <adam.megacz@sun.com>
Tue, 21 Jul 2009 20:20:19 +0000 (20:20 +0000)
committerAdam Megacz <adam.megacz@sun.com>
Tue, 21 Jul 2009 20:20:19 +0000 (20:20 +0000)
electric/omegaCounter.jelib patch | blob | history

diff --git a/electric/omegaCounter.jelib b/electric/omegaCounter.jelib
index 84dea33..59c7ab7 100644 (file)
--- a/electric/omegaCounter.jelib
+++ b/electric/omegaCounter.jelib
@@ -79,6 +79,78 @@ Ein||D5G2;|conn@1|a|I
 Eout||D5G2;|conn@0|y|O
 X
 
+# Cell fire;4{ic}
+Cfire;4{ic}||artwork|1247529105994|1248207089131|E|ATTR_X(D5G1;HNOLPX-6.5;Y3.5;)S20
+Ngeneric:Facet-Center|art@0||0|0||||AV
+NThick-Circle|art@4||2|0.5|1|1|R||ART_color()I10
+NThick-Circle|art@11||2|-2|4|4|||ART_color()I10|ART_degrees()F[0.0,3.1415927]
+NThick-Circle|art@12||-2|1|8|7|||ART_color()I10|ART_degrees()F[0.0,1.0471976]
+NThick-Circle|art@13||0|-1.25|6|6|500||ART_color()I10|ART_degrees()I800
+NThick-Circle|art@14||0|4.5|1|1|R||ART_color()I10
+NThick-Circle|art@15||2|1|8|7|YRR||ART_color()I10|ART_degrees()F[0.0,1.0471976]
+NThick-Circle|art@18||-1.25|-3|1|1|R||ART_color()I10
+NThick-Circle|art@19||-0.25|-3|8|7|YRR||ART_color()I10|ART_degrees()F[0.0,1.0471976]
+NThick-Circle|art@20||-4.25|-3|8|7|||ART_color()I10|ART_degrees()F[0.0,1.0471976]
+NThick-Circle|art@21||-2.25|-5.25|6|6|500||ART_color()I10|ART_degrees()I800
+NThick-Circle|art@22||-3.25|-3|1|1|R||ART_color()I10
+NThick-Circle|art@23||-2.25|0.5|1|1|R||ART_color()I10
+Nschematic:Bus_Pin|pin@4||-1.25|-4||||
+Nschematic:Bus_Pin|pin@6||-3.25|-4||||
+Nschematic:Bus_Pin|pin@10||0.5|-4|||X|
+Nschematic:Bus_Pin|pin@16||0|5|||R|
+Nschematic:Bus_Pin|pin@40||3.5|-4||||
+Nschematic:Wire_Pin|pin@41||3.5|-4||||
+Nschematic:Bus_Pin|pin@46||0|5|-2|-2|R|
+Nschematic:Bus_Pin|pin@54||0|4|-2|-2|R|
+Nschematic:Bus_Pin|pin@57||3.5|-4|-2|-2|R|
+NPin|pin@58||3.5|-3|1|1|R|
+NPin|pin@59||3.5|-4|||R|
+Nschematic:Bus_Pin|pin@60||2|-4|-2|-2|R|
+NPin|pin@62||2|-4|||R|
+NPin|pin@63||2|-3|1|1|R|
+NPin|pin@66||0.5|-3|1|1|R|
+NPin|pin@67||0.5|-4|||R|
+Nschematic:Wire_Pin|pin@68||2|-4||||
+NPin|pin@72||2.75|-3|1|1|R|
+NPin|pin@73||4|-1.75|1|1|R|
+NPin|pin@74||4|-2|1|1|R|
+NPin|pin@75||4|-3|1|1|R|
+NPin|pin@76||0|-3|1|1|R|
+NPin|pin@79||0|-2|1|1|R|
+Nschematic:Bus_Pin|pin@82||2|0|-2|-2|R|
+Nschematic:Bus_Pin|pin@85||0|0|-2|-2|R|
+Nschematic:Bus_Pin|pin@86||0|4|-2|-2|R|
+NPin|pin@89||1.25|1.5|1|1|R|
+NPin|pin@90||1.75|2|1|1|R|
+NPin|pin@91||-3.25|-3.5|1|1|R|
+NPin|pin@92||-3.25|-4|||R|
+Nschematic:Bus_Pin|pin@93||-1|-2|-2|-2|R|
+Nschematic:Bus_Pin|pin@99||-5.5|-3.5|-2|-2|R|
+Nschematic:Bus_Pin|pin@100||-3|-2|-2|-2|R|
+NPin|pin@102||-1.25|-4|||R|
+NPin|pin@103||-1.25|-3.5|1|1|R|
+NPin|pin@104||-1.25|-2.5|1|1|R|
+NPin|pin@105||-0.5|-1.75|1|1|R|
+Aschematic:wire|net@15|||2700|pin@41||3.5|-4|pin@40||3.5|-4
+AThicker|net@23|||FS900|pin@58||3.5|-3|pin@59||3.5|-4|ART_color()I10
+AThicker|net@24|||FS900|pin@63||2|-3|pin@62||2|-4|ART_color()I10
+AThicker|net@26|||FS900|pin@66||0.5|-3|pin@67||0.5|-4|ART_color()I10
+AThicker|net@28|||FS900|pin@74||4|-2|pin@75||4|-3|ART_color()I10
+AThicker|net@29|||FS0|pin@75||4|-3|pin@76||0|-3|ART_color()I10
+AThicker|net@30|||FS900|pin@79||0|-2|pin@76||0|-3|ART_color()I10
+AThicker|net@32|||FS450|pin@73||4|-1.75|pin@72||2.75|-3|ART_color()I10
+AThicker|net@35|||FS450|pin@90||1.75|2|pin@89||1.25|1.5|ART_color()I10
+AThicker|net@36|||FS900|pin@91||-3.25|-3.5|pin@92||-3.25|-4|ART_color()I10
+AThicker|net@40|||FS900|pin@103||-1.25|-3.5|pin@102||-1.25|-4|ART_color()I10
+AThicker|net@42|||FS450|pin@105||-0.5|-1.75|pin@104||-1.25|-2.5|ART_color()I10
+ELSN[ZeroOrDone]||D5G1;RY-4.5;|pin@68||I
+ELSN[ZeroOrTwo]||D5G1;RY-4;|pin@10||I
+EMSN[ZeroOrDone]||D4G1;R|pin@4||I
+EMSN[ZeroOrTwo]||D4G1;R|pin@6||I
+EdisableLO||D5G1;RY-2.5;|pin@40||I
+EfireHI||D5G1;RX1.5;|pin@16||O
+X
+
 # Cell fire;3{ic}
 Cfire;3{ic}||artwork|1247529105994|1248131451191|E|ATTR_X(D5G1;HNOLP)S20
 Ngeneric:Facet-Center|art@0||0|0||||AV
@@ -313,7 +385,7 @@ Efire[1]|fireHI|D5G1;RX1.5;|pin@16||O
 X
 
 # Cell fire;1{sch}
-Cfire;1{sch}||schematic|1247526811643|1248158992362||ATTR_X(D5G1;HNOLPX-57;Y31.5;)S20
+Cfire;1{sch}||schematic|1247526811643|1248206598953||ATTR_X(D5G1;HNOLPX-57;Y31.5;)S20
 IredFive:PMOS;1{ic}|PMOS@2||-16.5|21|RR||D5G4;|ATTR_X(D5G1.5;NOLPX-1.5;Y-3.5;)S2*@X
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@2||-41|8|||XYRR|
@@ -322,6 +394,7 @@ NOff-Page|conn@4||20|8|||YRR|
 NOff-Page|conn@5||20|12|||RR|
 NOff-Page|conn@8||-22|-18.5|||RRR|
 NOff-Page|conn@14||-1.5|-19|||YRRR|
+Ifire;4{ic}|fire@0||-42.75|50|||D5G4;|ATTR_X(D5G1;NOLPX-6;Y3.25;)S20
 Ifire;1{ic}|fireIvan@0||-80.5|50|||D5G4;
 Ifire;2{ic}|fireIvan@1||-69.5|48.5|||D5G4;
 Ifire;3{ic}|fireIvan@2||-56.5|48.5|||D5G4;
@@ -630,22 +703,22 @@ Edisable|disableLO|D5G2;X-2;Y-2;|pin@38||I
 X
 
 # Cell oneBit;1{sch}
-ConeBit;1{sch}||schematic|1242942044308|1248205347164||ATTR_FIRE_DRIVER_SIZE(D5G3;HNPX4.5;Y92.5;)S4|ATTR_STATE_DRIVER_SIZE(D5G3;HNPX4.5;Y97;)S8
+ConeBit;1{sch}||schematic|1242942044308|1248207242361||ATTR_FIRE_DRIVER_SIZE(D5G3;HNPX4.5;Y92.5;)S4|ATTR_STATE_DRIVER_SIZE(D5G3;HNPX4.5;Y97;)S8
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@0||14.5|30||||
 NOff-Page|conn@1||-87.5|33|||RR|
 NOff-Page|conn@2||-87.5|60.5||||
 NOff-Page|conn@3||15|61||||
-NOff-Page|conn@9||41|82|||RR|
-NOff-Page|conn@10||41|78|||RR|
-Ifire;3{ic}|fireIvan@3||-28|78|||D5G4;|ATTR_X(D5G2;NOLPX6.25;Y2;)S@FIRE_DRIVER_SIZE
-IredFive:inv;1{ic}|inv@39||-53|47.5|X||D0G4;|ATTR_X(D5G1.5;NPX1;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+NOff-Page|conn@9||17.75|81.5|||RR|
+NOff-Page|conn@10||17.75|77.5|||RR|
+Ifire;4{ic}|fire@0||-28|79|||D5G4;|ATTR_X(D5G2;NOLPX6.25;Y2;)S@FIRE_DRIVER_SIZE
+IredFive:inv;1{ic}|inv@39||-53|47.5|X||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y-1.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@49||-40|40|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX1;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@50||-40|47.5|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX0.5;Y-3;)S4|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@50||-40|47.5|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX0.5;Y-3;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@52||-16.5|40|XRR||D0G4;|ATTR_X(D5G1.5;NPX2;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@54||-16.5|47.5|XRR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y-2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:invLT;1{ic}|invLT@0||-30.5|91.5|R||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX0.5;Y3;)S@STATE_DRIVER_SIZE|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:nand2;1{ic}|nand2@2||-53|54.5|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPY-3.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:invLT;1{ic}|invLT@0||-30.5|91.5|R||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX0.5;Y3.75;)S@FIRE_DRIVER_SIZE|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:nand2;1{ic}|nand2@2||-53|54.5|YRR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPY3;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 Ngeneric:Invisible-Pin|pin@6||-84|155.5|||||ART_message(D5G15;)SoneCell
 Ngeneric:Invisible-Pin|pin@149||-84.5|146.5|||||ART_message(D5G2;)Sam 20 Jul 2009
 Ngeneric:Invisible-Pin|pin@227||-99|-16.5|||||ART_message(D4G1.5;)S[filled if there wasn't a two on the left before firing,"(equivalently: if MSN[ZeroOrTwo] was empty before firing)"]
@@ -658,18 +731,17 @@ NWire_Pin|pin@565||-72|65||||
 NWire_Pin|pin@608||-72|56.5||||
 NWire_Pin|pin@640||-36|43||||
 NWire_Pin|pin@669||-62.5|56.5||||
-NWire_Pin|pin@684||-27|43||||
-NWire_Pin|pin@685||-25.5|44.5||||
-NWire_Pin|pin@687||-30.75|44.5||||
+NWire_Pin|pin@684||-27.5|43||||
+NWire_Pin|pin@685||-26|44.5||||
+NWire_Pin|pin@687||-31.25|44.5||||
 NWire_Pin|pin@688||-36|44.5||||
-NWire_Pin|pin@689||-28.75|43||||
-NWire_Pin|pin@691||-24|72||||
+NWire_Pin|pin@689||-29.25|43||||
+NWire_Pin|pin@691||-24.5|72||||
 NWire_Pin|pin@720||-80|55.5||||
 NWire_Pin|pin@724||-64|28||||
 NWire_Pin|pin@729||-69|54.5||||
 NWire_Pin|pin@730||-36|40||||
 NWire_Pin|pin@731||-64|63.5||||
-NWire_Pin|pin@737||-45|55.5||||
 NWire_Pin|pin@738||-36|47.5||||
 NWire_Pin|pin@739||-64|68.5||||
 NWire_Pin|pin@741||-47|53.5||||
@@ -679,7 +751,7 @@ NWire_Pin|pin@753||-64|63.5||||
 NWire_Pin|pin@754||-57|67.5||||
 NWire_Pin|pin@759||-63|32||||
 NWire_Pin|pin@764||-30.5|86.5||||
-NWire_Pin|pin@765||-27.75|86.5||||
+NWire_Pin|pin@765||-28|86.5||||
 NWire_Pin|pin@766||-30.5|99.5||||
 NWire_Pin|pin@770||-2.5|60||||
 NWire_Pin|pin@784||-10|72||||
@@ -714,15 +786,17 @@ NWire_Pin|pin@861||-47|40||||
 NWire_Pin|pin@863||-12|67||||
 NWire_Pin|pin@864||-12|47.5||||
 NWire_Pin|pin@865||-80|66.5||||
-NWire_Pin|pin@866||-28.75|60||||
+NWire_Pin|pin@866||-29.25|60||||
 NWire_Pin|pin@867||-57|47.5||||
 NWire_Pin|pin@868||-49|51.5||||
 NWire_Pin|pin@869||-49|47.5||||
-NWire_Pin|pin@872||-28.75|72.5||||
+NWire_Pin|pin@872||-29.25|72.5||||
 NWire_Pin|pin@874||-82|60.5||||
 Ngeneric:Invisible-Pin|pin@875||-72|94|||||ART_message(D5G4;)S[Transistor count:,48 per bit,(includes the four,force-load transistors)]
 NWire_Pin|pin@876||-45|70.5||||
 NWire_Pin|pin@878||-10.5|40||||
+NWire_Pin|pin@879||-45|55.5||||
+NWire_Pin|pin@880||-29.25|75||||
 IpredCond3;1{ic}|predCond@16||4|61|||D5G4;|ATTR_X(D5G2;NOLPY-7.5;)S@STATE_DRIVER_SIZE
 IpredCond2;1{ic}|predCond@19||4|30|||D5G4;|ATTR_X(D5G2;NOLPX-0.25;Y-6.75;)S@STATE_DRIVER_SIZE
 IpredCond3;1{ic}|predCond@20||-75.5|66.5|X||D5G4;|ATTR_X(D5G2;NOLPY-7.5;)S@STATE_DRIVER_SIZE
@@ -731,7 +805,7 @@ IsuccCond2;2{ic}|succCond@0||-74.5|33|YRR||D5G4;|ATTR_X(D5G2;NOLPY6.5;)S@STATE_D
 Awire|disable|D5G2;||0|predCond@16|not_keep_up[3]|1|69|pin@821||-11.5|69
 Awire|disable|D5G2;||0|predCond@19|not_keep_up[2]|1|36|pin@838||-7.5|36
 Awire|disable|D5G2;||1800|predCond@20|not_keep_up[3]|-72.5|74.5|pin@805||-51.5|74.5
-Awire|disableLO|D5G2;||1800|pin@691||-24|72|pin@784||-10|72
+Awire|disableLO|D5G2;||1800|pin@691||-24.5|72|pin@784||-10|72
 Awire|disableLO|D5G2;||1800|sucDri20@1|keep_down[2]|-74|49.5|pin@815||-61|49.5
 Awire|disableLO|D5G2;||1800|succCond@0|keep_down[2]|-73.5|27|pin@818||-53.5|27
 Awire|fire|D5G2;||0|predCond@16|cond|1|62|pin@819||-9|62
@@ -744,22 +818,20 @@ Awire|fireLO|D5G2;||2700|invLT@0|out|-30.5|94|pin@766||-30.5|99.5
 Awire|net@1208|||1800|pin@564||-72|65|pin@565||-72|65
 Awire|net@1271|||1800|pin@308||10.5|30|conn@0|a|12.5|30
 Awire|net@1339|||1800|sucDri20@1|in|-72|56.5|pin@608||-72|56.5
-Awire|net@1567|||900|fireIvan@3|MSN[ZeroOrTwo]|-30.75|75.5|pin@687||-30.75|44.5
-Awire|net@1570|||0|pin@687||-30.75|44.5|pin@688||-36|44.5
-Awire|net@1573|||1800|pin@640||-36|43|pin@689||-28.75|43
-Awire|net@1575|||900|fireIvan@3|disableLO|-24|76|pin@691||-24|72
+Awire|net@1567|||900|fire@0|MSN[ZeroOrTwo]|-31.25|75|pin@687||-31.25|44.5
+Awire|net@1570|||0|pin@687||-31.25|44.5|pin@688||-36|44.5
+Awire|net@1573|||1800|pin@640||-36|43|pin@689||-29.25|43
+Awire|net@1575|||900|fire@0|disableLO|-24.5|75|pin@691||-24.5|72
 Awire|net@1691|||1800|sucDri20@1|cond|-72|54.5|pin@729||-69|54.5
 Awire|net@1693|||0|nand2@2|out|-55.5|54.5|pin@729||-69|54.5
 Awire|net@1698|||900|pin@640||-36|43|pin@730||-36|40
 Awire|net@1700|||1800|inv@49|in|-37.5|40|pin@730||-36|40
 Awire|net@1716|||1800|inv@50|in|-37.5|47.5|pin@738||-36|47.5
-Awire|net@1720|||0|pin@741||-47|53.5|nand2@2|inb|-50.5|53.5
 Awire|net@1729|||0|pin@724||-64|28|pin@747||-64|28
 Awire|net@1739|||0|pin@731||-64|63.5|pin@753||-64|63.5
 Awire|net@1762|||900|invLT@0|in|-30.5|89|pin@764||-30.5|86.5
-Awire|net@1763|||2700|fireIvan@3|fireHI|-27.75|84|pin@765||-27.75|86.5
-Awire|net@1764|||1800|pin@764||-30.5|86.5|pin@765||-27.75|86.5
-Awire|net@1838|||1800|nand2@2|ina|-50.5|55.5|pin@737||-45|55.5
+Awire|net@1763|||2700|fire@0|fireHI|-28|84|pin@765||-28|86.5
+Awire|net@1764|||1800|pin@764||-30.5|86.5|pin@765||-28|86.5
 Awire|net@1840|||0|pin@798||-57|34|succCond@0|cond|-71.5|34
 Awire|net@1846|||0|pin@739||-64|68.5|pin@802||-64|68.5
 Awire|net@1852|||0|pin@754||-57|67.5|predCond@20|cond|-72.5|67.5
@@ -778,13 +850,13 @@ Awire|net@1949|||900|pin@835||-82|43|pin@840||-82|33
 Awire|net@1950|||2700|pin@720||-80|55.5|pin@810||-80|60.5
 Awire|net@1952|||900|pin@832||10.5|61|pin@841||10.5|44.5
 Awire|net@1957|||0|inv@54|in|-19|47.5|pin@843||-20.5|47.5
-Awire|net@1964|||0|pin@847||-20.5|44.5|pin@685||-25.5|44.5
+Awire|net@1964|||0|pin@847||-20.5|44.5|pin@685||-26|44.5
 Awire|net@1976|||2700|pin@308||10.5|30|pin@852||10.5|43
-Awire|net@1978|||1800|pin@684||-27|43|pin@853||-20.5|43
+Awire|net@1978|||1800|pin@684||-27.5|43|pin@853||-20.5|43
 Awire|net@1982|||0|pin@688||-36|44.5|pin@854||-82|44.5
-Awire|net@1983|||2700|pin@685||-25.5|44.5|fireIvan@3|LSN[ZeroOrDone]|-25.5|76
-Awire|net@1984|||2700|pin@684||-27|43|fireIvan@3|LSN[ZeroOrTwo]|-27|76
-Awire|net@1985|||1800|pin@765||-27.75|86.5|pin@855||-25|86.5
+Awire|net@1983|||2700|pin@685||-26|44.5|fire@0|LSN[ZeroOrDone]|-26|75
+Awire|net@1984|||2700|pin@684||-27.5|43|fire@0|LSN[ZeroOrTwo]|-27.5|75
+Awire|net@1985|||1800|pin@765||-28|86.5|pin@855||-25|86.5
 Awire|net@1990|||1800|pin@853||-20.5|43|pin@852||10.5|43
 Awire|net@1991|||0|inv@52|in|-19|40|pin@860||-20.5|40
 Awire|net@1992|||2700|pin@860||-20.5|40|pin@853||-20.5|43
@@ -796,25 +868,23 @@ Awire|net@1999|||900|pin@863||-12|67|pin@864||-12|47.5
 Awire|net@2000|||0|pin@864||-12|47.5|inv@54|out|-14|47.5
 Awire|net@2001|||2700|pin@810||-80|60.5|pin@865||-80|66.5
 Awire|net@2002|||0|predCond@20|state|-78|66.5|pin@865||-80|66.5
-Awire|net@2004|||900|pin@866||-28.75|60|pin@689||-28.75|43
-Awire|net@2006|||0|pin@770||-2.5|60|pin@866||-28.75|60
+Awire|net@2004|||900|pin@866||-29.25|60|pin@689||-29.25|43
+Awire|net@2006|||0|pin@770||-2.5|60|pin@866||-29.25|60
 Awire|net@2007|||900|pin@754||-57|67.5|pin@867||-57|47.5
 Awire|net@2008|||900|pin@867||-57|47.5|pin@798||-57|34
 Awire|net@2009|||0|inv@39|out|-55.5|47.5|pin@867||-57|47.5
-Awire|net@2010|||900|pin@737||-45|55.5|pin@743||-45|47.5
 Awire|net@2011|||1800|sucDri20@1|not_succ|-74|51.5|pin@868||-49|51.5
 Awire|net@2012|||1800|inv@39|in|-50.5|47.5|pin@869||-49|47.5
 Awire|net@2013|||1800|pin@869||-49|47.5|pin@743||-45|47.5
 Awire|net@2014|||900|pin@868||-49|51.5|pin@869||-49|47.5
-Awire|net@2026|||900|fireIvan@3|MSN[ZeroOrDone]|-28.75|75.5|pin@872||-28.75|72.5
-Awire|net@2027|||900|pin@872||-28.75|72.5|pin@866||-28.75|60
-Awire|net@2028|||1800|predCond@20|not_keep_up[2]|-72.5|72.5|pin@872||-28.75|72.5
+Awire|net@2026|||1800|fire@0|MSN[ZeroOrDone]|-29.25|75|pin@880||-29.25|75
+Awire|net@2027|||900|pin@872||-29.25|72.5|pin@866||-29.25|60
+Awire|net@2028|||1800|predCond@20|not_keep_up[2]|-72.5|72.5|pin@872||-29.25|72.5
 Awire|net@2032|||0|sucDri20@1|succ|-77|55.5|pin@720||-80|55.5
 Awire|net@2033|||1800|conn@2|y|-85.5|60.5|pin@874||-82|60.5
 Awire|net@2034|||1800|pin@874||-82|60.5|pin@810||-80|60.5
 Awire|net@2035|||2700|pin@854||-82|44.5|pin@874||-82|60.5
 Awire|net@2036|||1800|predCond@20|not_keep_up[1]|-72.5|70.5|pin@876||-45|70.5
-Awire|net@2037|||2700|pin@737||-45|55.5|pin@876||-45|70.5
 Awire|net@2038|||0|inv@50|out|-42.5|47.5|pin@743||-45|47.5
 Awire|net@2039|||900|pin@843||-20.5|47.5|pin@847||-20.5|44.5
 Awire|net@2045|||900|pin@824||-10.5|65|pin@878||-10.5|40
@@ -823,6 +893,11 @@ Awire|net@2047|||1800|inv@52|out|-14|40|pin@878||-10.5|40
 Awire|net@2048|||0|pin@841||10.5|44.5|pin@847||-20.5|44.5
 Awire|net@2049|||0|predCond@19|cond|1|29|pin@816||-47|29
 Awire|net@2050|||0|pin@816||-47|29|succCond@0|keep_down|-73.5|29
+Awire|net@2052|||1800|nand2@2|ina|-50.5|53.5|pin@741||-47|53.5
+Awire|net@2053|||2700|pin@743||-45|47.5|pin@879||-45|55.5
+Awire|net@2054|||2700|pin@879||-45|55.5|pin@876||-45|70.5
+Awire|net@2055|||1800|nand2@2|inb|-50.5|55.5|pin@879||-45|55.5
+Awire|net@2058|||900|fire@0|MSN[ZeroOrDone]|-29.25|75|pin@872||-29.25|72.5
 ELSN[ZeroOrDone]||D5G2;X12.5;|conn@0|a|B
 ELSN[ZeroOrTwo]||D5G2;X13.5;|conn@3|a|B
 EMSN[ZeroOrDone]||D5G2;X13;|conn@1|a|B
The FleetCode -- http://fleet.cs.berkeley.edu/