From a363bae4f267ae6fe5a3ea4eca6f2f33b4886e90 Mon Sep 17 00:00:00 2001 From: Adam Megacz Date: Tue, 21 Jul 2009 01:36:14 +0000 Subject: [PATCH] even yet more logic refactoring --- electric/omegaCounter.jelib | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/electric/omegaCounter.jelib b/electric/omegaCounter.jelib index 6ed1ab4..7872a11 100644 --- a/electric/omegaCounter.jelib +++ b/electric/omegaCounter.jelib @@ -626,19 +626,19 @@ Edisable|disableLO|D5G2;X-2;Y-2;|pin@38||I X # Cell oneBit;1{sch} -ConeBit;1{sch}||schematic|1242942044308|1248140109838| +ConeBit;1{sch}||schematic|1242942044308|1248140163268| Ngeneric:Facet-Center|art@0||0|0||||AV -NOff-Page|conn@0||1.5|17.5|||| +NOff-Page|conn@0||1.5|16.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;)S8 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@48||-17|20.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.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: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:invLT;1{ic}|invLT@0||-45|18.5|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-4;Y-1.5;)S8|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||-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 @@ -655,7 +655,7 @@ Ngeneric:Invisible-Pin|pin@228||-64.5|76|||||ART_message(D4G1.5;)S[filled if the 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@305||-2.5|37|||| -NWire_Pin|pin@308||-5|17.5|||| +NWire_Pin|pin@308||-5|16.5|||| NWire_Pin|pin@312||-5|61|||| NWire_Pin|pin@380||-80|61|||| NWire_Pin|pin@479||-5|36.5|||| @@ -682,7 +682,7 @@ NWire_Pin|pin@657||-70.5|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@662||-22.5|20.5|||| NWire_Pin|pin@663||-22.5|33|||| NWire_Pin|pin@664||-5|33|||| NWire_Pin|pin@668||-68.5|42|||| @@ -694,7 +694,7 @@ NWire_Pin|pin@675||-70|58|||| NWire_Pin|pin@676||-14|58|||| NWire_Pin|pin@677||-14|60|||| NWire_Pin|pin@682||-34.5|58|||| -NWire_Pin|pin@683||-34.5|18.5|||| +NWire_Pin|pin@683||-34.5|17.5|||| NWire_Pin|pin@684||-25.5|33|||| NWire_Pin|pin@685||-27|36.5|||| NWire_Pin|pin@687||-30.75|41.5|||| @@ -717,8 +717,6 @@ 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@749||-42.5|15.5|||| -NWire_Pin|pin@750||-42.5|16.5|||| NWire_Pin|pin@752||-69|62|||| NWire_Pin|pin@753||-64|62|||| NWire_Pin|pin@754||-61.5|62|||| @@ -726,12 +724,13 @@ NWire_Pin|pin@755||-61.5|23|||| NWire_Pin|pin@758||-63|42|||| NWire_Pin|pin@759||-63|18.5|||| NWire_Pin|pin@760||-52.5|15.5|||| +NWire_Pin|pin@762||-34.5|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 +IpredCond;2{ic}|predCond@10||-9|16.5|||D5G4;|ATTR_X(D5G2;NPX0.25;Y-5.25;)S8 IsuccCond;1{ic}|sucDri20@1||-75|49.5|YRR||D5G4;|ATTR_X(D5G2;NOLPX2.5;Y5;)S8 IsuccCond;2{ic}|succCond@0||-74.5|19.5|YRR||D5G4;|ATTR_X(D5G2;NOLPX1.5;Y6;)S8 -Awire|net@652|||1800|predCond@10|state|-6.5|17.5|pin@308||-5|17.5 +Awire|net@652|||1800|predCond@10|state|-6.5|16.5|pin@308||-5|16.5 Awire|net@765|||0|pin@312||-5|61|predCond@4|state[1]|-6.5|61 Awire|net@812|||0|predCond@7|state[1]|-77.5|61|pin@380||-80|61 Awire|net@1009|||0|predCond@4|not_state|-11.5|65|pin@482||-14|65 @@ -744,7 +743,7 @@ Awire|net@1047|||0|nand2LT@0|out|-11.5|72.5|pin@499||-14|72.5 Awire|net@1061|||1800|sucDri20@1|not_succ|-73.75|46|pin@505||-70.5|46 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@1271|||1800|pin@308||-5|16.5|conn@0|a|-0.5|16.5 Awire|net@1275|||0|conn@3|a|0|61|pin@312||-5|61 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 @@ -762,10 +761,10 @@ 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@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@1504|||0|predCond@10|not_keep_up|-11.5|20.5|inv@48|out|-14.5|20.5 +Awire|net@1505|||0|inv@48|in|-19.5|20.5|pin@662||-22.5|20.5 +Awire|net@1506|||2700|pin@662||-22.5|20.5|pin@663||-22.5|33 +Awire|net@1507|||2700|pin@308||-5|16.5|pin@664||-5|33 Awire|net@1509|||1800|pin@663||-22.5|33|pin@664||-5|33 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 @@ -780,9 +779,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|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@1555|||1800|pin@683||-34.5|17.5|predCond@10|fire|-12|17.5 Awire|net@1559|||0|pin@632||-2.5|33|pin@664||-5|33 Awire|net@1560|||0|pin@663||-22.5|33|pin@684||-25.5|33 Awire|net@1561|||900|fireIvan@3|LSN[ZeroOrDone]|-25.5|46|pin@684||-25.5|33 @@ -817,8 +814,6 @@ 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@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@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 @@ -833,8 +828,11 @@ 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 Awire|net@1753|||1800|succCond@0|keep_down|-73.25|15.5|pin@760||-52.5|15.5 -Awire|net@1754|||1800|pin@760||-52.5|15.5|pin@749||-42.5|15.5 Awire|net@1755|||900|pin@743||-52.5|23|pin@760||-52.5|15.5 +Awire|net@1757|||0|predCond@10|cond|-12|15.5|pin@760||-52.5|15.5 +Awire|net@1758|||900|pin@682||-34.5|58|pin@762||-34.5|18.5 +Awire|net@1759|||900|pin@762||-34.5|18.5|pin@683||-34.5|17.5 +Awire|net@1760|||1800|invLT@0|in|-42.5|18.5|pin@762||-34.5|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