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

diff --git a/electric/omegaCounter.jelib b/electric/omegaCounter.jelib
index 302b66e..84dea33 100644 (file)
--- a/electric/omegaCounter.jelib
+++ b/electric/omegaCounter.jelib
@@ -595,7 +595,7 @@ EoutaBar||D5G2;X7.5;|conn@3|a|U
 X
 
 # Cell oneBit;1{ic}
-ConeBit;1{ic}||artwork|1242937501096|1248153303993|E
+ConeBit;1{ic}||artwork|1242937501096|1248205347164|E|ATTR_FIRE_DRIVER_SIZE(D5G1;HNPY-2;)S4|ATTR_STATE_DRIVER_SIZE(D5G1;HNP)S8
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NTriangle|art@2||3|2|3|2|R|
 NTriangle|art@3||3|-8|3|2|R|
@@ -630,7 +630,7 @@ Edisable|disableLO|D5G2;X-2;Y-2;|pin@38||I
 X
 
 # Cell oneBit;1{sch}
-ConeBit;1{sch}||schematic|1242942044308|1248160269075|
+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
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@0||14.5|30||||
 NOff-Page|conn@1||-87.5|33|||RR|
@@ -638,13 +638,13 @@ 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
+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
 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: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
 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
@@ -723,11 +723,11 @@ 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|33|YRR||D5G4;|ATTR_X(D5G2;NOLPY6.5;)S8
+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
+IsuccCond2;1{ic}|sucDri20@1||-75|55.5|YRR||D5G4;|ATTR_X(D5G2;NOLPX0.5;Y7;)S@STATE_DRIVER_SIZE
+IsuccCond2;2{ic}|succCond@0||-74.5|33|YRR||D5G4;|ATTR_X(D5G2;NOLPY6.5;)S@STATE_DRIVER_SIZE
 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
@@ -1178,7 +1178,7 @@ Estate||D4G2;|conn@2|a|B
 X
 
 # Cell predCond3;3{ic}
-CpredCond3;3{ic}||artwork|1227921780535|1248151211226|E|ATTR_X(D5G1;HNOLPX-0.5;Y-3;)S@X
+CpredCond3;3{ic}||artwork|1227921780535|1248203261269|E|ATTR_X(D5G1;HNOLPX-0.5;Y-3;)S@X
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NThick-Circle|art@2||2|0|1|1||
 NThick-Circle|art@6||-0.5|0|4|4|RRR||ART_degrees()F[0.0,3.1415927]
@@ -1249,15 +1249,15 @@ AThicker|net@70|||FS900|pin@98||-2|8.5|pin@99||-2|7.5
 AThicker|net@71|||FS2700|pin@87||-1|6.5|pin@95||-1|7.5
 AThicker|net@72|||FS2700|pin@97||-1|8.5|pin@101||-1|9.5
 Econd||D5G2;X-3;|pin@41||I
+Enot_keep_up[1]|disable[1]|D5G2;X-8;|pin@47||I
+Enot_keep_up[2]|disable[2]|D5G2;X-8;|pin@59||I
+Enot_keep_up[3]|disable[3]|D5G2;X-8;|pin@102||I
 Efire||D5G2;X-2.5;|pin@2||I
-Enot_keep_up[1]||D5G2;X-8;|pin@47||I
-Enot_keep_up[2]||D5G2;X-8;|pin@59||I
-Enot_keep_up[3]||D5G2;X-8;|pin@102||I
-Estate||D5G2;X2.5;|pin@6||B
+Estate||D5G2;X2.5;|pin@6||O
 X
 
 # Cell predCond3;2{ic}
-CpredCond3;2{ic}||artwork|1227921780535|1248152747175|E|ATTR_X(D5G1;HNOLPX-0.5;Y-3;)S@X
+CpredCond3;2{ic}||artwork|1227921780535|1248203283805|E|ATTR_X(D5G1;HNOLPX-0.5;Y-3;)S@X
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NThick-Circle|art@2||2|0|1|1||
 NThick-Circle|art@6||-0.5|0|4|4|RRR||ART_degrees()F[0.0,3.1415927]
@@ -1329,15 +1329,15 @@ AThicker|net@55|||FS900|pin@82||-0.5|6.5|pin@78||-0.5|5.5
 AThicker|net@56|||FS0|pin@78||-0.5|5.5|pin@79||-1|5.5
 AThicker|net@57|||FS2700|pin@80||0|5.5|pin@81||0|6.5
 Econd||D5G2;X-2.5;|pin@41||I
+Enot_keep_up[1]|disable[1]|D5G2;X-5;|pin@47||I
+Enot_keep_up[2]|disable[2]|D5G2;X5.5;|pin@66||I
+Enot_keep_up[3]|disable[3]|D5G2;X-5;|pin@67||I
 Efire||D5G2;X-2;|pin@2||I
-Enot_keep_up[1]||D5G2;X-8;|pin@47||I
-Enot_keep_up[2]||D5G2;X9;|pin@66||I
-Enot_keep_up[3]||D5G2;X-8;|pin@67||I
-Estate||D5G2;X2.5;|pin@6||B
+Estate||D5G2;X2.5;|pin@6||O
 X
 
 # Cell predCond3;1{ic}
-CpredCond3;1{ic}||artwork|1227921780535|1248151211226|E|ATTR_X(D5G1;HNOLPX-0.5;Y-3;)S@X
+CpredCond3;1{ic}||artwork|1227921780535|1248203309331|E|ATTR_X(D5G1;HNOLPX-0.5;Y-3;)S@X
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NThick-Circle|art@2||2|0|1|1||
 NThick-Circle|art@6||-0.5|0|4|4|RRR||ART_degrees()F[0.0,3.1415927]
@@ -1408,31 +1408,28 @@ AThicker|net@70|||FS900|pin@98||-2|8.5|pin@99||-2|7.5
 AThicker|net@71|||FS2700|pin@87||-1|6.5|pin@95||-1|7.5
 AThicker|net@72|||FS2700|pin@97||-1|8.5|pin@101||-1|9.5
 Econd||D5G2;X-3;|pin@41||I
+Enot_keep_up[1]|disable[1]|D5G2;X-5;|pin@47||I
+Enot_keep_up[2]|disable[2]|D5G2;X-5;|pin@59||I
+Enot_keep_up[3]|disable[3]|D5G2;X-5;|pin@102||I
 Efire||D5G2;X-2.5;|pin@2||I
-Enot_keep_up[1]||D5G2;X-8;|pin@47||I
-Enot_keep_up[2]||D5G2;X-8;|pin@59||I
-Enot_keep_up[3]||D5G2;X-8;|pin@102||I
-Estate||D5G2;X2.5;|pin@6||B
+Estate||D5G2;X2.5;|pin@6||O
 X
 
 # Cell predCond3;1{sch}
-CpredCond3;1{sch}||schematic|1227920907034|1248160178610||ATTR_X(D5G4;HNOLPX-23;Y28.5;)S@X
+CpredCond3;1{sch}||schematic|1227920907034|1248203335122||ATTR_X(D5G4;HNOLPX4.5;Y37.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|13.5|||RR|
+NOff-Page|conn@2||6.25|0.5|||XRR|
+NOff-Page|conn@4||6|-10|||X|
+NOff-Page|conn@5||6.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
-Ngeneric:Invisible-Pin|pin@0||-0.5|39|||||ART_message(D5G5;)SpredCond3
-Ngeneric:Invisible-Pin|pin@1||0|35|||||ART_message(D5G3;)Sam 20 Jul 2009
+Ngeneric:Invisible-Pin|pin@0||-20.5|39.5|||||ART_message(D5G5;)SpredCond3
+Ngeneric:Invisible-Pin|pin@1||-20|35.5|||||ART_message(D5G3;)Sam 20 Jul 2009
 NWire_Pin|pin@29||-18|-6|||X|
-NWire_Pin|pin@36||-6.5|0.5|||X|
-NWire_Pin|pin@38||21.5|0.5||||
-NWire_Pin|pin@41||34|0.5||||
 NWire_Pin|pin@42||-18|0.5||||
 NWire_Pin|pin@58||-6.5|9.5||||
 NWire_Pin|pin@59||-18|7.5||||
@@ -1441,14 +1438,12 @@ NWire_Pin|pin@61||-1|-10||||
 NWire_Pin|pin@64||-1|7.5||||
 NWire_Pin|pin@76||-6.5|-4||||
 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-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
-Awire|net@100|||1800|pin@38||21.5|0.5|pin@41||34|0.5
+NWire_Pin|pin@78||4.5|13.5||||
+NWire_Pin|pin@80||-6.5|0.5||||
+IredFive:pms3a;1{ic}|pms3a@1||-6.5|21.5|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-3.75;Y3;)S1
+IpredCond3;1{ic}|predCond@3||40|6|||D5G4;
+IpredCond3;2{ic}|predCond@4||40|21|||D5G4;|ATTR_X(D5G1;NPX-0.25;Y-6.75;)S@X
+IpredCond3;2{ic}|predCond@6||40|-9.5|||D5G4;|ATTR_X(D5G1;NOLPY-7;)S@X
 Awire|net@103|||2700|pin@29||-18|-6|pin@42||-18|0.5
 Awire|net@105|||1800|conn@0|y|-21|0.5|pin@42||-18|0.5
 Awire|net@146|||1800|PMOS@0|s|-7.5|9.5|pin@58||-6.5|9.5
@@ -1457,26 +1452,27 @@ Awire|net@150|||2700|pin@42||-18|0.5|pin@59||-18|7.5
 Awire|net@151|||0|PMOS@0|g|-10.5|7.5|pin@59||-18|7.5
 Awire|net@153|||1800|PMOS@0|d|-7.5|5.5|pin@60||-6.5|5.5
 Awire|net@154|||1800|pin@60||-6.5|5.5|PMOS@1|d|-5.5|5.5
-Awire|net@155|||2700|pin@36||-6.5|0.5|pin@60||-6.5|5.5
-Awire|net@156|||0|conn@4|y|7.5|-10|pin@61||-1|-10
+Awire|net@156|||0|conn@4|y|4|-10|pin@61||-1|-10
 Awire|net@161|||0|pin@64||-1|7.5|PMOS@1|g|-2.5|7.5
 Awire|net@171|||900|pin@64||-1|7.5|pin@61||-1|-10
-Awire|net@183|||900|pin@36||-6.5|0.5|pin@76||-6.5|-4
 Awire|net@184|||1800|pin@29||-18|-6|pin@77||-11|-6
 Awire|net@186|||2700|nms2b@0|d|-6.5|-4|pin@76||-6.5|-4
 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|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@198|||900|conn@5|y|4.5|13.5|pin@78||4.5|13.5
+Awire|net@199|||1800|pms3a@1|g3|-3.5|13.5|pin@78||4.5|13.5
 Awire|net@200|||1800|conn@7|y|-13|21.5|pms3a@1|g|-9.5|21.5
+Awire|net@206|||900|pin@60||-6.5|5.5|pin@80||-6.5|0.5
+Awire|net@207|||900|pin@80||-6.5|0.5|pin@76||-6.5|-4
+Awire|net@208|||0|conn@2|a|4.25|0.5|pin@80||-6.5|0.5
 Econd||D6G2;X-5;|conn@4|a|I
+Enot_keep_up[1]|disable[1]|D5G2;X-5;|conn@5|a|I
+Enot_keep_up[2]|disable[2]|D5G2;X-5;|conn@6|a|I
+Enot_keep_up[3]|disable[3]|D5G2;X-5;|conn@7|a|I
 Efire||D4G2;|conn@0|a|I
-Enot_keep_up[1]||D5G2;X-7.5;|conn@5|a|I
-Enot_keep_up[2]||D5G2;X-8;|conn@6|a|I
-Enot_keep_up[3]||D5G2;X-8;|conn@7|a|I
-Estate||D4G2;|conn@2|a|B
+Estate||D4G2;X9.5;|conn@2|a|O
 X
 
 # Cell succCond;2{ic}
The FleetCode -- http://fleet.cs.berkeley.edu/