removed another unnecessary delay on driver input

diff --git a/electric/omegaCounter.jelib b/electric/omegaCounter.jelib
index 749207c..399f632 100644 (file)
--- a/electric/omegaCounter.jelib
+++ b/electric/omegaCounter.jelib
@@ -410,6 +410,126 @@ Edisable|disableLO|D5G2;X-1.5;|conn@14|a|I
 Efire[1]|fireHI|D6G2;X4.5;|conn@8|a|O
 X
 
+# Cell nand2withInverter;1{ic}
+Cnand2withInverter;1{ic}||artwork|1021415734000|1248139184888|E|ATTR_Delay(D5G1;HNPX-2.5;Y5.5;)I100|ATTR_X(D5FLeave alone;G1;HNOLPX-2.5;Y6.5;)S1|ATTR_drive0(D5G1;HNPTX-2.5;Y4.5;)Sstrong0|ATTR_drive1(D5G1;HNPTX-2.5;Y3.5;)Sstrong1|prototype_center()I[6000,0]
+Ngeneric:Facet-Center|art@0||0|0||||AV
+NThick-Circle|art@1||-1|1|1|1|||ART_color()I10
+NThick-Circle|art@4||-3|-1|1|1|||ART_color()I10
+NThick-Circle|art@6||-1|-2|8|7|YRRR||ART_color()I10|ART_degrees()F[0.0,1.0471976]
+NThick-Circle|art@7||-1|2|8|7|RRR||ART_color()I10|ART_degrees()F[0.0,1.0471976]
+NThick-Circle|art@8||-3.25|0|6|6|3200||ART_color()I10|ART_degrees()I800
+NPin|pin@6||-1.5|1|1|1||
+NPin|pin@7||-2.5|1||||
+Nschematic:Bus_Pin|pin@8||3.5|0|-2|-2||
+Nschematic:Bus_Pin|pin@9||-2.5|1|-2|-2||
+Nschematic:Bus_Pin|pin@12||-7|-1|-2|-2||
+NPin|pin@13||-3.5|-1|1|1||
+Nschematic:Bus_Pin|pin@14||-7|-1|-2|-2||
+NPin|pin@15||-6|-1|1|1||
+NPin|pin@16||-7|-1||||
+Nschematic:Bus_Pin|pin@17||-2.5|-1|-2|-2||
+NPin|pin@18||-6|0.5|1|1||
+NPin|pin@19||-6|-2.5|1|1||
+NPin|pin@20||-2.5|-1|1|1||
+NPin|pin@21||-0.5|-1|1|1||
+NPin|pin@22||-1.5|-3|1|1|R|
+NPin|pin@23||-1.5|-1|1|1|R|
+Nschematic:Wire_Pin|pin@24||-1.5|-3||||
+Nschematic:Bus_Pin|pin@27||-2|-1|-2|-2||
+NPin|pin@28||-0.5|-1|1|1||
+NPin|pin@29||-2|-1||||
+Nschematic:Bus_Pin|pin@30||-2|1|-2|-2||
+Nschematic:Bus_Pin|pin@31||3|0|-2|-2||
+NPin|pin@34||-0.5|-1.25|1|1||
+NPin|pin@35||0|-1.75|1|1||
+AThicker|net@4|||FS0|pin@6||-1.5|1|pin@7||-2.5|1|ART_color()I10
+AThicker|net@6|||FS3290|pin@13||-3.5|-1|pin@18||-6|0.5|ART_color()I10
+AThicker|net@7|||FS310|pin@13||-3.5|-1|pin@19||-6|-2.5|ART_color()I10
+AThicker|net@8|||FS0|pin@15||-6|-1|pin@16||-7|-1|ART_color()I10
+AThicker|net@9|||FS2700|pin@19||-6|-2.5|pin@18||-6|0.5|ART_color()I10
+AThicker|net@10|||FS1800|pin@20||-2.5|-1|pin@21||-0.5|-1|ART_color()I-16777215
+AThicker|net@11|||FS2700|pin@22||-1.5|-3|pin@23||-1.5|-1|ART_color()I-16777215
+AThicker|net@13|||FS0|pin@28||-0.5|-1|pin@29||-2|-1|ART_color()I10
+AThicker|net@15|||FS3150|pin@35||0|-1.75|pin@34||-0.5|-1.25|ART_color()I10
+Eina||D5G1;X1.5;|pin@12||I
+Einb||D5G1;|pin@9||I
+Eout||D5G1;|pin@8||O
+EoutaBar||D5G1;Y-0.5;|pin@24||U
+X
+
+# Cell nand2withInverter;1{sch}
+Cnand2withInverter;1{sch}||schematic|1021415734000|1248139266348||ATTR_Delay(D5G1;HNPX-18;Y-6;)I100|ATTR_X(D5FLeave alone;G1;HNOLPX-18;Y-5;)S1|ATTR_drive0(D5G1;HNPTX-18;Y-7;)Sstrong0|ATTR_drive1(D5G1;HNPTX-18;Y-8;)Sstrong1|ATTR_verilog_template(D5G1;NTX5.5;Y-18.5;)SFIXME!!! nor ($(drive0), $(drive1)) #($(Delay)) $(node_name) ($(out), $(ina), $(inb));|prototype_center()I[0,0]
+IorangeTSMC090nm:NMOSx;1{ic}|NMOS@0||-4|-8|||D0G4;|ATTR_Delay(D5G1;NOJPX3.5;Y-2;)S@Delay|ATTR_X(D5FLeave alone;G1.5;NOLPX3.5;Y0.5;)S@X
+IorangeTSMC090nm:NMOSx;1{ic}|NMOS@1||4|-8|YRR||D0G4;|ATTR_Delay(D5G1;NOJPX3.5;Y-2;)S@Delay|ATTR_X(D5FLeave alone;G1.5;NOLPX3.5;Y0.5;)S@X
+IorangeTSMC090nm:NMOSx;1{ic}|NMOSx@0||-3|11.5|Y||D0G4;|ATTR_Delay(D5G1;NOJPX3.5;Y-2;)S@Delay|ATTR_X(D5FLeave alone;G1.5;NOLPX3.5;Y0.5;)S@X
+IredFive:PMOS;1{ic}|PMOS@0||0|20.5|||D5G4;|ATTR_Delay(D5G1;NPX5;Y-2;)I100|ATTR_X(D5G1.5;NPX5;Y0.5;)I1
+IredFive:PMOS;1{ic}|PMOS@1||0|4|RR||D5G4;|ATTR_Delay(D5G1;NPX5;Y-2;)I100|ATTR_X(D5G1.5;NPX5;Y0.5;)I1
+Ngeneric:Facet-Center|art@0||0|0||||AV
+NOff-Page|conn@0||-15.5|0||||
+NOff-Page|conn@1||14|-8|||RR|
+NOff-Page|conn@2||14|0||||
+NOff-Page|conn@3||14|15||||
+NGround|gnd@0||0|-15||||
+NGround|gnd@1||-3|5.5||||
+Inand2withInverter;1{ic}|nand2wit@0||33.5|16|||D5G4;|ATTR_Delay(D5G1;NPX-5.25;Y-4;)I100|ATTR_X(D5FLeave alone;G1;NOLPX-5.25;Y-3;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+NWire_Pin|pin@0||0|-11.5||||
+NWire_Pin|pin@1||-4|-11.5||||
+NWire_Pin|pin@2||4|-11.5||||
+NWire_Pin|pin@3||-9|-8||||
+NWire_Pin|pin@5||-9|0||||
+NWire_Pin|pin@6||9|4||||
+NWire_Pin|pin@7||9|-8||||
+Ngeneric:Invisible-Pin|pin@8||3|28.5|||||ART_message(D5G6;)Snand2withInverters
+NWire_Pin|pin@9||-9|20.5||||
+NWire_Pin|pin@10||0|0||||
+NWire_Pin|pin@11||4|0||||
+NWire_Pin|pin@12||-4|0||||
+Ngeneric:Invisible-Pin|pin@13||27|-14|||||ART_message(D5G2;)S[X is drive strength,One pull-down is as strong,as the pull-up]
+NWire_Pin|pin@14||-3|20.5||||
+NWire_Pin|pin@15||3|4||||
+NWire_Pin|pin@16||0|2||||
+NWire_Pin|pin@17||-9|11.5||||
+NWire_Pin|pin@18||-3|15||||
+NWire_Pin|pin@19||0|15||||
+NPower|pwr@0||0|25||||
+Awire|net@0|||0|pin@7||9|-8|NMOS@1|g|7|-8
+Awire|net@1|||900|pin@0||0|-11.5|gnd@0||0|-13
+Awire|net@2|||0|pin@2||4|-11.5|pin@0||0|-11.5
+Awire|net@3|||0|pin@0||0|-11.5|pin@1||-4|-11.5
+Awire|net@4|||900|NMOS@0|s|-4|-10|pin@1||-4|-11.5
+Awire|net@5|||2700|pin@2||4|-11.5|NMOS@1|s|4|-10
+Awire|net@6|||900|pin@12||-4|0|NMOS@0|d|-4|-6
+Awire|net@7|||0|NMOS@0|g|-7|-8|pin@3||-9|-8
+Awire|net@8|||900|pin@11||4|0|NMOS@1|d|4|-6
+Awire|net@9|||2700|pin@3||-9|-8|pin@5||-9|0
+Awire|net@10|||0|pin@5||-9|0|conn@0|y|-13.5|0
+Awire|net@11|||2700|pin@7||9|-8|pin@6||9|4
+Awire|net@12|||1800|pin@7||9|-8|conn@1|y|12|-8
+Awire|net@16|||0|pin@11||4|0|pin@10||0|0
+Awire|net@17|||0|pin@10||0|0|pin@12||-4|0
+Awire|net@18|||2700|pin@5||-9|0|pin@17||-9|11.5
+Awire|net@19|||1800|pin@11||4|0|conn@2|a|12|0
+Awire|net@20|||1800|pin@9||-9|20.5|pin@14||-3|20.5
+Awire|net@21|||0|pin@6||9|4|pin@15||3|4
+Awire|net@22|||2700|pin@10||0|0|pin@16||0|2
+Awire|net@23|||0|PMOS@0|g|-3|20.5|pin@14||-3|20.5
+Awire|net@24|||900|pwr@0||0|25|PMOS@0|s|0|22.5
+Awire|net@25|||2700|PMOS@1|s|0|2|pin@16||0|2
+Awire|net@26|||1800|PMOS@1|g|3|4|pin@15||3|4
+Awire|net@27|||2700|PMOS@1|d|0|6|pin@19||0|15
+Awire|net@28|||2700|pin@17||-9|11.5|pin@9||-9|20.5
+Awire|net@29|||0|NMOSx@0|g|-6|11.5|pin@17||-9|11.5
+Awire|net@30|||2700|NMOSx@0|s|-3|13.5|pin@18||-3|15
+Awire|net@31|||2700|pin@19||0|15|PMOS@0|d|0|18.5
+Awire|net@32|||1800|pin@18||-3|15|pin@19||0|15
+Awire|net@33|||0|conn@3|a|12|15|pin@19||0|15
+Awire|net@34|||2700|gnd@1||-3|7.5|NMOSx@0|d|-3|9.5
+Eina||D5G2;|conn@0|a|I
+Einb||D5G2;|conn@1|a|I
+Eout||D5G2;|conn@2|y|O
+EoutaBar||D5G2;X7.5;|conn@3|a|U
+X
+
 # Cell nor2withInverter;2{ic}
 Cnor2withInverter;2{ic}||artwork|1021415734000|1246318194856|E|ATTR_Delay(D5G1;HNPX-2.5;Y5.5;)I100|ATTR_X(D5FLeave alone;G1;HNOLPX-2.5;Y6.5;)S1|ATTR_drive0(D5G1;HNPTX-2.5;Y4.5;)Sstrong0|ATTR_drive1(D5G1;HNPTX-2.5;Y3.5;)Sstrong1|prototype_center()I[6000,0]
 Ngeneric:Facet-Center|art@0||0|0||||AV
@@ -460,12 +580,12 @@ EoutaBar||D5G1;Y-0.5;|pin@24||U
 X
 
 # Cell nor2withInverter;1{sch}
-Cnor2withInverter;1{sch}||schematic|1021415734000|1246318014836||ATTR_Delay(D5G1;HNPX-18;Y-6;)I100|ATTR_X(D5FLeave alone;G1;HNOLPX-18;Y-5;)S1|ATTR_drive0(D5G1;HNPTX-18;Y-7;)Sstrong0|ATTR_drive1(D5G1;HNPTX-18;Y-8;)Sstrong1|ATTR_verilog_template(D5G1;NTX5.5;Y-18.5;)SFIXME!!! nor ($(drive0), $(drive1)) #($(Delay)) $(node_name) ($(out), $(ina), $(inb));|prototype_center()I[0,0]
-IorangeTSMC090nm:NMOSx;1{ic}|NMOS@0||-4|-8|||D0G4;|ATTR_Delay(D5G1;NOJPX3.5;Y-2;)S@Delay|ATTR_X(D5FLeave alone;G1.5;NOLPX3.5;Y0.5;)S@X
-IorangeTSMC090nm:NMOSx;1{ic}|NMOS@1||4|-8|YRR||D0G4;|ATTR_Delay(D5G1;NOJPX3.5;Y-2;)S@Delay|ATTR_X(D5FLeave alone;G1.5;NOLPX3.5;Y0.5;)S@X
+Cnor2withInverter;1{sch}||schematic|1021415734000|1248139236251||ATTR_Delay(D5G1;HNPX-18;Y-6;)I100|ATTR_X(D5FLeave alone;G1;HNOLPX-18;Y-5;)S1|ATTR_drive0(D5G1;HNPTX-18;Y-7;)Sstrong0|ATTR_drive1(D5G1;HNPTX-18;Y-8;)Sstrong1|ATTR_verilog_template(D5G1;NTX5.5;Y-18.5;)SFIXME!!! nor ($(drive0), $(drive1)) #($(Delay)) $(node_name) ($(out), $(ina), $(inb));|prototype_center()I[0,0]
+IorangeTSMC090nm:NMOSx;1{ic}|NMOS@0||-4|-8|||D0G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX3.5;Y0.5;)S@X
+IorangeTSMC090nm:NMOSx;1{ic}|NMOS@1||4|-8|YRR||D0G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX3.5;Y0.5;)S@X
 IorangeTSMC090nm:NMOSx;1{ic}|NMOSx@0||-3|11.5|Y||D0G4;|ATTR_Delay(D5G1;NOJPX3.5;Y-2;)S@Delay|ATTR_X(D5FLeave alone;G1.5;NOLPX3.5;Y0.5;)S@X
-IredFive:PMOS;1{ic}|PMOS@0||0|20.5|||D5G4;|ATTR_Delay(D5G1;NPX5;Y-2;)I100|ATTR_X(D5G1.5;NPX5;Y0.5;)I1
-IredFive:PMOS;1{ic}|PMOS@1||0|4|RR||D5G4;|ATTR_Delay(D5G1;NPX5;Y-2;)I100|ATTR_X(D5G1.5;NPX5;Y0.5;)I1
+IredFive:PMOS;1{ic}|PMOS@0||0|20.5|||D5G4;|ATTR_X(D5G1.5;NPX5;Y0.5;)I1
+IredFive:PMOS;1{ic}|PMOS@1||0|4|RR||D5G4;|ATTR_X(D5G1.5;NPX5;Y0.5;)I1
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@0||-15.5|0||||
 NOff-Page|conn@1||14|-8|||RR|
@@ -564,7 +684,7 @@ Edisable|disableLO|D5G2;X-2;Y-2;|pin@38||I
 X
 
 # Cell oneBit;1{sch}
-ConeBit;1{sch}||schematic|1242942044308|1248138242887|
+ConeBit;1{sch}||schematic|1242942044308|1248138834635|
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@0||1.5|17.5||||
 NOff-Page|conn@1||-87|19.5|||RR|
@@ -578,11 +698,9 @@ IredFive:inv;1{ic}|inv@35||-61.5|66.5|RR||D0G4;|ATTR_X(D5G1.5;NPX-3;Y-3;)S1|ATTR
 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@40||-51.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@44||-66.5|44|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@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@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: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
@@ -676,6 +794,8 @@ 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@727||-59|49.5||||
+NWire_Pin|pin@728||-49|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
@@ -718,13 +838,11 @@ 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@1458|||0|inv@40|out|-54|49.5|inv@47|in|-54|49.5
 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@1478|||0|nor2n@0|ina|-59|49.5|inv@47|out|-59|49.5
 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
@@ -742,7 +860,6 @@ 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@1515|||1800|inv@40|in|-49|49.5|pin@667||-47.5|49.5
 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
@@ -799,6 +916,9 @@ 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@1684|||0|nor2n@0|ina|-59|49.5|pin@727||-59|49.5
+Awire|net@1685|||0|pin@667||-47.5|49.5|pin@728||-49|49.5
+Awire|net@1686|||0|pin@728||-49|49.5|nor2n@0|ina|-59|49.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