projects / fleet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f000a2f)
omegaCounter: refactor core module into a single piece
authorAdam Megacz <adam@megacz.com>
Mon, 21 Sep 2009 07:44:02 +0000 (00:44 -0700)
committerAdam Megacz <adam@megacz.com>
Mon, 21 Sep 2009 07:44:02 +0000 (00:44 -0700)
chips/omegaCounter/40nm/electric/omegaCounter.jelib patch | blob | history

diff --git a/chips/omegaCounter/40nm/electric/omegaCounter.jelib b/chips/omegaCounter/40nm/electric/omegaCounter.jelib
index bad1503..b20932f 100644 (file)
--- a/chips/omegaCounter/40nm/electric/omegaCounter.jelib
+++ b/chips/omegaCounter/40nm/electric/omegaCounter.jelib
@@ -89,6 +89,130 @@ Ngeneric:Invisible-Pin|pin@8||-81|-75|||||ART_message(D5G8;)SXWM1
 Ngeneric:Invisible-Pin|pin@9||-81|-90|||||ART_message(D5G8;)SXWM2
 X
 
+# Cell core;1{ic}
+Ccore;1{ic}||artwork|1247529105994|1253518907840|E
+Ngeneric:Facet-Center|art@0||0|0||||AV
+NThick-Circle|art@19||-0.25|-2|8|7|YRR||ART_color()I-1174339839|ART_degrees()F[0.0,1.0471976]
+NThick-Circle|art@20||-4.25|-2|8|7|||ART_color()I-1174339839|ART_degrees()F[0.0,1.0471976]
+NThick-Circle|art@21||-2.25|-4.25|6|6|500||ART_color()I-1174339839|ART_degrees()I800
+NThick-Circle|art@24||0.25|5.5|1|1|R||ART_color()I-1174339839
+NThick-Circle|art@25||0.25|2.5|5|5|||ART_color()I-1174339839|ART_degrees()F[0.0,3.1415927]
+NThick-Circle|art@26||2.5|-6.5|1|1|XR||ART_color()I-1174339839
+NThick-Circle|art@27||0.5|-6.5|1|1|XR||ART_color()I-1174339839
+NThick-Circle|art@28||2.5|-5|5|5.5|X||ART_color()I-1174339839|ART_degrees()F[0.0,3.1415927]
+NThick-Circle|art@29||4.5|-6.5|1|1|XR||ART_color()I-1174339839
+Nschematic:Bus_Pin|pin@4||-1.25|-3||||
+Nschematic:Bus_Pin|pin@6||-3.25|-3||||
+Nschematic:Bus_Pin|pin@16||0.25|6|||R|
+Nschematic:Bus_Pin|pin@46||0.5|6|-2|-2|R|
+Nschematic:Bus_Pin|pin@54||0.5|5|-2|-2|R|
+Nschematic:Bus_Pin|pin@85||0|0|-2|-2|R|
+Nschematic:Bus_Pin|pin@86||0.5|5|-2|-2|R|
+NPin|pin@91||-3.25|-1.5|1|1|R||ART_color()I-1174339839
+NPin|pin@92||-3.25|-8|||R||ART_color()I-1174339839
+Nschematic:Bus_Pin|pin@93||-1|-1|-2|-2|R|
+Nschematic:Bus_Pin|pin@99||-5.5|-2.5|-2|-2|R|
+Nschematic:Bus_Pin|pin@100||-3|-1|-2|-2|R|
+NPin|pin@102||-1.25|-8|||R||ART_color()I-1174339839
+NPin|pin@103||-1.25|-1.5|1|1|R||ART_color()I-1174339839
+NPin|pin@104||-1.25|-1.5|1|1|R||ART_color()I-1174339839
+NPin|pin@105||-0.5|-0.75|1|1|R||ART_color()I-1174339839
+Nschematic:Bus_Pin|pin@108||0.75|0|-2|-2|R|
+NPin|pin@109||0.5|-2|1|1|R||ART_color()I-1174339839
+NPin|pin@110||2.75|0.25|1|1|R||ART_color()I-1174339839
+NPin|pin@111||2.75|3|1|1|R||ART_color()I-1174339839
+NPin|pin@112||2.75|-2|1|1|R||ART_color()I-1174339839
+NPin|pin@113||-2.25|1|1|1|R||ART_color()I-1174339839
+Nschematic:Bus_Pin|pin@114||0.25|6|-2|-2|R|
+Nschematic:Bus_Pin|pin@115||-1.25|1|-2|-2|R|
+NPin|pin@116||-2.25|3|1|1|R||ART_color()I-1174339839
+NPin|pin@119||0.25|-2|1|1|||ART_color()I-1174339839
+NPin|pin@120||0.25|1|1|1|||ART_color()I-1174339839
+Nschematic:Bus_Pin|pin@121||5.25|-6.5|-2|-2|XR|
+Nschematic:Bus_Pin|pin@122||0.5|-8|-2|-2|XR|
+NPin|pin@123||0.5|-7|1|1|XR||ART_color()I-1174339839
+NPin|pin@124||0.5|-8|||XR||ART_color()I-1174339839
+NPin|pin@125||5|-4.75|1|1|XR||ART_color()I-1174339839
+Nschematic:Bus_Pin|pin@126||2.5|-8|-2|-2|XR|
+NPin|pin@128||5|-6|1|1|XR||ART_color()I-1174339839
+NPin|pin@129||0|-6|1|1|XR||ART_color()I-1174339839
+NPin|pin@130||0|-4.75|1|1|XR||ART_color()I-1174339839
+Ngeneric:Invisible-Pin|pin@131||4|-5.5|||X||ART_message(D5G3;)S*
+Nschematic:Wire_Pin|pin@132||0.5|-8|||X|
+Nschematic:Wire_Pin|pin@133||2.5|-8|||X|
+Nschematic:Wire_Pin|pin@134||4.5|-8|||X|
+NPin|pin@136||2.5|-8|||XR||ART_color()I-1174339839
+NPin|pin@137||2.5|-7|1|1|XR||ART_color()I-1174339839
+NPin|pin@138||4.5|-7|1|1|XR||ART_color()I-1174339839
+NPin|pin@139||4.5|-8|||XR||ART_color()I-1174339839
+AThicker|net@36|||FS900|pin@91||-3.25|-1.5|pin@92||-3.25|-8|ART_color()I-1174339839
+AThicker|net@40|||FS900|pin@103||-1.25|-1.5|pin@102||-1.25|-8|ART_color()I-1174339839
+AThicker|net@42|||FS450|pin@105||-0.5|-0.75|pin@104||-1.25|-1.5|ART_color()I-1174339839
+AThicker|net@44|||FS900|pin@111||2.75|3|pin@112||2.75|-2|ART_color()I-1174339839
+AThicker|net@46|||FS900|pin@116||-2.25|3|pin@113||-2.25|1|ART_color()I-1174339839
+AThicker|net@48|||FS450|pin@110||2.75|0.25|pin@109||0.5|-2|ART_color()I-1174339839
+AThicker|net@49|||FS0|pin@112||2.75|-2|pin@119||0.25|-2|ART_color()I-1174339839
+AThicker|net@50|||FS2700|pin@119||0.25|-2|pin@120||0.25|1|ART_color()I-1174339839
+AThicker|net@51|||FS0|pin@120||0.25|1|pin@113||-2.25|1|ART_color()I-1174339839
+AThicker|net@52|||FS900|pin@123||0.5|-7|pin@124||0.5|-8|ART_color()I-1174339839
+AThicker|net@53|||FS900|pin@125||5|-4.75|pin@128||5|-6|ART_color()I-1174339839
+AThicker|net@54|||FS1800|pin@129||0|-6|pin@128||5|-6|ART_color()I-1174339839
+AThicker|net@55|||FS900|pin@130||0|-4.75|pin@129||0|-6|ART_color()I-1174339839
+AThicker|net@56|||FS900|pin@137||2.5|-7|pin@136||2.5|-8|ART_color()I-1174339839
+AThicker|net@57|||FS900|pin@138||4.5|-7|pin@139||4.5|-8|ART_color()I-1174339839
+Einc_1|disable|D5G1;RY-1.25;|pin@134||I
+Eina_1|inAnd1|D5G1;RY-1.25;|pin@132||I
+Einb_1|inAnd2|D5G1;RY-1.25;|pin@133||I
+Einc|inOr1|D4G1;RY-5;|pin@6||I
+Einb|inOr2|D4G1;RY-5;|pin@4||I
+Eout||D5G1;RX1.5;|pin@16||O
+X
+
+# Cell core;1{sch}
+Ccore;1{sch}||schematic|1253518699023|1253518975166|
+Ngeneric:Facet-Center|art@0||0|0||||AV
+NOff-Page|conn@0||-16|-9|||R|
+NOff-Page|conn@1||-14|-9|||R|
+NOff-Page|conn@2||-12|-9|||R|
+NOff-Page|conn@3||-25|-9|||R|
+NOff-Page|conn@4||-28|-9|||R|
+NOff-Page|conn@5||-16|29|||R|
+Icore;1{ic}|core@0||-47|23|||D5G4;
+Inand2nand2;4{ic}|nand2nan@0||-16|12|||D5G4;|ATTR_X(D5G1;NOJPX-5;Y1.5;)S12
+Inor3;1{ic}|nor3@1||-14|0|X||D5G4;|ATTR_X(D5G1;NOJPX-6;Y-2;)S4
+NWire_Pin|pin@0||-14|9||||
+NWire_Pin|pin@1||-28|5||||
+NWire_Pin|pin@2||-19.25|5||||
+NWire_Pin|pin@3||-25|2||||
+NWire_Pin|pin@4||-17.25|2||||
+NWire_Pin|pin@5||-16.25|25||||
+NWire_Pin|pin@6||-16|25||||
+NWire_Pin|pin@8||-14|5||||
+Iorange40nm:wire40;1{ic}|wire40@0||-6.5|5|||D5G4;|ATTR_L(D5FLeave alone;G1;OLPUD)S100|ATTR_LEWIRE(P)I1|ATTR_layer(D5FLeave alone;G1;NOLPY-1;)S1|ATTR_width(D5FLeave alone;G1;NOLPY-2;)S7
+Awire|net@0|||2700|conn@0|y|-16|-7|nor3@1|ina|-16|-3.5
+Awire|net@1|||2700|conn@2|y|-12|-7|nor3@1|inc|-12|-3.5
+Awire|net@2|||2700|conn@1|y|-14|-7|nor3@1|inb|-14|-3.5
+Awire|net@3|||1800|nand2nan@0|LSN[ZeroOrTwo]|-14.75|9|pin@0||-14|9
+Awire|net@5|||2700|conn@4|y|-28|-7|pin@1||-28|5
+Awire|net@6|||1800|pin@1||-28|5|pin@2||-19.25|5
+Awire|net@7|||900|nand2nan@0|MSN[ZeroOrTwo]|-19.25|9|pin@2||-19.25|5
+Awire|net@8|||2700|conn@3|y|-25|-7|pin@3||-25|2
+Awire|net@9|||1800|pin@3||-25|2|pin@4||-17.25|2
+Awire|net@10|||900|nand2nan@0|MSN[ZeroOrDone]|-17.25|9|pin@4||-17.25|2
+Awire|net@11|||2700|nand2nan@0|fireHI|-16.25|17|pin@5||-16.25|25
+Awire|net@12|||900|conn@5|a|-16|27|pin@6||-16|25
+Awire|net@13|||1800|pin@5||-16.25|25|pin@6||-16|25
+Awire|net@15|||2700|nor3@1|out|-14|2.75|pin@8||-14|5
+Awire|net@16|||2700|pin@8||-14|5|pin@0||-14|9
+Awire|net@17|||0|wire40@0|a|-9|5|pin@8||-14|5
+Edisable||D5G2;Y-5;|conn@2|a|I
+EinAnd1||D5G2;X-9;|conn@0|y|I
+EinAnd2||D5G2;X-2;Y-1;|conn@1|a|I
+EinOr3|inOr1|D5G2;X-5;|conn@4|y|I
+EinAnd3|inOr2|D5G2;X-8;Y-2;|conn@3|y|I
+EinOr3@513479722|out|D5G2;X2;|conn@5|y|O
+X
+
 # Cell fakeForDRC;1{lay}
 CfakeForDRC;1{lay}|oneCell|tsmcSun40GP|1250309607249|1250370709293||ATTR_NCC(D5G10;NTX-360;Y618.75;)S["exportsConnectedByParent vdd /vdd_[0-9]+/","exportsConnectedByParent gnd /gnd_[0-9]+/","exportsConnectedByParent disableLO /disableLO_[0-9]+/","exportsConnectedByParent disable /disable_[0-9]+/"]
 Ngeneric:Facet-Center|art@0||0|0||||AV
@@ -1321,7 +1445,7 @@ EdisableLO_1|valLO|D5G2;|pin@43||I
 X
 
 # Cell newCell;1{sch}
-CnewCell;1{sch}||schematic|1242942044308|1253517968876||LEDRIVE_fire@0()F12.738704|LEDRIVE_inv@63()F7.869788|LEDRIVE_inv@64()F6.7883825|LEDRIVE_nor3@0()F4.0163803|LEDRIVE_pred@1()F21.636974|LEDRIVE_predCond@1()F21.636974|LEDRIVE_predCond@2()F22.513935|LEDRIVE_succCond@3()F22.513935
+CnewCell;1{sch}||schematic|1242942044308|1253518958852||LEDRIVE_fire@0()F12.738704|LEDRIVE_inv@63()F7.869788|LEDRIVE_inv@64()F6.7883825|LEDRIVE_nor3@0()F4.0163803|LEDRIVE_pred@1()F21.636974|LEDRIVE_predCond@1()F21.636974|LEDRIVE_predCond@2()F22.513935|LEDRIVE_succCond@3()F22.513935
 IpurpleFive:LEsettings;1{ic}|LEsettin@1||52|25|||D5G4;|ATTR_LESETTINGS(D5G1;NPY-1.5;)I1|ATTR_alpha(D5G1;NPY0.5;)S0|ATTR_epsilon(D5G1;NPY3.5;)F0.0010|ATTR_gate_cap(D5G1;NPY1.5;)F0.19|ATTR_keeper_ratio(D5G1;NPY-0.5;)F0.1|ATTR_max_iter(D5G1;NPY2.5;)I30|ATTR_su(D5G1;NPY5.5;)S4.7|ATTR_wire_ratio(D5G1;NPY4.5;)F0.16|ATTR_x1inverter_length(D5G1;NPY-3.5;)F2.0|ATTR_x1inverter_nwidth(D5G1;NPY-4.5;)F3.0|ATTR_x1inverter_pwidth(D5G1;NPY-5.5;)F6.0
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@0||58.5|-7.5|||Y|
@@ -1332,7 +1456,7 @@ NOff-Page|conn@9||38|-49|||XYRR|
 NOff-Page|conn@10||38|-52.5|||XYRR|
 NOff-Page|conn@11||38|-55.5|||XYRR|
 NOff-Page|conn@12||47|4|||XY|
-Inand2nand2;4{ic}|fire@0||7.75|22.75|||D5G4;|ATTR_X(D5G3;NOJPX-9.5;)S12
+Icore;1{ic}|core@0||7|20|||D5G4;
 IpurpleFive:inv;1{ic}|inv@63||16.5|34.75|YRRR||D5G4;|ATTR_LEGATE(P)I1|ATTR_LEPARALLGRP(P)I-1|ATTR_X(D5G3;NOJPRRRY7.5;)S8|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1|ATTR_su(P)I-1
 IpurpleFive:inv;1{ic}|inv@64||24.5|-30.5|||D5G4;|ATTR_LEGATE(P)I1|ATTR_LEPARALLGRP(P)I-1|ATTR_X(D5G3;NOJPX4;Y6;)S8|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1|ATTR_su(P)I-1
 IredFive:inv;1{ic}|inv@75||-6|-15.5|RR||D5G4;|ATTR_X(D5FLeave alone;G3;NOLPX-0.5;Y4.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
@@ -1341,15 +1465,12 @@ IredFive:invLT;1{ic}|invLT@0||-11|-29.5|RR||D5G4;|ATTR_X(D5G3;NOJPX-5.5;Y4;)S1|A
 InewCell;1{ic}|newCell@0||-40|53.25|||D5G4;
 IredFive:nms1;2{ic}|nms1@0||81|-14.5|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NPX4;Y0.75;)S6
 IredFive:nms2b;1{ic}|nms2b@0||110.5|-45|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NPX6;Y-3.5;)S3
-Inor3;1{ic}|nor3@0||20|11.75|X||D5G4;|ATTR_X(D5G3;NOJPX-11.5;Y6.5;)S4
 Ngeneric:Invisible-Pin|pin@6||16.75|64.5|||||ART_message(D5G15;)SnewCell
 Ngeneric:Invisible-Pin|pin@149||16.25|56|||||ART_message(D5G3;)Sam 13 Sep 2009
 NWire_Pin|pin@308||14.75|-7.5|||Y|
 NWire_Pin|pin@832||55.25|-37.5|||Y|
 NWire_Pin|pin@840||10.25|-7|||Y|
 NWire_Pin|pin@874||-14.75|-37.5|||Y|
-NWire_Pin|pin@911||20|17.25||||
-NWire_Pin|pin@912||9|17.25||||
 NWire_Pin|pin@915||7.5|46.25||||
 NWire_Pin|pin@931||16.5|29.5||||
 NWire_Pin|pin@932||7.5|29.5||||
@@ -1361,10 +1482,7 @@ NWire_Pin|pin@957||2|-15.5||||
 NWire_Pin|pin@958||2|-37.5||||
 NWire_Pin|pin@959||-2.5|-29.5||||
 NWire_Pin|pin@960||-2.5|-7||||
-NWire_Pin|pin@967||22|4||||
 NWire_Pin|pin@969||20|-7.5||||
-NWire_Pin|pin@971||4.5|-7||||
-NWire_Pin|pin@972||6.5|-37.5||||
 NWire_Pin|pin@989||-37|-14.5||||
 NWire_Pin|pin@990||-37|-7||||
 NWire_Pin|pin@996||-37|-30.5||||
@@ -1383,13 +1501,11 @@ NWire_Pin|pin@1013||122|-37.5||||
 NWire_Pin|pin@1014||122|-59.5||||
 NWire_Pin|pin@1015||-82|-59.5||||
 NWire_Pin|pin@1019||-81|2||||
-NWire_Pin|pin@1021||12|20||||
 NWire_Pin|pin@1024||-20.5|-25||||
 NWire_Pin|pin@1026||-20.5|-19.5||||
 NWire_Pin|pin@1029||-82|-41||||
 NWire_Pin|pin@1032||7.5|43.5||||
 NWire_Pin|pin@1033||16.5|44||||
-NWire_Pin|pin@1034||12|17.25||||
 NWire_Pin|pin@1035||-20.5|-15.5||||
 NWire_Pin|pin@1036||-20.5|-29.5||||
 NWire_Pin|pin@1037||28|-28.5||||
@@ -1417,6 +1533,17 @@ NWire_Pin|pin@1061||110.5|-37.5||||
 NWire_Pin|pin@1063||18|-37.5||||
 NWire_Pin|pin@1066||-17.5|-15.5||||
 NWire_Pin|pin@1067||39|4||||
+NWire_Pin|pin@1070||7.5|27.75||||
+NWire_Pin|pin@1071||20|8.25||||
+NWire_Pin|pin@1072||18|8.25||||
+NWire_Pin|pin@1074||7.5|26||||
+NWire_Pin|pin@1075||3.75|-7||||
+NWire_Pin|pin@1076||5.75|-37.5||||
+NWire_Pin|pin@1077||5.75|-30.5||||
+NWire_Pin|pin@1078||11.5|4||||
+NWire_Pin|pin@1079||7.5|8.25||||
+NWire_Pin|pin@1080||9.5|10||||
+NWire_Pin|pin@1081||20|10||||
 IredFive:pms2;1{ic}|pms2@0||110.5|-29.5|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX8.75;Y3.25;)S3
 Ipred;1{ic}|pred@1||41|-17|||D5G4;|ATTR_X(D5G3;NOJPX-5.5;Y4.5;)S24
 IpredCond;1{ic}|predCond@1||-30|-14.5|RR||D5G4;|ATTR_X(D5G3;NOJPX-2;Y-4.5;)S21
@@ -1425,7 +1552,6 @@ IsuccCond;1{ic}|succCond@3||41.5|-29.5|||D5G4;|ATTR_X(D5G3;NOJPX-4;Y-4.5;)S22
 Iorange40nm:wire40;1{ic}|wire40@0||-9.5|43.5|||D5G4;|ATTR_L(D5FLeave alone;G1;OLPUD)S400|ATTR_LEWIRE(P)I1|ATTR_layer(D5FLeave alone;G1;NOLPY-1;)S2|ATTR_width(D5FLeave alone;G1;NOLPY-2;)S7
 Iorange40nm:wire40;1{ic}|wire40@1||-69|2|||D5G4;|ATTR_L(D5FLeave alone;G3;OLPUDY2.5;)S4000|ATTR_LEWIRE(P)I1|ATTR_layer(D5FLeave alone;G1;NOLPY-1;)S2|ATTR_width(D5FLeave alone;G1;NOLPY-2;)S7
 Iorange40nm:wire40;1{ic}|wire40@2||-69|-41|||D5G4;|ATTR_L(D5FLeave alone;G3;OLPUDY-5;)S4000|ATTR_LEWIRE(P)I1|ATTR_layer(D5FLeave alone;G1;NOLPY-1;)S2|ATTR_width(D5FLeave alone;G1;NOLPY-2;)S7
-Iorange40nm:wire40;1{ic}|wire40@3||16.5|20|||D5G4;|ATTR_L(D5FLeave alone;G1;OLPUD)S100|ATTR_LEWIRE(P)I1|ATTR_layer(D5FLeave alone;G1;NOLPY-1;)S1|ATTR_width(D5FLeave alone;G1;NOLPY-2;)S7
 Iorange40nm:wire40;1{ic}|wire40@4||25.5|44|||D5G4;|ATTR_L(D5FLeave alone;G1;OLPUD)S400|ATTR_LEWIRE(P)I1|ATTR_layer(D5FLeave alone;G1;NOLPY-1;)S2|ATTR_width(D5FLeave alone;G1;NOLPY-2;)S7
 Iorange40nm:wire40;1{ic}|wire40@5||-25.5|-19.5|||D5G4;|ATTR_L(D5FLeave alone;G1;OLPUD)S100|ATTR_LEWIRE(P)I1|ATTR_layer(D5FLeave alone;G1;NOLPY-1;)S2|ATTR_width(D5FLeave alone;G1;NOLPY-2;)S7
 Iorange40nm:wire40;1{ic}|wire40@6||-25.5|-25|||D5G4;|ATTR_L(D5FLeave alone;G1;OLPUD)S100|ATTR_LEWIRE(P)I1|ATTR_layer(D5FLeave alone;G1;NOLPY-1;)S2|ATTR_width(D5FLeave alone;G1;NOLPY-2;)S7
@@ -1437,22 +1563,13 @@ Awire|fireLO|D5G2;||0|pred@1|in|37.5|-17|pin@1007||29.5|-17
 Awire|fireLO|D5G2;||2700|pin@932||7.5|29.5|pin@1032||7.5|43.5
 Awire|fireLO|D5G2;||0|succCond@3|in|38.5|-28.5|pin@1037||28|-28.5
 Awire|net@1910|||0|conn@3|a|56.5|-37.5|pin@832||55.25|-37.5
-Awire|net@2131|||2700|nor3@0|out|20|14.5|pin@911||20|17.25
-Awire|net@2137|||900|fire@0|LSN[ZeroOrTwo]|9|19.75|pin@912||9|17.25
 Awire|net@2178|||900|inv@63|in|16.5|32.25|pin@931||16.5|29.5
-Awire|net@2179|||2700|fire@0|fireHI|7.5|27.75|pin@932||7.5|29.5
 Awire|net@2180|||0|pin@931||16.5|29.5|pin@932||7.5|29.5
 Awire|net@2211|||0|pin@832||55.25|-37.5|pin@949||47.5|-37.5
 Awire|net@2228|||1800|pin@874||-14.75|-37.5|pin@958||2|-37.5
 Awire|net@2230|||900|pin@957||2|-15.5|pin@958||2|-37.5
 Awire|net@2235|||2700|pin@959||-2.5|-29.5|pin@960||-2.5|-7
 Awire|net@2249|||1800|pin@308||14.75|-7.5|pin@969||20|-7.5
-Awire|net@2251|||900|nor3@0|inb|20|8.25|pin@969||20|-7.5
-Awire|net@2255|||0|pin@840||10.25|-7|pin@971||4.5|-7
-Awire|net@2256|||0|pin@971||4.5|-7|pin@960||-2.5|-7
-Awire|net@2257|||900|fire@0|MSN[ZeroOrTwo]|4.5|19.75|pin@971||4.5|-7
-Awire|net@2258|||1800|pin@958||2|-37.5|pin@972||6.5|-37.5
-Awire|net@2259|||1800|pin@972||6.5|-37.5|pin@951||10|-37.5
 Awire|net@2295|||0|predCond@1|state|-32.5|-14.5|pin@989||-37|-14.5
 Awire|net@2296|||1800|conn@1|a|-40.5|-7|pin@990||-37|-7
 Awire|net@2297|||1800|pin@990||-37|-7|pin@960||-2.5|-7
@@ -1475,7 +1592,6 @@ Awire|net@2331|||900|pin@1013||122|-37.5|pin@1014||122|-59.5
 Awire|net@2332|||0|pin@1014||122|-59.5|pin@1015||-82|-59.5
 Awire|net@2339|||2700|pin@1019||-81|2|pin@1009||-81|73.5
 Awire|net@2340|||0|wire40@1|a|-71.5|2|pin@1019||-81|2
-Awire|net@2344|||0|wire40@3|a|14|20|pin@1021||12|20
 Awire|net@2350|||1800|wire40@6|b|-23|-25|pin@1024||-20.5|-25
 Awire|net@2354|||1800|wire40@5|b|-23|-19.5|pin@1026||-20.5|-19.5
 Awire|net@2368|||2700|pin@1015||-82|-59.5|pin@1029||-82|-41
@@ -1485,9 +1601,6 @@ Awire|net@2378|||1800|wire40@0|b|-7|43.5|pin@1032||7.5|43.5
 Awire|net@2379|||2700|pin@1033||16.5|44|pin@933||16.5|45.5
 Awire|net@2380|||0|wire40@4|a|23|44|pin@1033||16.5|44
 Awire|net@2387|||1800|pin@1008||-81|-7|conn@1|y|-44.5|-7
-Awire|net@2388|||0|pin@911||20|17.25|pin@1034||12|17.25
-Awire|net@2389|||0|pin@1034||12|17.25|pin@912||9|17.25
-Awire|net@2390|||900|pin@1021||12|20|pin@1034||12|17.25
 Awire|net@2393|||2700|pin@1026||-20.5|-19.5|pin@1035||-20.5|-15.5
 Awire|net@2396|||900|pin@1024||-20.5|-25|pin@1036||-20.5|-29.5
 Awire|net@2411|||0|pin@1036||-20.5|-29.5|predCond@2|cond|-27|-29.5
@@ -1515,8 +1628,6 @@ Awire|net@2441|||900|conn@11|y|40|-55.5|pin@1055||40|-56
 Awire|net@2442|||0|pin@1042||116.75|-56|pin@1055||40|-56
 Awire|net@2443|||1800|conn@9|y|40|-49|pin@1043||90|-49
 Awire|net@2446|||0|conn@2|a|-44.5|-37.5|pin@1057||-82|-37.5
-Awire|net@2451|||900|fire@0|MSN[ZeroOrDone]|6.5|19.75|pin@1058||6.5|-30.5
-Awire|net@2452|||900|pin@1058||6.5|-30.5|pin@972||6.5|-37.5
 Awire|net@2454|||0|inv@64|in|22|-30.5|pin@1059||21|-30.5
 Awire|net@2455|||1800|pin@1058||6.5|-30.5|pin@1060||10|-30.5
 Awire|net@2456|||0|pin@1059||21|-30.5|pin@1060||10|-30.5
@@ -1527,15 +1638,32 @@ Awire|net@2460|||2700|nms2b@0|d|110.5|-39|pin@1061||110.5|-37.5
 Awire|net@2484|||1800|invLT@0|in|-8.5|-29.5|pin@959||-2.5|-29.5
 Awire|net@2486|||0|pin@949||47.5|-37.5|pin@1063||18|-37.5
 Awire|net@2487|||0|pin@1063||18|-37.5|pin@942||16|-37.5
-Awire|net@2488|||900|nor3@0|ina|18|8.25|pin@1063||18|-37.5
-Awire|net@2489|||2700|pin@967||22|4|nor3@0|inc|22|8.25
 Awire|net@2496|||1800|pin@1036||-20.5|-29.5|invLT@0|out|-13.5|-29.5
 Awire|net@2501|||1800|pin@1035||-20.5|-15.5|pin@1066||-17.5|-15.5
 Awire|net@2502|||1800|invI@0|in|-10|-15.5|inv@75|out|-8.5|-15.5
 Awire|net@2503|||0|invI@0|out|-15|-15.5|pin@1066||-17.5|-15.5
 Awire|net@2504|||1800|inv@75|in|-3.5|-15.5|pin@957||2|-15.5
-Awire|net@2505|||1800|pin@967||22|4|pin@1067||39|4
 Awire|net@2506|||0|conn@12|y|45|4|pin@1067||39|4
+Awire|net@2510|||900|pin@932||7.5|29.5|pin@1070||7.5|27.75
+Awire|net@2511|||2700|pin@969||20|-7.5|pin@1071||20|8.25
+Awire|net@2512|||2700|pin@1063||18|-37.5|pin@1072||18|8.25
+Awire|net@2514|||1800|core@0|out|7.25|26|pin@1074||7.5|26
+Awire|net@2515|||900|pin@932||7.5|29.5|pin@1074||7.5|26
+Awire|net@2520|||0|pin@840||10.25|-7|pin@1075||3.75|-7
+Awire|net@2521|||0|pin@1075||3.75|-7|pin@960||-2.5|-7
+Awire|net@2522|||900|core@0|inc|3.75|17|pin@1075||3.75|-7
+Awire|net@2523|||1800|pin@958||2|-37.5|pin@1076||5.75|-37.5
+Awire|net@2526|||0|pin@951||10|-37.5|pin@1076||5.75|-37.5
+Awire|net@2527|||900|core@0|inb|5.75|17|pin@1077||5.75|-30.5
+Awire|net@2528|||900|pin@1077||5.75|-30.5|pin@1076||5.75|-37.5
+Awire|net@2529|||0|pin@1058||6.5|-30.5|pin@1077||5.75|-30.5
+Awire|net@2530|||900|core@0|inc_1|11.5|12|pin@1078||11.5|4
+Awire|net@2532|||0|pin@1067||39|4|pin@1078||11.5|4
+Awire|net@2533|||0|pin@1072||18|8.25|pin@1079||7.5|8.25
+Awire|net@2534|||900|core@0|ina_1|7.5|12|pin@1079||7.5|8.25
+Awire|net@2535|||900|core@0|inb_1|9.5|12|pin@1080||9.5|10
+Awire|net@2536|||1800|pin@1080||9.5|10|pin@1081||20|10
+Awire|net@2537|||2700|pin@1071||20|8.25|pin@1081||20|10
 ELSN[OneOrTwo]|LSN[TwoOrDone]|D5G2;X4.25;Y-2.75;|conn@0|a|B
 ELSN[OneOrDone]|LSN[TwoOrOne]|D5G2;X3.75;Y2.75;|conn@3|a|B
 EMSN[OneOrTwo]|MSN[TwoOrDone]|D5G2;X2.75;Y3.75;|conn@1|a|B
The FleetCode -- http://fleet.cs.berkeley.edu/