From: Adam Megacz Date: Tue, 21 Jul 2009 00:09:58 +0000 (+0000) Subject: removed one stage of delay, changed disable to disableLO X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=1d57cda11e08b563983aa151856e80c8c30707ea;p=fleet.git removed one stage of delay, changed disable to disableLO --- diff --git a/electric/omegaCounter.jelib b/electric/omegaCounter.jelib index 17fd243..a832578 100644 --- a/electric/omegaCounter.jelib +++ b/electric/omegaCounter.jelib @@ -80,7 +80,7 @@ Eout||D5G2;|conn@0|y|O X # Cell fire;3{ic} -Cfire;3{ic}||artwork|1247529105994|1248130859819|E +Cfire;3{ic}||artwork|1247529105994|1248131451191|E|ATTR_X(D5G1;HNOLP)S20 Ngeneric:Facet-Center|art@0||0|0||||AV NThick-Circle|art@11||2.5|0|4|4|||ART_color()I10|ART_degrees()F[0.0,3.1415927] NThick-Circle|art@18||0.25|3|4.5|4|||ART_color()I10|ART_degrees()F[0.0,3.1415927] @@ -157,7 +157,7 @@ EfireHI||D5G1;RX2;|pin@16||O X # Cell fire;2{ic} -Cfire;2{ic}||artwork|1247529105994|1248130549686|E +Cfire;2{ic}||artwork|1247529105994|1248131451191|E|ATTR_X(D5G1;HNOLP)S20 Ngeneric:Facet-Center|art@0||0|0||||AV NThick-Circle|art@4||-1.75|1.5|1|1|R||ART_color()I10 NThick-Circle|art@11||2|0|4|4|||ART_color()I10|ART_degrees()F[0.0,3.1415927] @@ -238,7 +238,7 @@ EfireHI||D5G1;RX2;|pin@16||O X # Cell fire;1{ic} -Cfire;1{ic}||artwork|1247529105994|1248130315089|E +Cfire;1{ic}||artwork|1247529105994|1248131451191|E|ATTR_X(D5G1;HNOLP)S20 Ngeneric:Facet-Center|art@0||0|0||||AV NThick-Circle|art@4||2|0.5|1|1|R||ART_color()I10 NThick-Circle|art@11||2|-2|4|4|||ART_color()I10|ART_degrees()F[0.0,3.1415927] @@ -313,7 +313,7 @@ Efire[1]|fireHI|D5G1;RX1.5;|pin@16||O X # Cell fire;1{sch} -Cfire;1{sch}||schematic|1247526811643|1248130870691| +Cfire;1{sch}||schematic|1247526811643|1248134738910||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,9 +325,9 @@ 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;)S@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.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;)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: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|||| NWire_Pin|pin@68||6|30|||| @@ -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@95||28.5|15|||||ART_message(D5G1;)S[Order of these is swapped because the fall,"of ZeroOrDone \"matters more\" (??)"] -IredFive:pms1;2{ic}|pms1@0||-7|30|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX0.75;Y3.5;)S0.5*@X -IredFive:pms1;2{ic}|pms1@1||1|30|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX0.75;Y3.5;)S0.5*@X -IredFive:pms1;2{ic}|pms1@2||9|30|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX0.75;Y3.5;)S0.5*@X +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] +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@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 @@ -533,7 +533,7 @@ EoutaBar||D5G2;X7.5;|conn@3|a|U X # Cell oneBit;1{ic} -ConeBit;1{ic}||artwork|1242937501096|1248130986199|E +ConeBit;1{ic}||artwork|1242937501096|1248134933359|E Ngeneric:Facet-Center|art@0||0|0||||AV NTriangle|art@2||3|2|3|2|R| NTriangle|art@3||3|-8|3|2|R| @@ -560,18 +560,18 @@ ELSN[ZeroOrDone]||D5G1;X5;|pin@17||B ELSN[ZeroOrTwo]||D6G1;X1;|pin@16||B EMSN[ZeroOrDone]||D4G1;X-1;|pin@18||B EMSN[ZeroOrTwo]||D4G1;X-1;|pin@9||B -Edisable||D5G2;X-2;Y-2;|pin@38||I +Edisable|disableLO|D5G2;X-2;Y-2;|pin@38||I X # Cell oneBit;1{sch} -ConeBit;1{sch}||schematic|1242942044308|1248130887422| +ConeBit;1{sch}||schematic|1242942044308|1248134938616| 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|49.5|||| +NOff-Page|conn@2||-86|55|||| NOff-Page|conn@3||2|61|||| -NOff-Page|conn@8||-11.5|41.5|||RR| -Ifire;3{ic}|fireIvan@3||-28|51|||D5G4; +NOff-Page|conn@8||-18|41.5|||RR| +Ifire;3{ic}|fireIvan@3||-28|48|||D5G4;|ATTR_X(D5G2;NOLPX6.25;Y2;)S10 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 @@ -588,11 +588,8 @@ IredFive:inv;1{ic}|inv@45||-61.5|62|X||D0G4;|ATTR_X(D5G1.5;NPX-3;Y1.5;)S1|ATTR_d 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:inv;1{ic}|inv@50||-18.5|41.5|RR||D0G4;|ATTR_X(D5G1.5;NPX1;Y2;)S8|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1 IredFive:inv;1{ic}|inv@62||-56.5|14.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@63||-61.5|14.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@64||-41|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@65||-46|23|X||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|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: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 @@ -608,7 +605,6 @@ Ngeneric:Invisible-Pin|pin@227||-64.5|4|||||ART_message(D4G1.5;)S[filled if ther Ngeneric:Invisible-Pin|pin@228||-64.5|76|||||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||-29.5|5|||||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)",ideally: if there is a One or a Zero on the left AFTER firing (hard)] Ngeneric:Invisible-Pin|pin@230||-30.5|80|||||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@293||-80|49.5|||| NWire_Pin|pin@305||-2.5|37|||| NWire_Pin|pin@308||-5|17.5|||| NWire_Pin|pin@312||-5|61|||| @@ -626,7 +622,6 @@ 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@601||-83.5|49.5|||| NWire_Pin|pin@608||-72|50.5|||| NWire_Pin|pin@622||-82|9|||| NWire_Pin|pin@623||-82|19.5|||| @@ -634,7 +629,7 @@ 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|49.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|||| @@ -674,13 +669,13 @@ NWire_Pin|pin@689||-28.75|33|||| NWire_Pin|pin@691||-24|41.5|||| NWire_Pin|pin@702||-58|47.5|||| NWire_Pin|pin@705||-46|47.5|||| -NWire_Pin|pin@706||-36.5|23|||| -NWire_Pin|pin@707||-36.5|27.5|||| -NWire_Pin|pin@708||-43|27.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|||| 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 @@ -703,11 +698,9 @@ 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@1319|||1800|pin@601||-83.5|49.5|pin@293||-80|49.5 Awire|net@1325|||0|inv@9|out|-69|48.5|sucDri20@1|cond|-72|48.5 Awire|net@1326|||0|nor2n@0|out|-64|48.5|inv@9|in|-64|48.5 Awire|net@1339|||1800|sucDri20@1|in|-72|50.5|pin@608||-72|50.5 -Awire|net@1355|||0|sucDri20@1|succ|-77|49.5|pin@601||-83.5|49.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 @@ -716,8 +709,7 @@ 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@1392|||0|pin@293||-80|49.5|pin@631||-82|49.5 -Awire|net@1393|||0|pin@631||-82|49.5|conn@2|y|-84|49.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 @@ -742,7 +734,7 @@ 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 -Awire|net@1492|||900|pin@661||-82|61|pin@631||-82|49.5 +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 @@ -768,7 +760,7 @@ 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|57|pin@575||-27.75|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 @@ -778,29 +770,21 @@ 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 Awire|net@1560|||0|pin@663||-20|33|pin@684||-25.5|33 -Awire|net@1561|||900|fireIvan@3|LSN[ZeroOrDone]|-25.5|49|pin@684||-25.5|33 +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|49|pin@685||-27|36.5 -Awire|net@1567|||900|fireIvan@3|MSN[ZeroOrTwo]|-30.75|48.5|pin@687||-30.75|41.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|48.5|pin@689||-28.75|33 +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|49|pin@691||-24|41.5 -Awire|net@1576|||0|inv@50|out|-21|41.5|pin@691||-24|41.5 -Awire|net@1577|||0|conn@8|y|-13.5|41.5|inv@50|in|-16|41.5 +Awire|net@1575|||900|fireIvan@3|disableLO|-24|46|pin@691||-24|41.5 Awire|net@1618|||1800|nor2n@0|inb|-59|47.5|pin@702||-58|47.5 Awire|net@1624|||1800|pin@702||-58|47.5|pin@705||-46|47.5 Awire|net@1625|||2700|pin@640||-46|33|pin@705||-46|47.5 Awire|net@1626|||0|inv@62|out|-59|14.5|inv@63|in|-59|14.5 Awire|net@1627|||0|inv@63|out|-64|14.5|inv@22|in|-64|14.5 Awire|net@1628|||1800|inv@62|in|-54|14.5|pin@597||-43|14.5 -Awire|net@1629|||0|inv@64|out|-43.5|23|inv@65|in|-43.5|23 -Awire|net@1630|||0|inv@65|out|-48.5|23|inv@42|in|-49|23 -Awire|net@1631|||1800|inv@64|in|-38.5|23|pin@706||-36.5|23 -Awire|net@1632|||2700|pin@706||-36.5|23|pin@707||-36.5|27.5 -Awire|net@1633|||900|pin@688||-43|41.5|pin@708||-43|27.5 -Awire|net@1635|||0|pin@707||-36.5|27.5|pin@708||-43|27.5 Awire|net@1646|||900|pin@633||-46|66.5|pin@710||-46|62 Awire|net@1647|||900|pin@710||-46|62|pin@705||-46|47.5 Awire|net@1652|||0|predCond@4|cond|-12|62|pin@713||-23|62 @@ -809,11 +793,17 @@ 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 +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 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 EMSN[ZeroOrTwo]||D5G2;X-10.5;|conn@2|a|B -Edisable||D5G2;X0.5;Y-2.5;|conn@8|a|I +Edisable|disableLO|D5G2;X-5.5;|conn@8|a|I X # Cell predCond;2{ic}