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

diff --git a/electric/omegaCounter.jelib b/electric/omegaCounter.jelib
index 55bd75a..302b66e 100644 (file)
--- a/electric/omegaCounter.jelib
+++ b/electric/omegaCounter.jelib
@@ -313,8 +313,8 @@ Efire[1]|fireHI|D5G1;RX1.5;|pin@16||O
 X
 
 # Cell fire;1{sch}
-Cfire;1{sch}||schematic|1247526811643|1248136725603||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;)S@X*2
+Cfire;1{sch}||schematic|1247526811643|1248158992362||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|
 NOff-Page|conn@3||-47|12||||
@@ -356,8 +356,8 @@ Ngeneric:Invisible-Pin|pin@96||10|37.5|||||ART_message(D5G1;)S[these pullups and
 IredFive:pms1;2{ic}|pms1@0||-7|30|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX0.75;Y3.5;)S0.6*@X
 IredFive:pms1;2{ic}|pms1@1||1|30|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX0.75;Y3.5;)S1.5*@X
 IredFive:pms1;2{ic}|pms1@2||9|30|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX0.75;Y3.5;)S1.5*@X
-IredFive:pms1;2{ic}|pms1@3||-38.5|30|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX0.25;Y4;)S@X*2
-IredFive:pms1;2{ic}|pms1@4||-28.5|30|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-0.25;Y4;)S@X*2
+IredFive:pms1;2{ic}|pms1@3||-38.5|30|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX0.25;Y4;)S2*@X
+IredFive:pms1;2{ic}|pms1@4||-28.5|30|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-0.25;Y4;)S2*@X
 Awire|net@169|||1800|pms1@0|g|-4|30|pin@66||-1.5|30
 Awire|net@171|||0|pin@67||-1.5|4|nms3a@1|g|-4|4
 Awire|net@172|||900|pin@66||-1.5|30|pin@67||-1.5|4
@@ -630,20 +630,20 @@ Edisable|disableLO|D5G2;X-2;Y-2;|pin@38||I
 X
 
 # Cell oneBit;1{sch}
-ConeBit;1{sch}||schematic|1242942044308|1248155041227|
+ConeBit;1{sch}||schematic|1242942044308|1248160269075|
 Ngeneric:Facet-Center|art@0||0|0||||AV
-NOff-Page|conn@0||14.5|16.5||||
-NOff-Page|conn@1||-87.5|19.5|||RR|
-NOff-Page|conn@2||-87.5|50||||
-NOff-Page|conn@3||15|50||||
+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;)S8
-IredFive:inv;1{ic}|inv@39||-53|41.5|X||D0G4;|ATTR_X(D5G1.5;NPX0.5;Y-2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@49||-40|32.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@50||-40|41.5|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPY3;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@52||-16.5|32.5|XRR||D0G4;|ATTR_X(D5G1.5;NPX2;Y-2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@54||-16.5|41.5|XRR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+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
+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@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;)S8|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
 Ngeneric:Invisible-Pin|pin@6||-84|155.5|||||ART_message(D5G15;)SoneCell
@@ -652,182 +652,177 @@ Ngeneric:Invisible-Pin|pin@227||-99|-16.5|||||ART_message(D4G1.5;)S[filled if th
 Ngeneric:Invisible-Pin|pin@228||-102.5|103.5|||||ART_message(D4G1.5;)S[filled if there was a One on the left before firing,drained if there was a Two on the left before firing]
 Ngeneric:Invisible-Pin|pin@229||36.5|-17|||||ART_message(D6G1.5;)S[drained if there wasn't a Done on the left before firing,(equivalently: if there was a One or Two on the left before firing),"(equivalently: if MSN[ZeroOrDone] was empty before firing)"]
 Ngeneric:Invisible-Pin|pin@230||30.5|107.5|||||ART_message(D6G1.5;)S[drained if there was a Done on the left before firing,"(equvialently: if MSN[ZeroOrDone] was full before firing)"]
-NWire_Pin|pin@308||10.5|16.5||||
+NWire_Pin|pin@308||10.5|30||||
 NWire_Pin|pin@564||-72|65||||
 NWire_Pin|pin@565||-72|65||||
 NWire_Pin|pin@608||-72|56.5||||
-NWire_Pin|pin@640||-36|29.5||||
+NWire_Pin|pin@640||-36|43||||
 NWire_Pin|pin@669||-62.5|56.5||||
-NWire_Pin|pin@684||-27|29.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@688||-36|44.5||||
-NWire_Pin|pin@689||-28.75|29.5||||
-NWire_Pin|pin@691||-24|71.5||||
-NWire_Pin|pin@720||-82|55.5||||
-NWire_Pin|pin@724||-64|14.5||||
+NWire_Pin|pin@689||-28.75|43||||
+NWire_Pin|pin@691||-24|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|32.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|41.5||||
+NWire_Pin|pin@738||-36|47.5||||
 NWire_Pin|pin@739||-64|68.5||||
 NWire_Pin|pin@741||-47|53.5||||
-NWire_Pin|pin@743||-45|41.5||||
-NWire_Pin|pin@747||-64|14.5||||
+NWire_Pin|pin@743||-45|47.5||||
+NWire_Pin|pin@747||-64|28||||
 NWire_Pin|pin@753||-64|63.5||||
 NWire_Pin|pin@754||-57|67.5||||
-NWire_Pin|pin@759||-63|18.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@766||-30.5|99.5||||
-NWire_Pin|pin@770||-2.5|49||||
-NWire_Pin|pin@784||-10|71.5||||
-NWire_Pin|pin@798||-57|20.5||||
+NWire_Pin|pin@770||-2.5|60||||
+NWire_Pin|pin@784||-10|72||||
+NWire_Pin|pin@798||-57|34||||
 NWire_Pin|pin@802||-64|68.5||||
 NWire_Pin|pin@805||-51.5|74.5||||
 NWire_Pin|pin@806||-59.5|65.5||||
-NWire_Pin|pin@807||-45|70.5||||
-NWire_Pin|pin@810||-82|50||||
+NWire_Pin|pin@810||-80|60.5||||
 NWire_Pin|pin@815||-61|49.5||||
-NWire_Pin|pin@816||-47|15||||
-NWire_Pin|pin@817||-73.5|15||||
-NWire_Pin|pin@818||-53.5|13.5||||
-NWire_Pin|pin@819||-9|51||||
-NWire_Pin|pin@821||-11.5|58||||
-NWire_Pin|pin@824||-10.5|54||||
-NWire_Pin|pin@832||8|50||||
-NWire_Pin|pin@833||1|15||||
-NWire_Pin|pin@835||-79.5|29.5||||
-NWire_Pin|pin@836||1|15||||
-NWire_Pin|pin@837||-7|17.5||||
-NWire_Pin|pin@838||-7.5|22.5||||
-NWire_Pin|pin@839||-10.5|20.5||||
-NWire_Pin|pin@840||-79.5|19.5||||
-NWire_Pin|pin@841||8|44.5||||
-NWire_Pin|pin@842||-20.5|44.5||||
-NWire_Pin|pin@843||-20.5|41.5||||
+NWire_Pin|pin@816||-47|29||||
+NWire_Pin|pin@817||-73.5|28.5||||
+NWire_Pin|pin@818||-53.5|27||||
+NWire_Pin|pin@819||-9|62||||
+NWire_Pin|pin@821||-11.5|69||||
+NWire_Pin|pin@824||-10.5|65||||
+NWire_Pin|pin@832||10.5|61||||
+NWire_Pin|pin@835||-82|43||||
+NWire_Pin|pin@837||-7|31||||
+NWire_Pin|pin@838||-7.5|36||||
+NWire_Pin|pin@839||-10.5|34||||
+NWire_Pin|pin@840||-82|33||||
+NWire_Pin|pin@841||10.5|44.5||||
+NWire_Pin|pin@843||-20.5|47.5||||
 NWire_Pin|pin@847||-20.5|44.5||||
-NWire_Pin|pin@848||-10.5|32.5||||
-NWire_Pin|pin@852||10.5|29.5||||
-NWire_Pin|pin@853||-20.5|29.5||||
+NWire_Pin|pin@852||10.5|43||||
+NWire_Pin|pin@853||-20.5|43||||
 NWire_Pin|pin@854||-82|44.5||||
 NWire_Pin|pin@855||-25|86.5||||
 NWire_Pin|pin@856||-25|99.5||||
-NWire_Pin|pin@860||-20.5|32.5||||
-NWire_Pin|pin@861||-47|32.5||||
-NWire_Pin|pin@862||-45|41.5||||
-NWire_Pin|pin@863||-12|56||||
-NWire_Pin|pin@864||-12|41.5||||
-NWire_Pin|pin@865||-82|66.5||||
-NWire_Pin|pin@866||-28.75|49||||
-NWire_Pin|pin@867||-57|41.5||||
+NWire_Pin|pin@860||-20.5|40||||
+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@867||-57|47.5||||
 NWire_Pin|pin@868||-49|51.5||||
-NWire_Pin|pin@869||-49|41.5||||
+NWire_Pin|pin@869||-49|47.5||||
 NWire_Pin|pin@872||-28.75|72.5||||
-IpredCond3;1{ic}|predCond@16||4|50|||D5G4;|ATTR_X(D5G2;NOLPY-7.5;)S8
-IpredCond2;1{ic}|predCond@19||4|16.5|||D5G4;|ATTR_X(D5G2;NPX-0.25;Y-6.75;)S8
+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||||
+IpredCond3;1{ic}|predCond@16||4|61|||D5G4;|ATTR_X(D5G2;NOLPY-7.5;)S8
+IpredCond2;1{ic}|predCond@19||4|30|||D5G4;|ATTR_X(D5G2;NPX-0.25;Y-6.75;)S8
 IpredCond3;1{ic}|predCond@20||-75.5|66.5|X||D5G4;|ATTR_X(D5G2;NOLPY-7.5;)S8
 IsuccCond2;1{ic}|sucDri20@1||-75|55.5|YRR||D5G4;|ATTR_X(D5G2;NOLPX0.5;Y7;)S8
-IsuccCond2;2{ic}|succCond@0||-74.5|19.5|YRR||D5G4;|ATTR_X(D5G2;NOLPY5.5;)S8
-Awire|disable|D5G2;||0|predCond@16|not_keep_up[3]|1|58|pin@821||-11.5|58
-Awire|disable|D5G2;||0|predCond@19|not_keep_up[2]|1|22.5|pin@838||-7.5|22.5
+IsuccCond2;2{ic}|succCond@0||-74.5|33|YRR||D5G4;|ATTR_X(D5G2;NOLPY6.5;)S8
+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|71.5|pin@784||-10|71.5
+Awire|disableLO|D5G2;||1800|pin@691||-24|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|13.5|pin@818||-53.5|13.5
-Awire|fire|D5G2;||0|predCond@16|cond|1|51|pin@819||-9|51
-Awire|fire|D5G2;||0|predCond@19|fire|1|17.5|pin@837||-7|17.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
+Awire|fire|D5G2;||0|predCond@19|fire|1|31|pin@837||-7|31
 Awire|fire|D5G2;Y4;||2700|pin@855||-25|86.5|pin@856||-25|99.5
 Awire|fire|D5G2;||1800|predCond@20|fire|-72.5|65.5|pin@806||-59.5|65.5
 Awire|fireLO|D5G2;||0|pin@669||-62.5|56.5|pin@608||-72|56.5
-Awire|fireLO|D5G2;||1800|succCond@0|in|-71.5|18.5|pin@759||-63|18.5
+Awire|fireLO|D5G2;||1800|succCond@0|in|-71.5|32|pin@759||-63|32
 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|16.5|conn@0|a|12.5|16.5
+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|29.5|pin@689||-28.75|29.5
-Awire|net@1575|||900|fireIvan@3|disableLO|-24|76|pin@691||-24|71.5
-Awire|net@1669|||0|sucDri20@1|succ|-77|55.5|pin@720||-82|55.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@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|||2700|pin@640||-36|29.5|pin@730||-36|32.5
-Awire|net@1700|||1800|inv@49|in|-37.5|32.5|pin@730||-36|32.5
-Awire|net@1716|||1800|inv@50|in|-37.5|41.5|pin@738||-36|41.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|14.5|pin@747||-64|14.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@1840|||0|pin@798||-57|20.5|succCond@0|cond|-71.5|20.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
-Awire|net@1855|||2700|pin@737||-45|55.5|pin@807||-45|70.5
-Awire|net@1869|||900|pin@688||-36|44.5|pin@738||-36|41.5
-Awire|net@1878|||0|pin@816||-47|15|pin@817||-73.5|15
-Awire|net@1879|||900|succCond@0|keep_down|-73.5|15.5|pin@817||-73.5|15
-Awire|net@1882|||0|predCond@16|fire|1|49|pin@770||-2.5|49
-Awire|net@1899|||1800|pin@824||-10.5|54|predCond@16|not_keep_up[1]|1|54
-Awire|net@1910|||0|conn@3|a|13|50|pin@832||8|50
-Awire|net@1911|||0|pin@832||8|50|predCond@16|state|6.5|50
-Awire|net@1916|||900|predCond@19|cond|1|15.5|pin@833||1|15
-Awire|net@1931|||0|pin@640||-36|29.5|pin@835||-79.5|29.5
-Awire|net@1934|||0|pin@807||-45|70.5|predCond@20|not_keep_up[1]|-72.5|70.5
-Awire|net@1937|||900|predCond@19|cond|1|15.5|pin@836||1|15
-Awire|net@1938|||1800|pin@816||-47|15|pin@836||1|15
-Awire|net@1940|||1800|predCond@19|state|6.5|16.5|pin@308||10.5|16.5
-Awire|net@1943|||0|predCond@19|not_keep_up|1|20.5|pin@839||-10.5|20.5
-Awire|net@1947|||0|succCond@0|state|-76.5|19.5|pin@840||-79.5|19.5
-Awire|net@1948|||0|pin@840||-79.5|19.5|conn@1|a|-85.5|19.5
-Awire|net@1949|||900|pin@835||-79.5|29.5|pin@840||-79.5|19.5
-Awire|net@1950|||900|pin@720||-82|55.5|pin@810||-82|50
-Awire|net@1951|||1800|conn@2|y|-85.5|50|pin@810||-82|50
-Awire|net@1952|||900|pin@832||8|50|pin@841||8|44.5
-Awire|net@1953|||0|pin@841||8|44.5|pin@842||-20.5|44.5
-Awire|net@1954|||900|pin@842||-20.5|44.5|pin@843||-20.5|41.5
-Awire|net@1957|||0|inv@54|in|-19|41.5|pin@843||-20.5|41.5
+Awire|net@1869|||2700|pin@688||-36|44.5|pin@738||-36|47.5
+Awire|net@1879|||900|succCond@0|keep_down|-73.5|29|pin@817||-73.5|28.5
+Awire|net@1882|||0|predCond@16|fire|1|60|pin@770||-2.5|60
+Awire|net@1899|||1800|pin@824||-10.5|65|predCond@16|not_keep_up[1]|1|65
+Awire|net@1910|||0|conn@3|a|13|61|pin@832||10.5|61
+Awire|net@1911|||0|pin@832||10.5|61|predCond@16|state|6.5|61
+Awire|net@1931|||0|pin@640||-36|43|pin@835||-82|43
+Awire|net@1940|||1800|predCond@19|state|6.5|30|pin@308||10.5|30
+Awire|net@1943|||0|predCond@19|not_keep_up|1|34|pin@839||-10.5|34
+Awire|net@1947|||0|succCond@0|state|-76.5|33|pin@840||-82|33
+Awire|net@1948|||0|pin@840||-82|33|conn@1|a|-85.5|33
+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@1965|||2700|pin@843||-20.5|41.5|pin@847||-20.5|44.5
-Awire|net@1967|||900|pin@824||-10.5|54|pin@848||-10.5|32.5
-Awire|net@1968|||900|pin@848||-10.5|32.5|pin@839||-10.5|20.5
-Awire|net@1969|||1800|inv@52|out|-14|32.5|pin@848||-10.5|32.5
-Awire|net@1976|||2700|pin@308||10.5|16.5|pin@852||10.5|29.5
-Awire|net@1978|||1800|pin@684||-27|29.5|pin@853||-20.5|29.5
-Awire|net@1981|||900|pin@720||-82|55.5|pin@854||-82|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@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|29.5|fireIvan@3|LSN[ZeroOrTwo]|-27|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@1990|||1800|pin@853||-20.5|29.5|pin@852||10.5|29.5
-Awire|net@1991|||0|inv@52|in|-19|32.5|pin@860||-20.5|32.5
-Awire|net@1992|||900|pin@860||-20.5|32.5|pin@853||-20.5|29.5
-Awire|net@1993|||900|pin@741||-47|53.5|pin@861||-47|32.5
-Awire|net@1994|||900|pin@861||-47|32.5|pin@816||-47|15
-Awire|net@1995|||0|inv@49|out|-42.5|32.5|pin@861||-47|32.5
-Awire|net@1996|||0|inv@50|out|-42.5|41.5|pin@862||-45|41.5
-Awire|net@1997|||900|pin@807||-45|70.5|pin@862||-45|41.5
-Awire|net@1998|||0|predCond@16|not_keep_up[2]|1|56|pin@863||-12|56
-Awire|net@1999|||900|pin@863||-12|56|pin@864||-12|41.5
-Awire|net@2000|||0|pin@864||-12|41.5|inv@54|out|-14|41.5
-Awire|net@2001|||2700|pin@810||-82|50|pin@865||-82|66.5
-Awire|net@2002|||0|predCond@20|state|-78|66.5|pin@865||-82|66.5
-Awire|net@2004|||900|pin@866||-28.75|49|pin@689||-28.75|29.5
-Awire|net@2006|||0|pin@770||-2.5|49|pin@866||-28.75|49
-Awire|net@2007|||900|pin@754||-57|67.5|pin@867||-57|41.5
-Awire|net@2008|||900|pin@867||-57|41.5|pin@798||-57|20.5
-Awire|net@2009|||0|inv@39|out|-55.5|41.5|pin@867||-57|41.5
-Awire|net@2010|||900|pin@737||-45|55.5|pin@743||-45|41.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
+Awire|net@1993|||900|pin@741||-47|53.5|pin@861||-47|40
+Awire|net@1994|||900|pin@861||-47|40|pin@816||-47|29
+Awire|net@1995|||0|inv@49|out|-42.5|40|pin@861||-47|40
+Awire|net@1998|||0|predCond@16|not_keep_up[2]|1|67|pin@863||-12|67
+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@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|41.5|pin@869||-49|41.5
-Awire|net@2013|||1800|pin@869||-49|41.5|pin@743||-45|41.5
-Awire|net@2014|||900|pin@868||-49|51.5|pin@869||-49|41.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|49
+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@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
+Awire|net@2046|||900|pin@878||-10.5|40|pin@839||-10.5|34
+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
 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
@@ -1125,7 +1120,7 @@ Estate||D5G2;X2.5;|pin@6||B
 X
 
 # Cell predCond2;1{sch}
-CpredCond2;1{sch}||schematic|1227920907034|1248151240032||ATTR_X(D5G4;HNOLPX-23;Y28;)S@X
+CpredCond2;1{sch}||schematic|1227920907034|1248160196489||ATTR_X(D5G4;HNOLPX-23;Y28;)S@X
 IredFive:PMOS;1{ic}|PMOS@0||-7.5|7.5|||D5G4;|ATTR_X(D5G1.5;NOLPX-3;Y1.5;)S1
 IredFive:PMOS;1{ic}|PMOS@1||-5.5|7.5|X||D5G4;|ATTR_X(D5G1.5;NOLPX-3;Y1.5;)S1
 Ngeneric:Facet-Center|art@0||0|0||||AV
@@ -1421,14 +1416,14 @@ Estate||D5G2;X2.5;|pin@6||B
 X
 
 # Cell predCond3;1{sch}
-CpredCond3;1{sch}||schematic|1227920907034|1248152759654||ATTR_X(D5G4;HNOLPX-23;Y28;)S@X
+CpredCond3;1{sch}||schematic|1227920907034|1248160178610||ATTR_X(D5G4;HNOLPX-23;Y28.5;)S@X
 IredFive:PMOS;1{ic}|PMOS@0||-7.5|7.5|||D5G4;|ATTR_X(D5G1.5;NOLPX-3;Y1.5;)S1
 IredFive:PMOS;1{ic}|PMOS@1||-5.5|7.5|X||D5G4;|ATTR_X(D5G1.5;NOLPX-3;Y1.5;)S1
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@0||-23|0.5||||
 NOff-Page|conn@2||42.75|0.5|||X|
 NOff-Page|conn@4||9.5|-10|||X|
-NOff-Page|conn@5||11.5|14|||RR|
+NOff-Page|conn@5||11.5|13.5|||RR|
 NOff-Page|conn@6||-15|17.5||||
 NOff-Page|conn@7||-15|21.5||||
 IredFive:nms2b;1{ic}|nms2b@0||-6.5|-10|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX3.25;Y-1.5;)S@X
@@ -1449,7 +1444,7 @@ NWire_Pin|pin@77||-11|-6||||
 NWire_Pin|pin@78||9.5|13.5||||
 IredFive:pms3a;1{ic}|pms3a@1||-6.5|21.5|X||D5G4;|ATTR_Delay(D5G1;NPX-12;Y12;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX-3.75;Y3;)S1
 IpredCond3;1{ic}|predCond@3||32.5|25|||D5G4;
-IpredCond3;2{ic}|predCond@4||11.5|25|||D5G4;|ATTR_X(D5G1;NPX-0.25;Y-5.25;)S@X
+IpredCond3;2{ic}|predCond@4||11.5|25|||D5G4;|ATTR_X(D5G1;NPX-0.25;Y-6.75;)S@X
 IpredCond3;2{ic}|predCond@6||47.5|23|||D5G4;|ATTR_X(D5G1;NOLPY-7;)S@X
 Awire|net@90|||0|pin@41||34|0.5|pin@36||-6.5|0.5
 Awire|net@92|||0|conn@2|y|40.75|0.5|pin@38||21.5|0.5
@@ -1473,7 +1468,7 @@ Awire|net@187|||0|nms2b@0|g2|-9.5|-6|pin@77||-11|-6
 Awire|net@188|||0|pin@61||-1|-10|nms2b@0|g|-3.5|-10
 Awire|net@191|||2700|pin@58||-6.5|9.5|pms3a@1|d|-6.5|11.5
 Awire|net@197|||1800|conn@6|y|-13|17.5|pms3a@1|g2|-9.5|17.5
-Awire|net@198|||900|conn@5|y|9.5|14|pin@78||9.5|13.5
+Awire|net@198|||900|conn@5|y|9.5|13.5|pin@78||9.5|13.5
 Awire|net@199|||1800|pms3a@1|g3|-3.5|13.5|pin@78||9.5|13.5
 Awire|net@200|||1800|conn@7|y|-13|21.5|pms3a@1|g|-9.5|21.5
 Econd||D6G2;X-5;|conn@4|a|I
@@ -1776,7 +1771,7 @@ Esucc|state|D5G2;X4.5;|pin@2||B
 X
 
 # Cell succCond2;1{sch}
-CsuccCond2;1{sch}||schematic|1188777360591|1248151600383||ATTR_X(D5G1;HNPX-21;Y26;)I8
+CsuccCond2;1{sch}||schematic|1188777360591|1248160187741||ATTR_X(D5G1;HNPX-21;Y26;)I8
 IorangeTSMC090nm:NMOSx;1{ic}|NMOSx@0||-3|-4|||D0G4;|ATTR_X(D5G1.5;NOLPX-0.5;Y3;)S1
 IorangeTSMC090nm:NMOSx;1{ic}|NMOSx@1||3|-4|X||D0G4;|ATTR_X(D5G1.5;NOLPX-1.5;Y2;)S1
 Ngeneric:Facet-Center|art@0||0|0||||AV
@@ -1785,7 +1780,7 @@ NOff-Page|conn@1||23.5|0||||
 NOff-Page|conn@2||18|6|||X|
 NOff-Page|conn@3||17.5|-13|||RR|
 NOff-Page|conn@4||17.5|-17|||RR|
-IredFive:nms2a;2{ic}|nms2a@0||0|-17|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NPX4;Y1;)I1
+IredFive:nms2a;2{ic}|nms2a@0||0|-17|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-1.5;)S1
 Ngeneric:Invisible-Pin|pin@0||9|32.5|||||ART_message(D5G6;)SsuccCond2
 Ngeneric:Invisible-Pin|pin@1||9.5|27|||||ART_message(D5G3;)Sam 20 Jul 2009
 NWire_Pin|pin@4||-3|0||||
The FleetCode -- http://fleet.cs.berkeley.edu/