speculative checkin

diff --git a/electric/omegaCounter.jelib b/electric/omegaCounter.jelib
index d51b34a..2f00de6 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|1248151872867|
+ConeBit;1{sch}||schematic|1242942044308|1248152204370|
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@0||1.5|16.5||||
 NOff-Page|conn@1||-87.5|19.5|||RR|
@@ -638,10 +638,11 @@ IredFive:inv;1{ic}|inv@39||-50|20.5|X||D0G4;|ATTR_X(D5G1.5;NPX-3.5;Y-1.5;)S1|ATT
 IredFive:inv;1{ic}|inv@49||-49.5|49.5|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX0.5;Y-3;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@50||-43|47.5|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPY3;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@51||11|56|XRR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@52||-10|43|X||D0G4;|ATTR_X(D5G1.5;NPX-3.5;Y-1.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@53||-10|50.5|X||D0G4;|ATTR_X(D5G1.5;NPX-3.5;Y-1.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:invLT;1{ic}|invLT@0||-32.5|61.5|R||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX0.5;Y3;)S8|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:nand2;1{ic}|nand2@2||-58.5|48.5|YRR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-0.5;Y3.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:nand2;1{ic}|nand2@3||-16.5|20.5|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-0.5;Y3.5;)S2|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:nand3;1{ic}|nand3@0||-9|72.5|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX4;Y2;)S2|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
 Ngeneric:Invisible-Pin|pin@149||-84.5|100|||||ART_message(D5G2;)Sam 13 Jul 2009
@@ -655,13 +656,8 @@ Ngeneric:Invisible-Pin|pin@228||-64.5|79.5|||||ART_message(D4G1.5;)S[filled if t
 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)"]
 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|16.5||||
-NWire_Pin|pin@312||-5|61||||
+NWire_Pin|pin@308||-2.5|16.5||||
 NWire_Pin|pin@479||-5|35||||
-NWire_Pin|pin@482||-14|65||||
-NWire_Pin|pin@491||-5|70.5||||
-NWire_Pin|pin@492||-2.5|72.5||||
-NWire_Pin|pin@499||-14|72.5||||
 NWire_Pin|pin@549||-2.5|37||||
 NWire_Pin|pin@564||-72|63.5||||
 NWire_Pin|pin@565||-72|63.5||||
@@ -676,7 +672,7 @@ NWire_Pin|pin@638||-38|77||||
 NWire_Pin|pin@640||-40|30||||
 NWire_Pin|pin@659||-82|30||||
 NWire_Pin|pin@663||-22.5|33||||
-NWire_Pin|pin@664||-5|33||||
+NWire_Pin|pin@664||-2.5|33||||
 NWire_Pin|pin@669||-62.5|50.5||||
 NWire_Pin|pin@684||-25.5|33||||
 NWire_Pin|pin@685||-27|35||||
@@ -702,10 +698,8 @@ NWire_Pin|pin@763||-27.5|17.5||||
 NWire_Pin|pin@764||-32.5|57||||
 NWire_Pin|pin@765||-27.75|57||||
 NWire_Pin|pin@766||-32.5|69.5||||
-NWire_Pin|pin@769||-22|62||||
-NWire_Pin|pin@770||-14|60||||
-NWire_Pin|pin@771||-14|30||||
-NWire_Pin|pin@772||3|74.5||||
+NWire_Pin|pin@770||-15.5|60||||
+NWire_Pin|pin@771||-15.5|30||||
 NWire_Pin|pin@775||-22.5|21.5||||
 NWire_Pin|pin@776||-30.5|19.5||||
 NWire_Pin|pin@784||-16|41.5||||
@@ -727,48 +721,48 @@ NWire_Pin|pin@815||-58|43.5||||
 NWire_Pin|pin@816||-53.5|15||||
 NWire_Pin|pin@817||-73.5|15||||
 NWire_Pin|pin@818||-53.5|13.5||||
+NWire_Pin|pin@819||-22|62||||
+NWire_Pin|pin@821||-24.5|69||||
+NWire_Pin|pin@822||-2.5|43||||
+NWire_Pin|pin@823||-14|43||||
+NWire_Pin|pin@824||-14|65||||
+NWire_Pin|pin@825||-5|50.5||||
+NWire_Pin|pin@826||-17.5|50.5||||
+NWire_Pin|pin@827||-17.5|67||||
+NWire_Pin|pin@832||-5|61||||
 IpredCond;2{ic}|predCond@10||-9|16.5|||D5G4;|ATTR_X(D5G2;NPX0.25;Y-5.25;)S8
-IpredCond;2{ic}|predCond@11||-9|61|||D5G4;|ATTR_X(D5G2;NPX-0.25;Y-5.25;)S8
 IpredCond3;1{ic}|predCond@12||-75|65|X||D5G4;|ATTR_X(D5G2;NOLPY-7.5;)S8
+IpredCond3;2{ic}|predCond@15||-9|61|||D5G4;|ATTR_X(D5G1;NOLPY-6;)S@X
 IsuccCond2;1{ic}|sucDri20@1||-75|49.5|YRR||D5G4;|ATTR_X(D5G2;NOLPX0.5;Y5;)S8
 IsuccCond2;2{ic}|succCond@0||-74.5|19.5|YRR||D5G4;|ATTR_X(D5G2;NOLPY5.5;)S8
 Awire|disable|D5G2;||1800|inv@51|out|13.5|56|pin@789||25.5|56
 Awire|disable|D5G2;||1800|predCond@12|not_keep_up[3]|-72|73|pin@805||-51.5|73
-Awire|disableLO|D5G2;||1800|nand3@0|ina|-6.5|74.5|pin@772||3|74.5
+Awire|disable|D5G2;||0|predCond@15|not_keep_up[3]|-12|69|pin@821||-24.5|69
 Awire|disableLO|D5G2;||0|nand2@3|ina|-19|19.5|pin@776||-30.5|19.5
 Awire|disableLO|D5G2;||1800|pin@691||-24|41.5|pin@784||-16|41.5
 Awire|disableLO|D5G2;||1800|sucDri20@1|keep_down[2]|-74|43.5|pin@815||-58|43.5
 Awire|disableLO|D5G2;||1800|succCond@0|keep_down[2]|-73.5|13.5|pin@818||-53.5|13.5
 Awire|fire|D5G2;||0|predCond@10|fire|-12|17.5|pin@763||-27.5|17.5
 Awire|fire|D5G2;||2700|pin@765||-27.75|57|pin@575||-27.75|67.5
-Awire|fire|D5G2;||0|predCond@11|fire|-12|62|pin@769||-22|62
 Awire|fire|D5G2;||1800|predCond@12|fire|-72|64|pin@806||-59.5|64
+Awire|fire|D5G2;||0|predCond@15|fire|-12|62|pin@819||-22|62
 Awire|fireLO|D5G2;||0|pin@669||-62.5|50.5|pin@608||-72|50.5
 Awire|fireLO|D5G2;||1800|succCond@0|in|-71.5|18.5|pin@759||-63|18.5
 Awire|fireLO|D5G2;||2700|invLT@0|out|-32.5|64|pin@766||-32.5|69.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@11|state|-6.5|61
-Awire|net@1009|||0|predCond@11|not_keep_up|-11.5|65|pin@482||-14|65
-Awire|net@1026|||2700|pin@479||-5|35|pin@491||-5|70.5
-Awire|net@1027|||900|pin@491||-5|70.5|pin@312||-5|61
-Awire|net@1029|||1800|nand3@0|inb|-6.5|72.5|pin@492||-2.5|72.5
-Awire|net@1046|||900|pin@499||-14|72.5|pin@482||-14|65
-Awire|net@1047|||0|nand3@0|out|-11.5|72.5|pin@499||-14|72.5
+Awire|net@652|||1800|predCond@10|state|-6.5|16.5|pin@308||-2.5|16.5
 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|16.5|conn@0|a|-0.5|16.5
-Awire|net@1275|||0|conn@3|a|0|61|pin@312||-5|61
+Awire|net@1271|||1800|pin@308||-2.5|16.5|conn@0|a|-0.5|16.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.5|19.5
 Awire|net@1393|||0|pin@631||-82|55|conn@2|y|-85.5|55
-Awire|net@1395|||900|pin@492||-2.5|72.5|pin@632||-2.5|33
 Awire|net@1431|||2700|pin@637||-38|69|pin@638||-38|77
 Awire|net@1485|||2700|pin@623||-82|19.5|pin@659||-82|30
 Awire|net@1501|||1800|pin@630||-82|77|pin@638||-38|77
-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@1559|||0|pin@632||-2.5|33|pin@664||-5|33
+Awire|net@1507|||2700|pin@308||-2.5|16.5|pin@664||-2.5|33
+Awire|net@1509|||1800|pin@663||-22.5|33|pin@664||-2.5|33
+Awire|net@1559|||0|pin@632||-2.5|33|pin@664||-2.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
 Awire|net@1562|||0|pin@479||-5|35|pin@685||-27|35
@@ -794,10 +788,8 @@ Awire|net@1744|||1800|inv@39|in|-47.5|20.5|pin@743||-46.5|20.5
 Awire|net@1762|||900|invLT@0|in|-32.5|59|pin@764||-32.5|57
 Awire|net@1763|||2700|fireIvan@3|fireHI|-27.75|54|pin@765||-27.75|57
 Awire|net@1764|||1800|pin@764||-32.5|57|pin@765||-27.75|57
-Awire|net@1781|||0|predCond@11|cond|-12|60|pin@770||-14|60
-Awire|net@1782|||900|pin@770||-14|60|pin@771||-14|30
-Awire|net@1783|||1800|pin@689||-28.75|30|pin@771||-14|30
-Awire|net@1787|||0|pin@491||-5|70.5|nand3@0|inc|-6.5|70.5
+Awire|net@1782|||900|pin@770||-15.5|60|pin@771||-15.5|30
+Awire|net@1783|||1800|pin@689||-28.75|30|pin@771||-15.5|30
 Awire|net@1791|||0|predCond@10|not_keep_up|-11.5|20.5|nand2@3|out|-14|20.5
 Awire|net@1793|||2700|pin@775||-22.5|21.5|pin@663||-22.5|33
 Awire|net@1794|||0|nand2@3|inb|-19|21.5|pin@775||-22.5|21.5
@@ -830,6 +822,20 @@ Awire|net@1876|||0|pin@640||-40|30|pin@659||-82|30
 Awire|net@1877|||900|pin@794||-53.5|36|pin@816||-53.5|15
 Awire|net@1878|||0|pin@816||-53.5|15|pin@817||-73.5|15
 Awire|net@1879|||900|succCond@0|keep_down|-73.5|15.5|pin@817||-73.5|15
+Awire|net@1882|||0|predCond@15|cond|-12|60|pin@770||-15.5|60
+Awire|net@1895|||900|pin@822||-2.5|43|pin@632||-2.5|33
+Awire|net@1896|||1800|inv@52|in|-7.5|43|pin@822||-2.5|43
+Awire|net@1897|||0|inv@52|out|-12.5|43|pin@823||-14|43
+Awire|net@1898|||2700|pin@823||-14|43|pin@824||-14|65
+Awire|net@1899|||1800|pin@824||-14|65|predCond@15|not_keep_up[1]|-12|65
+Awire|net@1900|||2700|pin@479||-5|35|pin@825||-5|50.5
+Awire|net@1902|||1800|inv@53|in|-7.5|50.5|pin@825||-5|50.5
+Awire|net@1903|||0|inv@53|out|-12.5|50.5|pin@826||-17.5|50.5
+Awire|net@1904|||2700|pin@826||-17.5|50.5|pin@827||-17.5|67
+Awire|net@1905|||1800|pin@827||-17.5|67|predCond@15|not_keep_up[2]|-12|67
+Awire|net@1910|||0|conn@3|a|0|61|pin@832||-5|61
+Awire|net@1911|||0|pin@832||-5|61|predCond@15|state|-6.5|61
+Awire|net@1912|||2700|pin@825||-5|50.5|pin@832||-5|61
 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