projects / fleet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c5a69e2)
removed unnecessary delay on driver input, resized transistors and used low-threshold...
authorAdam Megacz <adam.megacz@sun.com>
Tue, 21 Jul 2009 00:54:22 +0000 (00:54 +0000)
committerAdam Megacz <adam.megacz@sun.com>
Tue, 21 Jul 2009 00:54:22 +0000 (00:54 +0000)
electric/omegaCounter.jelib patch | blob | history

diff --git a/electric/omegaCounter.jelib b/electric/omegaCounter.jelib
index 5320433..66ce661 100644 (file)
--- a/electric/omegaCounter.jelib
+++ b/electric/omegaCounter.jelib
@@ -313,7 +313,7 @@ Efire[1]|fireHI|D5G1;RX1.5;|pin@16||O
 X
 
 # Cell fire;1{sch}
-Cfire;1{sch}||schematic|1247526811643|1248134738910||ATTR_X(D5G1;HNOLPX-57;Y31.5;)S20
+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
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@2||-41|8|||XYRR|
@@ -325,8 +325,8 @@ NOff-Page|conn@14||-1.5|-19|||YRRR|
 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;
-IredFive:nms1;2{ic}|nms1@0||-16.5|12|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-0.5;Y-4.25;)S1.5*@X
-IredFive:nms2a;2{ic}|nms2a@1||-28.5|8|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-1;Y-6;)S1.5*@X
+IredFive:nms1;2{ic}|nms1@0||-16.5|12|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-0.5;Y-4.25;)S2*@X
+IredFive:nms2a;2{ic}|nms2a@1||-28.5|8|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-1;Y-6;)S@X
 IredFive:nms3a;1{ic}|nms3a@1||-7|4|X||D5G4;|ATTR_X(D5G1.5;NOLPX1;Y-8;)S0.6*@X
 NWire_Pin|pin@66||-1.5|30||||
 NWire_Pin|pin@67||-1.5|4||||
@@ -352,10 +352,10 @@ NWire_Pin|pin@91||-12|12||||
 NWire_Pin|pin@92||-12|21||||
 NWire_Pin|pin@93||-12|16.5||||
 NWire_Pin|pin@94||-7|16.5||||
-Ngeneric:Invisible-Pin|pin@96||-52.5|-4|||||ART_message(D5G1;)S[pull-downs are 50% more powerful than normally,required in order to cut down on the amount of,buffering required for inputs to conditional state wire drivers]
+Ngeneric:Invisible-Pin|pin@96||10|37.5|||||ART_message(D5G1;)S[these pullups and the pull-down they drive,are extra-powerful in order to ensure,that the fire signal goes away promptly.]
 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;)S0.6*@X
-IredFive:pms1;2{ic}|pms1@2||9|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
 Awire|net@169|||1800|pms1@0|g|-4|30|pin@66||-1.5|30
@@ -564,32 +564,30 @@ Edisable|disableLO|D5G2;X-2;Y-2;|pin@38||I
 X
 
 # Cell oneBit;1{sch}
-ConeBit;1{sch}||schematic|1242942044308|1248135089045|
+ConeBit;1{sch}||schematic|1242942044308|1248137636733|
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@0||1.5|17.5||||
 NOff-Page|conn@1||-87|19.5|||RR|
 NOff-Page|conn@2||-86|55||||
 NOff-Page|conn@3||2|61||||
 NOff-Page|conn@8||-18|41.5|||RR|
-Ifire;3{ic}|fireIvan@3||-28|48|||D5G4;|ATTR_X(D5G2;NOLPX6.25;Y2;)S10
+Ifire;3{ic}|fireIvan@3||-28|48|||D5G4;|ATTR_X(D5G2;NOLPX6.25;Y2;)S8
 IredFive:inv;1{ic}|inv@9||-66.5|48.5|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPY-2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@22||-66.5|14.5|RR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@33||-66.5|18.5|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-4;Y-1.5;)S4|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@34||-66.5|53|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPY-3;)S4|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@35||-61.5|66.5|RR||D0G4;|ATTR_X(D5G1.5;NPX-3;Y-3;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@37||-17|14.5|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y-2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@38||-61.5|23|X||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@39||-66.5|23|X||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@40||-51.5|49.5|X||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@42||-51.5|23|X||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@43||-56.5|23|X||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@44||-66.5|44|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPY-2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@45||-61.5|62|X||D0G4;|ATTR_X(D5G1.5;NPX-3;Y1.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@46||-66.5|62|X||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@47||-56.5|49.5|X||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@48||-17|21.5|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX2;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:invLT;1{ic}|invLT@0||-66.5|18.5|RR||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX-4;Y-1.5;)S4|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:invLT;1{ic}|invLT@1||-66.5|53|RR||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPY-3;)S4|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:nand2;1{ic}|nand2@1||-66.5|67.5|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-1.5;Y3;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:nand2LT;1{ic}|nand2LT@0||-9|72.5|YRR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX4;Y2;)S2|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:nand2LT;1{ic}|nand2LT@0||-9|72.5|YRR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX4;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:nor2n;1{ic}|nor2n@0||-61.5|48.5|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX1;Y-2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IoneBit;1{ic}|oneBitIv@0||-109|69.5|||D5G4;
 Ngeneric:Invisible-Pin|pin@6||-84|110.5|||||ART_message(D5G15;)SoneBit
@@ -676,6 +674,8 @@ NWire_Pin|pin@719||-43|23||||
 NWire_Pin|pin@720||-82|49.5||||
 NWire_Pin|pin@723||-54|14.5||||
 NWire_Pin|pin@724||-64|14.5||||
+NWire_Pin|pin@725||-59|23||||
+NWire_Pin|pin@726||-49|23||||
 IpredCond;1{ic}|predCond@4||-9|61|||D5G4;|ATTR_X(D5G2;NPX0.75;Y-5.25;)S8
 IpredCond;1{ic}|predCond@7||-75|61|YRR||D5G4;|ATTR_X(D5G2;NPX2.25;Y-5.25;)S8
 IpredCond;2{ic}|predCond@10||-9|17.5|||D5G4;|ATTR_X(D5G2;NPX0.25;Y-5.25;)S8
@@ -704,11 +704,11 @@ Awire|net@1339|||1800|sucDri20@1|in|-72|50.5|pin@608||-72|50.5
 Awire|net@1370|||0|succCond@0|state|-76.5|19.5|pin@623||-82|19.5
 Awire|net@1371|||0|pin@623||-82|19.5|conn@1|a|-85|19.5
 Awire|net@1372|||2700|pin@622||-82|9|pin@623||-82|19.5
-Awire|net@1375|||1800|inv@34|in|-64|53|pin@625||-62.5|53
+Awire|net@1375|||1800|invLT@1|in|-64|53|pin@625||-62.5|53
 Awire|net@1376|||0|pin@575||-27.75|58|pin@626||-62.5|58
 Awire|net@1378|||2700|pin@625||-62.5|53|pin@626||-62.5|58
 Awire|net@1384|||0|pin@627||-70|20.5|succCond@0|cond|-71.5|20.5
-Awire|net@1385|||0|inv@33|out|-69|18.5|succCond@0|in|-71.5|18.5
+Awire|net@1385|||0|invLT@0|out|-69|18.5|succCond@0|in|-71.5|18.5
 Awire|net@1393|||0|pin@631||-82|55|conn@2|y|-84|55
 Awire|net@1395|||900|pin@492||-2.5|73.5|pin@632||-2.5|33
 Awire|net@1407|||0|pin@633||-46|66.5|inv@35|in|-59|66.5
@@ -719,8 +719,6 @@ Awire|net@1439|||0|pin@572||-70|15.5|succCond@0|keep_down|-73.25|15.5
 Awire|net@1451|||0|inv@39|in|-64|23|inv@38|out|-64|23
 Awire|net@1452|||0|inv@39|out|-69|23|pin@649||-70|23
 Awire|net@1458|||0|inv@40|out|-54|49.5|inv@47|in|-54|49.5
-Awire|net@1464|||0|inv@43|out|-59|23|inv@38|in|-59|23
-Awire|net@1465|||0|inv@42|out|-54|23|inv@43|in|-54|23
 Awire|net@1471|||900|pin@505||-70.5|46|pin@657||-70.5|44
 Awire|net@1473|||0|inv@44|out|-69|44|pin@657||-70.5|44
 Awire|net@1474|||900|pin@636||-43|45|pin@658||-43|44
@@ -747,7 +745,7 @@ Awire|net@1514|||1800|inv@45|in|-59|62|pin@666||-47.5|62
 Awire|net@1515|||1800|inv@40|in|-49|49.5|pin@667||-47.5|49.5
 Awire|net@1516|||1800|pin@667||-47.5|49.5|pin@653||-43|49.5
 Awire|net@1517|||900|pin@666||-47.5|62|pin@667||-47.5|49.5
-Awire|net@1518|||0|inv@34|out|-69|53|pin@668||-70.5|53
+Awire|net@1518|||0|invLT@1|out|-69|53|pin@668||-70.5|53
 Awire|net@1519|||900|pin@668||-70.5|53|pin@669||-70.5|50.5
 Awire|net@1520|||0|pin@669||-70.5|50.5|pin@608||-72|50.5
 Awire|net@1521|||2700|pin@627||-70|20.5|pin@649||-70|23
@@ -765,7 +763,7 @@ Awire|net@1533|||2700|pin@676||-14|58|pin@677||-14|60
 Awire|net@1534|||1800|pin@677||-14|60|predCond@4|in[1]|-12|60
 Awire|net@1552|||0|pin@575||-27.75|58|pin@682||-34.5|58
 Awire|net@1553|||1800|pin@682||-34.5|58|pin@676||-14|58
-Awire|net@1554|||1800|inv@33|in|-64|18.5|pin@683||-34.5|18.5
+Awire|net@1554|||1800|invLT@0|in|-64|18.5|pin@683||-34.5|18.5
 Awire|net@1555|||1800|pin@683||-34.5|18.5|predCond@10|fire|-12|18.5
 Awire|net@1556|||900|pin@682||-34.5|58|pin@683||-34.5|18.5
 Awire|net@1559|||0|pin@632||-2.5|33|pin@664||-5|33
@@ -790,7 +788,6 @@ Awire|net@1654|||1800|pin@714||-33|62|pin@713||-23|62
 Awire|net@1657|||0|inv@37|in|-19.5|14.5|pin@716||-19.5|14.5
 Awire|net@1660|||900|pin@597||-43|14.5|pin@639||-43|9
 Awire|net@1661|||0|inv@37|in|-19.5|14.5|pin@597||-43|14.5
-Awire|net@1662|||1800|inv@42|in|-49|23|pin@717||-48.5|23
 Awire|net@1666|||0|pin@719||-43|23|pin@717||-48.5|23
 Awire|net@1668|||900|pin@688||-43|41.5|pin@719||-43|23
 Awire|net@1669|||0|sucDri20@1|succ|-77|49.5|pin@720||-82|49.5
@@ -799,6 +796,9 @@ Awire|net@1673|||1800|pin@691||-24|41.5|conn@8|y|-20|41.5
 Awire|net@1674|||0|pin@597||-43|14.5|pin@723||-54|14.5
 Awire|net@1675|||0|inv@22|in|-64|14.5|pin@724||-64|14.5
 Awire|net@1676|||0|pin@723||-54|14.5|inv@22|in|-64|14.5
+Awire|net@1677|||0|inv@38|in|-59|23|pin@725||-59|23
+Awire|net@1678|||0|pin@717||-48.5|23|pin@726||-49|23
+Awire|net@1679|||1800|inv@38|in|-59|23|pin@726||-49|23
 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/