fixed incorrect instantiation mistake; all tests pass now

diff --git a/electric/loopCountM.jelib b/electric/loopCountM.jelib
index 56ecbc0..a0ebb49 100755 (executable)
--- a/electric/loopCountM.jelib
+++ b/electric/loopCountM.jelib
@@ -1,5 +1,5 @@
 # header information:
-HloopCountM|8.09a
+HloopCountM|8.08k
 
 # Views:
 Vicon|ic
@@ -33,14 +33,12 @@ LscanM|scanM
 LwiresL|wiresL
 
 # Tools:
-Ouser|DefaultTechnology()Sartwork|SchematicTechnology()Scmos90
+Ouser|DefaultTechnology()Scmos90|SchematicTechnology()Scmos90
 Oio|GDSOutputConvertsBracketsInExports()BF|GDSWritesExportPins()BT
 
 # Technologies:
-Tcmos|ScaleFORcmos()D1000.0
-Tcmos90|"GDS(ST)LayerForPad-FrameINcmos90"()S43|"GDS(ST)LayerForPassivationINcmos90"()S169|"GDS(TSMC)LayerForPad-FrameINcmos90"()S43|"GDS(TSMC)LayerForPassivationINcmos90"()S169
-Tmocmos|ScaleFORmocmos()D100.0|SelectedFoundryFormocmos()STSMC
-Trcmos|ScaleFORrcmos()D1000.0
+Tcmos90|"GDS(ST)LayerForPad-FrameINcmos90"()S43|"GDS(TSMC)LayerForPad-FrameINcmos90"()S43
+Tmocmos|SelectedFoundryFormocmos()STSMC
 
 # Cell calculate;1{ic}
 Ccalculate;1{ic}||cmos90|1216796698094|1241885297532|EI
@@ -2340,7 +2338,7 @@ Edo[Ld,Co,reD]|sel[Ld,Co,rD]|D4G2;|conn@7|a|I
 X
 
 # Cell loadORcountAdam;1{ic}
-CloadORcountAdam;1{ic}||artwork|1240670646209|1241540352226|EI
+CloadORcountAdam;1{ic}||artwork|1240670646209|1244235532619|EI
 Ngeneric:Facet-Center|art@0||0|0||||AV
 Nschematic:Bus_Pin|pin@1||-6|3|-1|-1||
 Nschematic:Bus_Pin|pin@2||6|0|-1|-1||
@@ -2355,7 +2353,7 @@ NPin|pin@10||-5|-4|1|1||
 NPin|pin@11||-5|4|1|1||
 NPin|pin@12||5|4|1|1||
 NPin|pin@13||5|-4|1|1||
-Ngeneric:Invisible-Pin|pin@14||0|0|||||ART_message(D5G2;)S[load,or,count]
+Ngeneric:Invisible-Pin|pin@14||0|0|||||ART_message(D5G2;)S[load,or,count,ADAM]
 NPin|pin@22||-5|3|1|1||
 NPin|pin@23||-6|3|1|1||
 NPin|pin@24||-4|4|1|1||
@@ -2524,17 +2522,19 @@ Evdd_24||D5G5;|pinsVddG@5|vdd_1|P
 X
 
 # Cell loadORcountAdam;1{sch}
-CloadORcountAdam;1{sch}||schematic|1230935566337|1244133196582|I
+CloadORcountAdam;1{sch}||schematic|1230935566337|1244235659121|I
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@3||6|-13|||YRRR|
 NOff-Page|conn@5||9|15|||XR|
 NOff-Page|conn@6||-22|2|||XYR|
 NOff-Page|conn@7||-56.5|-14|||Y|
-NOff-Page|conn@8||3|13|||R|
+NOff-Page|conn@8||-49.5|11|||R|
 NOff-Page|conn@9||-15|7|||XR|
 NOff-Page|conn@11||-33|0|||XR|
 NOff-Page|conn@13||-50|-6|||XYRR|
 NOff-Page|conn@14||-7.5|-10|||XY|
+NWire_Con|conn@15||3|13.5||||
+NGround|gnd@0||-0.5|-25.5||||
 IilcLoad;1{ic}|ilcLoad@0||-36|-12|||D5G4;
 IloadORcountAdam;1{ic}|loadORco@1||24|18|||D5G4;
 IolcControlD;1{ic}|olcContr@1||6|6|||D5G4;
@@ -2565,6 +2565,8 @@ NWire_Pin|pin@389||21|-17||||
 NWire_Pin|pin@390||27|-20||||
 Ngeneric:Invisible-Pin|pin@391||-33.5|-21.5|||||ART_message(D3G2;)S["sel[rD] selects what to load","1 = olc, 0 = ilc"]
 NWire_Pin|pin@392||-39|-24||||
+NWire_Pin|pin@393||-0.5|-6||||
+NPower|pwr@0||3|19||||
 IorangeTSMC090nm:wire90;1{ic}|wire90@0||-6.5|0|||D0G4;|ATTR_L(D5G1;PUD)D716.7|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NPY-1;)I1|ATTR_width(D5G1;NPY-2;)I3
 IorangeTSMC090nm:wire90;1{ic}|wire90@1||15.5|0|||D0G4;|ATTR_L(D5G1;PUD)D643.0999999999998|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NPY-1;)I1|ATTR_width(D5G1;NPY-2;)I3
 Awire|net@880|||900|olcContr@1|fire[zz]|3|3|pin@368||3|0
@@ -2578,9 +2580,7 @@ Awire|net@890|||900|ilcLoad@0|Dvoid|-39|-16|pin@373||-39|-20.5
 Awire|net@892|||900|olcLoad@0|Dvoid|-21|-16|pin@374||-21|-20.5
 Awire|net@893|||0|olcCount@0|do[ins]|25|-10|pin@375||21|-10
 Awire|net@894|||2700|pin@375||21|-10|pin@376||21|-6
-Awire|net@895|||0|pin@376||21|-6|pin@379||-27|-6
 Awire|net@896|||0|olcLoad@0|do[ins]|-24|-10|pin@378||-27|-10
-Awire|net@897|||0|pin@379||-27|-6|pin@383||-45|-6
 Awire|net@898|||2700|pin@378||-27|-10|pin@379||-27|-6
 Awire|net@899|||900|conn@6|y|-22|0|olcLoad@0|mc|-22|-8
 Awire|net@902|||0|ilcLoad@0|do[ins]|-41|-10|pin@382||-45|-10
@@ -2588,7 +2588,6 @@ Awire|net@904|||2700|pin@382||-45|-10|pin@383||-45|-6
 Awire|net@905|||0|ilcLoad@0|sel[Ld]|-41|-14|pin@384||-45|-14
 Awire|net@907|||0|olcLoad@0|sel[Ld]|-24|-14|pin@386||-27|-14
 Awire|net@909|||0|olcCount@0|sel[Co]|25|-14|pin@388||21|-14
-Abus|net@912||-0.5|IJ900|conn@8|a|3|11|olcContr@1|flag[D][set,clr]|3|9
 Abus|net@913||-0.5|IJ2700|olcContr@1|s[2,3]|9|10|conn@5|a|9|13
 Awire|net@916|||1800|conn@13|y|-48|-6|pin@383||-45|-6
 Awire|net@917|||0|conn@14|y|-9.5|-10|olcLoad@0|do[reD]|-12|-10
@@ -2596,6 +2595,11 @@ Awire|net@918|||0|wire90@1|a|13|0|pin@371||9|0
 Awire|net@919|||0|pin@370||27|0|wire90@1|b|18|0
 Awire|net@920|||0|pin@368||3|0|wire90@0|b|-4|0
 Awire|net@921|||0|wire90@0|a|-9|0|pin@369||-14|0
+Awire|net@922|||1800|pin@379||-27|-6|pin@393||-0.5|-6
+Awire|net@923|||1800|pin@393||-0.5|-6|pin@376||21|-6
+Awire|net@924|||2700|gnd@0||-0.5|-23.5|pin@393||-0.5|-6
+Abus|net@926||-0.5|IJ900|conn@15||3|13.5|olcContr@1|flag[D][set,clr]|3|9
+Awire|net@927|||2700|conn@15||3|13.5|pwr@0||3|19
 Awire|olc[dec]|D5G2;||2700|olcCount@0|ilc[load]|33|-7|pin@381||33|-2
 Awire|olc[load]|D5G2;||2700|olcLoad@0|olc[load]|-18|-7|pin@380||-18|1
 Awire|olc[zero]|D5G2;||900|olcCount@0|olc[zero]|27|-16|pin@390||27|-20
@@ -6056,7 +6060,7 @@ Evdd_104||D5G5;|pinsVddG@8|vdd_1|P
 X
 
 # Cell olcWcontAdam;1{sch}
-ColcWcontAdam;1{sch}||schematic|1236866624132|1244156570827|I
+ColcWcontAdam;1{sch}||schematic|1236866624132|1244235522918|
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@4||-13|-3|||Y|
 NOff-Page|conn@6||12|8|||XR|
@@ -6068,7 +6072,7 @@ NOff-Page|conn@12||14|0|||XY|
 NOff-Page|conn@13||-13|3|||XYRR|
 NWire_Con|conn@14||0|-39||||
 NGround|gnd@0||0|-44||||
-IloadORcount;1{ic}|loadORco@0||0|0|||D5G4;
+IloadORcountAdam;1{ic}|loadORco@1||0|0|||D5G4;
 Iolc;3{ic}|olc@0||0|-30|X||D5G4;
 IolcWcontAdam;1{ic}|olcWcont@1||48|29|||D5G4;
 Ngeneric:Invisible-Pin|pin@0||0.5|35.5|||||ART_message(D5G6;)SolcWcontAdam
@@ -6137,7 +6141,7 @@ Awire|bitt[4]|D5G2;||2700|pin@44||36|-30|pin@45||36|-26
 Awire|bitt[5]|D5G2;||2700|pin@46||36|-36|pin@47||36|-32
 Awire|bitt[6]|D5G2;||2700|pin@38||36|-42|pin@39||36|-38
 Awire|mc|D5G2;||2700|pin@49||53|12|pin@52||53|18
-Awire|mc|D5G2;||2700|loadORco@0|mc|-4|5|pin@57||-4|9
+Awire|mc|D5G2;||2700|loadORco@1|mc|-4|5|pin@57||-4|9
 Awire|net@16|||0|wire90@1|a|-28|-30|pin@18||-32.5|-30
 Awire|net@18|||0|wire90@2|a|-28|-42.5|pin@20||-32.5|-42.5
 Awire|net@19|||0|wire90@3|a|-27.5|-11.5|pin@22||-32|-11.5
@@ -6157,21 +6161,21 @@ Awire|net@58|||2700|scanEx3h@2|mc|53|4|pin@49||53|12
 Awire|net@60|||0|pin@49||53|12|pin@48||37|12
 Abus|net@63||-0.5|IJ1800|pin@6||-9|-30|olc@0|zooLO|-6|-30
 Abus|net@64||-0.5|IJ0|pin@4||9|-28|olc@0|olc[load,dec][1:2]|6|-28
-Abus|net@65||-0.5|IJ0|pin@16||9|-3|loadORco@0|olc[load,dec]|6|-3
+Abus|net@65||-0.5|IJ0|pin@16||9|-3|loadORco@1|olc[load,dec]|6|-3
 Abus|net@67||-0.5|IJ1800|pin@54||-9|-11|pin@55||0|-11
-Abus|net@68||-0.5|IJ2700|pin@55||0|-11|loadORco@0|olc[zero,zoo]|0|-6
+Abus|net@68||-0.5|IJ2700|pin@55||0|-11|loadORco@1|olc[zero,zoo]|0|-6
 Awire|net@72|||900|conn@6|a|12|6|pin@58||12|3
-Awire|net@73|||0|pin@58||12|3|loadORco@0|ilc[load]|6|3
-Abus|net@74||-0.5|IJ0|loadORco@0|sel[Ld,Co]|-6|-3|conn@4|y|-11|-3
-Awire|net@78|||0|conn@12|y|12|0|loadORco@0|do[reD]|6|0
+Awire|net@73|||0|pin@58||12|3|loadORco@1|ilc[load]|6|3
+Abus|net@74||-0.5|IJ0|loadORco@1|sel[Ld,Co,rD]|-6|-3|conn@4|y|-11|-3
+Awire|net@78|||0|conn@12|y|12|0|loadORco@1|doneLO[M]|6|0
 Abus|net@80||-0.5|IJ2700|pin@61||71|-7|scanEx2h@0|p2p,p1p,rd|71|-3
 Awire|net@81|||1800|scanEx3h@2|sout|59|0|scanEx2h@0|sin|70|0
 Awire|net@82|||1800|scanEx2h@0|sout|74|0|conn@10|a|79|0
 Awire|net@83|||2700|scanEx2h@0|mc|70|4|pin@62||70|12
-Awire|net@86|||0|loadORco@0|do[ins]|-6|3|conn@13|y|-11|3
+Awire|net@86|||0|loadORco@1|do[ins]|-6|3|conn@13|y|-11|3
 Abus|net@88||-0.5|IJ1800|pin@30||55|-7|pin@61||71|-7
 Awire|net@89|||1800|pin@49||53|12|pin@62||70|12
-Abus|net@90||-0.5|IJ0|loadORco@0|flag[D][set,clr]|-6|0|conn@7|a|-11.5|0
+Abus|net@90||-0.5|IJ0|loadORco@1|flag[D][set,clr]|-6|0|conn@7|a|-11.5|0
 Abus|net@91||-0.5|IJ900|olc@0|inLO[1:6]|0|-35|conn@14||0|-39
 Awire|net@92|||900|conn@14||0|-39|gnd@0||0|-42
 Awire|olc[dec]|D5G2;||2700|pin@24||-32|-21.5|pin@25||-32|-17
@@ -6181,8 +6185,8 @@ Abus|olc[zero,zoo]|D5G2;|-0.5|IJ900|pin@54||-9|-11|pin@6||-9|-30
 Awire|olc[zero]|D5G2;||2700|pin@18||-32.5|-30|pin@19||-32.5|-25.5
 Awire|olc[zoo]|D5G2;||2700|pin@20||-32.5|-42.5|pin@21||-32.5|-38
 Abus|p2p,p1p,rd|D5G2;|-0.5|IJ900|scanEx3h@2|p2p,p1p,rd|55|-3|pin@30||55|-7
-Abus|s[1:2]|D5G2;|-0.5|IJ2700|loadORco@0|s[1:2]|4|6|pin@60||4|10
 Abus|s[1:2]|D5G2;|-0.5|IJ2700|scanEx2h@0|dIn[1:3]|72|3|pin@63||72|8
+Abus|s[1:2]|D5G2;|-0.5|IJ2700|loadORco@1|s[1:2]|4|6|pin@60||4|10
 Edo[ins]||D4G2;|conn@13|a|I
 EdoneLO[M]||D4G2;|conn@12|a|I
 Eflag[D][set,clr]||D6G2;|conn@7|y|O

diff --git a/electric/stagesM.jelib b/electric/stagesM.jelib
index d1669dd..7720801 100755 (executable)
--- a/electric/stagesM.jelib
+++ b/electric/stagesM.jelib
@@ -1,5 +1,5 @@
 # header information:
-HstagesM|8.09k
+HstagesM|8.08k
 
 # Views:
 Vicon|ic
@@ -47,13 +47,10 @@ LwiresL|wiresL
 # Tools:
 Ouser|DefaultTechnology()Scmos90|SchematicTechnology()Scmos90
 Oio|GDSOutputConvertsBracketsInExports()BF|GDSWritesExportPins()BT
-OGateLayoutGenerator|enableNCC()SPurpleFour
-OSTA|GlobalSDCCommands()S"\n### clock setup\ncreate_clock -period 0.400 -name clk -waveform \"0 0.200\" clk\nset_clock_uncertainty -setup 0.015 clk\nset_clock_uncertainty -hold 0.015 clk\nset_propagated_clock clk\nset_clock_transition -rise 0.025 clk\nset_clock_transition -fall 0.025 clk\n#set_driving_cell -lib_cell inv_X008_0 clk\n"
 
 # Technologies:
-Tartwork|SelectedFoundryForartwork()S""
-Tcmos90|"GDS(TSMC)LayerForOD33INcmos90"()S111
-Ttft|SelectedFoundryFortft()SMOSIS
+Tcmos90|"GDS(ST)LayerForPad-FrameINcmos90"()S43|"GDS(TSMC)LayerForPad-FrameINcmos90"()S43
+Tmocmos|SelectedFoundryFormocmos()STSMC
 
 # Cell aFabricGallery;1{lay}
 CaFabricGallery;1{lay}||cmos90|1230604398952|1243246708862|I
@@ -7475,7 +7472,7 @@ Evdd_67||D5G7;|cover5h@0|vdd_37|P
 X
 
 # Cell outDockCenterStretch;1{sch}
-CoutDockCenterStretch;1{sch}||schematic|1233272314089|1244202293915|
+CoutDockCenterStretch;1{sch}||schematic|1233272314089|1244235322869|
 Ngeneric:Facet-Center|art@0||0|0||||AV
 IwiresL:bitAssignments;1{ic}|bitAssig@0||-62|29|||D5G4;
 NOff-Page|conn@0||23|-20.5|||RRR|
@@ -7488,7 +7485,7 @@ NOff-Page|conn@19||18|-31|||YRRR|
 NOff-Page|conn@21||-32|-3||||
 NOff-Page|conn@23||-14.5|-3||||
 NOff-Page|conn@25||-22|-31|||RRR|
-NOff-Page|conn@30||-62.5|-19|||Y|
+NOff-Page|conn@30||-58|-20.5|||Y|
 NOff-Page|conn@31||29|3|||XRRR|
 NOff-Page|conn@32||0|-24||||
 NOff-Page|conn@33||-78.5|17.5|||YRRR|