projects / fleet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2059de8)
more logic refactoring
authorAdam Megacz <adam.megacz@sun.com>
Tue, 21 Jul 2009 01:30:39 +0000 (01:30 +0000)
committerAdam Megacz <adam.megacz@sun.com>
Tue, 21 Jul 2009 01:30:39 +0000 (01:30 +0000)
electric/omegaCounter.jelib patch | blob | history

diff --git a/electric/omegaCounter.jelib b/electric/omegaCounter.jelib
index fb0b28b..ef24397 100644 (file)
--- a/electric/omegaCounter.jelib
+++ b/electric/omegaCounter.jelib
@@ -626,7 +626,7 @@ Edisable|disableLO|D5G2;X-2;Y-2;|pin@38||I
 X
 
 # Cell oneBit;1{sch}
-ConeBit;1{sch}||schematic|1242942044308|1248139502448|
+ConeBit;1{sch}||schematic|1242942044308|1248139822099|
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@0||1.5|17.5||||
 NOff-Page|conn@1||-87|19.5|||RR|
@@ -635,18 +635,15 @@ 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;)S8
 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@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@44||-66.5|44|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-0.5;Y-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@48||-17|21.5|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX2;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@49||-60|47.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@50||-54|49.5|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPY-2.5;)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:inv;1{ic}|inv@49||-55|47.5|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@50||-49.5|49.5|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPY-2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:invLT;1{ic}|invLT@0||-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:invLT;1{ic}|invLT@1||-66.5|53|RR||D5G4;|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:nand2;1{ic}|nand2@2||-66.5|48.5|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX1;Y-2.5;)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;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
@@ -688,14 +685,12 @@ NWire_Pin|pin@627||-70|20.5||||
 NWire_Pin|pin@630||-82|72.5||||
 NWire_Pin|pin@631||-82|55||||
 NWire_Pin|pin@632||-2.5|33||||
-NWire_Pin|pin@633||-46|66.5||||
 NWire_Pin|pin@636||-43|45||||
 NWire_Pin|pin@637||-43|69||||
 NWire_Pin|pin@638||-43|72.5||||
 NWire_Pin|pin@639||-43|9||||
 NWire_Pin|pin@640||-46|33||||
 NWire_Pin|pin@649||-70|23|||RRR|
-NWire_Pin|pin@653||-43|49.5||||
 NWire_Pin|pin@657||-70.5|44||||
 NWire_Pin|pin@658||-43|44||||
 NWire_Pin|pin@659||-82|33||||
@@ -704,8 +699,6 @@ NWire_Pin|pin@661||-82|61||||
 NWire_Pin|pin@662||-22.5|21.5||||
 NWire_Pin|pin@663||-22.5|33||||
 NWire_Pin|pin@664||-5|33||||
-NWire_Pin|pin@666||-47.5|62||||
-NWire_Pin|pin@667||-47.5|49.5||||
 NWire_Pin|pin@668||-70.5|53||||
 NWire_Pin|pin@669||-70.5|50.5||||
 NWire_Pin|pin@670||-13|14.5||||
@@ -735,9 +728,17 @@ 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||||
-NWire_Pin|pin@728||-49|49.5||||
 NWire_Pin|pin@729||-69|48.5||||
 NWire_Pin|pin@730||-46|47.5||||
+NWire_Pin|pin@731||-64|62||||
+NWire_Pin|pin@732||-60|62||||
+NWire_Pin|pin@733||-60|49.5||||
+NWire_Pin|pin@736||-52.5|44||||
+NWire_Pin|pin@737||-52.5|49.5||||
+NWire_Pin|pin@738||-43|49.5||||
+NWire_Pin|pin@739||-64|66.5||||
+NWire_Pin|pin@740||-59|66.5||||
+NWire_Pin|pin@741||-59|47.5||||
 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
@@ -771,22 +772,15 @@ Awire|net@1384|||0|pin@627||-70|20.5|succCond@0|cond|-71.5|20.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
-Awire|net@1408|||1800|nand2@1|ina|-64|66.5|inv@35|out|-64|66.5
 Awire|net@1431|||2700|pin@637||-43|69|pin@638||-43|72.5
 Awire|net@1434|||1800|pin@622||-82|9|pin@639||-43|9
 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@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
-Awire|net@1475|||2700|pin@658||-43|44|pin@653||-43|49.5
-Awire|net@1476|||1800|inv@44|in|-64|44|pin@658||-43|44
-Awire|net@1481|||0|inv@45|out|-64|62|inv@46|in|-64|62
 Awire|net@1484|||0|pin@640||-46|33|pin@659||-82|33
 Awire|net@1485|||2700|pin@623||-82|19.5|pin@659||-82|33
-Awire|net@1487|||2700|pin@653||-43|49.5|pin@660||-43|68.5
 Awire|net@1488|||2700|pin@660||-43|68.5|pin@637||-43|69
 Awire|net@1489|||1800|nand2@1|inb|-64|68.5|pin@660||-43|68.5
 Awire|net@1491|||900|pin@630||-82|72.5|pin@661||-82|61
@@ -799,9 +793,6 @@ Awire|net@1505|||0|inv@48|in|-19.5|21.5|pin@662||-22.5|21.5
 Awire|net@1506|||2700|pin@662||-22.5|21.5|pin@663||-22.5|33
 Awire|net@1507|||2700|pin@308||-5|17.5|pin@664||-5|33
 Awire|net@1509|||1800|pin@663||-22.5|33|pin@664||-5|33
-Awire|net@1514|||1800|inv@45|in|-59|62|pin@666||-47.5|62
-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|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
@@ -834,7 +825,6 @@ Awire|net@1570|||0|pin@687||-30.75|41.5|pin@688||-43|41.5
 Awire|net@1572|||900|fireIvan@3|MSN[ZeroOrDone]|-28.75|45.5|pin@689||-28.75|33
 Awire|net@1573|||1800|pin@640||-46|33|pin@689||-28.75|33
 Awire|net@1575|||900|fireIvan@3|disableLO|-24|46|pin@691||-24|41.5
-Awire|net@1646|||900|pin@633||-46|66.5|pin@710||-46|62
 Awire|net@1652|||0|predCond@4|cond|-12|62|pin@713||-23|62
 Awire|net@1653|||1800|pin@710||-46|62|pin@714||-33|62
 Awire|net@1654|||1800|pin@714||-33|62|pin@713||-23|62
@@ -852,15 +842,27 @@ 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
-Awire|net@1685|||0|pin@667||-47.5|49.5|pin@728||-49|49.5
 Awire|net@1691|||1800|sucDri20@1|cond|-72|48.5|pin@729||-69|48.5
 Awire|net@1693|||1800|nand2@2|out|-69|48.5|pin@729||-69|48.5
-Awire|net@1695|||0|inv@49|out|-62.5|47.5|nand2@2|inb|-64|47.5
-Awire|net@1696|||0|inv@50|out|-56.5|49.5|nand2@2|ina|-64|49.5
-Awire|net@1697|||1800|inv@50|in|-51.5|49.5|pin@728||-49|49.5
 Awire|net@1698|||2700|pin@640||-46|33|pin@730||-46|47.5
 Awire|net@1699|||2700|pin@730||-46|47.5|pin@710||-46|62
-Awire|net@1700|||1800|inv@49|in|-57.5|47.5|pin@730||-46|47.5
+Awire|net@1700|||1800|inv@49|in|-52.5|47.5|pin@730||-46|47.5
+Awire|net@1701|||0|inv@46|in|-64|62|pin@731||-64|62
+Awire|net@1703|||1800|inv@46|in|-64|62|pin@732||-60|62
+Awire|net@1705|||0|pin@733||-60|49.5|nand2@2|ina|-64|49.5
+Awire|net@1706|||900|pin@732||-60|62|pin@733||-60|49.5
+Awire|net@1709|||1800|pin@657||-70.5|44|pin@736||-52.5|44
+Awire|net@1710|||0|inv@50|out|-52|49.5|pin@737||-52.5|49.5
+Awire|net@1711|||0|pin@737||-52.5|49.5|pin@733||-60|49.5
+Awire|net@1712|||2700|pin@736||-52.5|44|pin@737||-52.5|49.5
+Awire|net@1714|||2700|pin@658||-43|44|pin@738||-43|49.5
+Awire|net@1715|||2700|pin@738||-43|49.5|pin@660||-43|68.5
+Awire|net@1716|||1800|inv@50|in|-47|49.5|pin@738||-43|49.5
+Awire|net@1717|||0|nand2@1|ina|-64|66.5|pin@739||-64|66.5
+Awire|net@1718|||1800|nand2@1|ina|-64|66.5|pin@740||-59|66.5
+Awire|net@1719|||0|inv@49|out|-57.5|47.5|pin@741||-59|47.5
+Awire|net@1720|||0|pin@741||-59|47.5|nand2@2|inb|-64|47.5
+Awire|net@1721|||900|pin@740||-59|66.5|pin@741||-59|47.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/