From cdb6464651cde9e3bccd0de017408c5fbf392037 Mon Sep 17 00:00:00 2001 From: Adam Megacz Date: Tue, 21 Jul 2009 01:34:42 +0000 Subject: [PATCH] even yet more logic refactoring --- electric/omegaCounter.jelib | 128 ++++++++++++++++++------------------------- 1 file changed, 53 insertions(+), 75 deletions(-) diff --git a/electric/omegaCounter.jelib b/electric/omegaCounter.jelib index ef24397..3661a3f 100644 --- 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|1248139822099| +ConeBit;1{sch}||schematic|1242942044308|1248140073253| Ngeneric:Facet-Center|art@0||0|0||||AV NOff-Page|conn@0||1.5|17.5|||| NOff-Page|conn@1||-87|19.5|||RR| @@ -634,18 +634,14 @@ 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;)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@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@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@39||-57.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@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||-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:inv;1{ic}|inv@49||-55.5|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|49.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@51||-71|8.5|||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1 +IredFive:invLT;1{ic}|invLT@0||-45|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: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:nand2;1{ic}|nand2@2||-65|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 IoneBit;1{ic}|oneBitIv@0||-109|69.5|||D5G4; Ngeneric:Invisible-Pin|pin@6||-84|110.5|||||ART_message(D5G15;)SoneBit @@ -672,37 +668,27 @@ NWire_Pin|pin@505||-70.5|46|||| NWire_Pin|pin@549||-2.5|37|||| NWire_Pin|pin@564||-72|63.5|||| NWire_Pin|pin@565||-72|63.5|||| -NWire_Pin|pin@572||-70|15.5|||| NWire_Pin|pin@575||-27.75|58|||| -NWire_Pin|pin@597||-43|14.5|||| -NWire_Pin|pin@598||-70|14.5|||| NWire_Pin|pin@608||-72|50.5|||| NWire_Pin|pin@622||-82|9|||| NWire_Pin|pin@623||-82|19.5|||| -NWire_Pin|pin@625||-62.5|53|||| -NWire_Pin|pin@626||-62.5|58|||| 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@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@657||-70.5|44|||| -NWire_Pin|pin@658||-43|44|||| NWire_Pin|pin@659||-82|33|||| NWire_Pin|pin@660||-43|68.5|||| 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@668||-70.5|53|||| -NWire_Pin|pin@669||-70.5|50.5|||| -NWire_Pin|pin@670||-13|14.5|||| -NWire_Pin|pin@671||-13|16.5|||| +NWire_Pin|pin@668||-68.5|42|||| +NWire_Pin|pin@669||-68.5|50.5|||| NWire_Pin|pin@672||-70|67.5|||| NWire_Pin|pin@673||-70|65|||| NWire_Pin|pin@674||-70|60|||| @@ -720,25 +706,29 @@ NWire_Pin|pin@691||-24|41.5|||| NWire_Pin|pin@710||-46|62|||| NWire_Pin|pin@713||-23|62|||| NWire_Pin|pin@714||-33|62|||| -NWire_Pin|pin@716||-19.5|14.5|||| -NWire_Pin|pin@717||-48.5|23|||| -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|||| 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|||| +NWire_Pin|pin@743||-52.5|23|||| +NWire_Pin|pin@747||-64|14.5|||| +NWire_Pin|pin@748||-81.5|8.5|||| +NWire_Pin|pin@749||-42.5|15.5|||| +NWire_Pin|pin@750||-42.5|16.5|||| +NWire_Pin|pin@751||-42.5|8.5|||| +NWire_Pin|pin@752||-69|62|||| +NWire_Pin|pin@753||-64|62|||| +NWire_Pin|pin@754||-61.5|62|||| +NWire_Pin|pin@755||-61.5|23|||| +NWire_Pin|pin@758||-63|42|||| +NWire_Pin|pin@759||-63|18.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 @@ -759,26 +749,15 @@ Awire|net@1167|||1800|pin@549||-2.5|37|pin@305||-2.5|37 Awire|net@1208|||1800|pin@564||-72|63.5|pin@565||-72|63.5 Awire|net@1271|||1800|pin@308||-5|17.5|conn@0|a|-0.5|17.5 Awire|net@1275|||0|conn@3|a|0|61|pin@312||-5|61 -Awire|net@1305|||2700|pin@598||-70|14.5|pin@572||-70|15.5 -Awire|net@1306|||0|inv@22|out|-69|14.5|pin@598||-70|14.5 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|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|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@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@1474|||900|pin@636||-43|45|pin@658||-43|44 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@1488|||2700|pin@660||-43|68.5|pin@637||-43|69 @@ -786,32 +765,26 @@ 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 Awire|net@1492|||900|pin@661||-82|61|pin@631||-82|55 Awire|net@1493|||0|pin@380||-80|61|pin@661||-82|61 -Awire|net@1497|||0|inv@46|out|-69|62|predCond@7|cond|-72|62 Awire|net@1501|||1800|pin@630||-82|72.5|pin@638||-43|72.5 Awire|net@1504|||0|predCond@10|not_keep_up|-11.5|21.5|inv@48|out|-14.5|21.5 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@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@1519|||2700|pin@668||-68.5|42|pin@669||-68.5|50.5 +Awire|net@1520|||0|pin@669||-68.5|50.5|pin@608||-72|50.5 Awire|net@1521|||2700|pin@627||-70|20.5|pin@649||-70|23 -Awire|net@1522|||1800|inv@37|out|-14.5|14.5|pin@670||-13|14.5 -Awire|net@1523|||2700|pin@670||-13|14.5|pin@671||-13|16.5 -Awire|net@1524|||1800|pin@671||-13|16.5|predCond@10|cond|-12|16.5 Awire|net@1525|||0|nand2@1|out|-69|67.5|pin@672||-70|67.5 Awire|net@1526|||900|pin@672||-70|67.5|pin@673||-70|65 Awire|net@1527|||0|pin@673||-70|65|predCond@7|not_state|-72.5|65 Awire|net@1528|||1800|predCond@7|in[1]|-72|60|pin@674||-70|60 Awire|net@1529|||900|pin@674||-70|60|pin@675||-70|58 -Awire|net@1530|||0|pin@626||-62.5|58|pin@675||-70|58 Awire|net@1531|||2700|fireIvan@3|fireHI|-27.75|54|pin@575||-27.75|58 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|invLT@0|in|-64|18.5|pin@683||-34.5|18.5 +Awire|net@1554|||1800|invLT@0|in|-42.5|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 @@ -820,7 +793,6 @@ Awire|net@1561|||900|fireIvan@3|LSN[ZeroOrDone]|-25.5|46|pin@684||-25.5|33 Awire|net@1562|||0|pin@479||-5|36.5|pin@685||-27|36.5 Awire|net@1563|||900|fireIvan@3|LSN[ZeroOrTwo]|-27|46|pin@685||-27|36.5 Awire|net@1567|||900|fireIvan@3|MSN[ZeroOrTwo]|-30.75|45.5|pin@687||-30.75|41.5 -Awire|net@1568|||900|pin@658||-43|44|pin@688||-43|41.5 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 @@ -828,41 +800,47 @@ Awire|net@1575|||900|fireIvan@3|disableLO|-24|46|pin@691||-24|41.5 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 -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@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 Awire|net@1670|||900|pin@631||-82|55|pin@720||-82|49.5 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 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@1693|||0|nand2@2|out|-67.5|48.5|pin@729||-69|48.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|-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@1700|||1800|inv@49|in|-53|47.5|pin@730||-46|47.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@1710|||0|inv@50|out|-51.5|49.5|pin@737||-52.5|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@1716|||1800|inv@50|in|-46.5|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@1719|||0|inv@49|out|-58|47.5|pin@741||-59|47.5 +Awire|net@1720|||0|pin@741||-59|47.5|nand2@2|inb|-62.5|47.5 Awire|net@1721|||900|pin@740||-59|66.5|pin@741||-59|47.5 +Awire|net@1722|||2700|pin@688||-43|41.5|pin@738||-43|49.5 +Awire|net@1724|||900|pin@736||-52.5|44|pin@743||-52.5|23 +Awire|net@1729|||0|pin@724||-64|14.5|pin@747||-64|14.5 +Awire|net@1730|||0|inv@51|in|-73.5|8.5|pin@748||-81.5|8.5 +Awire|net@1731|||3150|pin@748||-81.5|8.5|pin@622||-82|9 +Awire|net@1732|||1800|succCond@0|keep_down|-73.25|15.5|pin@749||-42.5|15.5 +Awire|net@1733|||2700|pin@749||-42.5|15.5|pin@750||-42.5|16.5 +Awire|net@1734|||0|predCond@10|cond|-12|16.5|pin@750||-42.5|16.5 +Awire|net@1735|||1800|inv@51|out|-68.5|8.5|pin@751||-42.5|8.5 +Awire|net@1736|||900|pin@749||-42.5|15.5|pin@751||-42.5|8.5 +Awire|net@1737|||1800|nand2@2|ina|-62.5|49.5|pin@737||-52.5|49.5 +Awire|net@1738|||1800|predCond@7|cond|-72|62|pin@752||-69|62 +Awire|net@1739|||0|pin@731||-64|62|pin@753||-64|62 +Awire|net@1740|||1800|pin@752||-69|62|pin@754||-61.5|62 +Awire|net@1741|||0|inv@39|out|-60|23|pin@755||-61.5|23 +Awire|net@1742|||0|pin@755||-61.5|23|pin@649||-70|23 +Awire|net@1743|||900|pin@754||-61.5|62|pin@755||-61.5|23 +Awire|net@1744|||1800|inv@39|in|-55|23|pin@743||-52.5|23 +Awire|net@1747|||0|pin@575||-27.75|58|pin@675||-70|58 +Awire|net@1748|||1800|pin@668||-68.5|42|pin@758||-63|42 +Awire|net@1750|||1800|succCond@0|in|-71.5|18.5|pin@759||-63|18.5 +Awire|net@1751|||1800|pin@759||-63|18.5|invLT@0|out|-47.5|18.5 +Awire|net@1752|||900|pin@758||-63|42|pin@759||-63|18.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 -- 1.7.10.4