projects / fleet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a6dad18)
new files from ivan
authorAdam Megacz <adam.megacz@sun.com>
Wed, 29 Apr 2009 23:16:38 +0000 (23:16 +0000)
committerAdam Megacz <adam.megacz@sun.com>
Wed, 29 Apr 2009 23:16:38 +0000 (23:16 +0000)
electric/experimental-branch/driversM.jelib patch | blob | history
electric/experimental-branch/loopCountM.jelib patch | blob | history
electric/experimental-branch/moveM.jelib patch | blob | history
electric/experimental-branch/predicateM.jelib patch | blob | history
electric/experimental-branch/stageGroupsM.jelib patch | blob | history

diff --git a/electric/experimental-branch/driversM.jelib b/electric/experimental-branch/driversM.jelib
index f4fc7fb..3766c42 100755 (executable)
--- a/electric/experimental-branch/driversM.jelib
+++ b/electric/experimental-branch/driversM.jelib
@@ -1809,7 +1809,7 @@ Evdd_5||D5G2;|pinsVddG@1|vdd_1|P
 X
 
 # Cell predCond20wMS;1{sch}
-CpredCond20wMS;1{sch}||schematic|1188777360591|1239317063128|
+CpredCond20wMS;1{sch}||schematic|1188777360591|1241026696465|
 IorangeTSMC090nm:PMOSx;1{ic}|PMOSx@0||11.5|6|||D0G4;|ATTR_Delay(D5G1;NPX3.5;Y-2;)I100|ATTR_X(D5G1.5;NPX3.5;Y0.5;)S3
 IorangeTSMC090nm:PMOSx;1{ic}|PMOSx@1||0|6|||D0G4;|ATTR_Delay(D5G1;NPX3.5;Y-2;)I100|ATTR_X(D5G1.5;NPX3.5;Y0.5;)S3
 Ngeneric:Facet-Center|art@0||0|0||||AV
@@ -1839,7 +1839,7 @@ NWire_Pin|pin@74||0|10||||
 NWire_Pin|pin@75||45|18||||
 NWire_Pin|pin@76||45|6.5||||
 NWire_Pin|pin@77||29|0||||
-IredFive:pms1;2{ic}|pms1@0||29|6.5|X||D5G4;|ATTR_Delay(D5G1;NPX-2;Y0.25;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX3.25;Y2.75;)S3
+IredFive:pms1;2{ic}|pms1@0||29|6.5|X||D5G4;|ATTR_Delay(D5G1;NPX-2;Y2.25;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX3.25;Y2.75;)S3
 IredFive:pms2a;2{ic}|pms2a@0||0|18|X||D5G4;|ATTR_Delay(D5G1;NPX-2;Y0.25;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX3.25;Y2.75;)S1.5
 IpredCond20wMS;1{ic}|predCond@1||35.5|27|||D5G4;
 IorangeTSMC090nm:wire90;1{ic}|wire90@0||11|14|||D0G4;|ATTR_L(D5G1;PUD)D219.5|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NPY-1;)I1|ATTR_width(D5G1;NPY-2;)I3
@@ -5647,7 +5647,7 @@ Esucc||D5G2;|pin@2||O
 X
 
 # Cell sucDri40keep;1{lay}
-CsucDri40keep;1{lay}||cmos90|1240679962822|1240848417057||ATTR_NCC(D5G3;NTY70;)S["exportsConnectedByParent vdd /vdd_[0-9]+/"]|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1240848508679
+CsucDri40keep;1{lay}||cmos90|1240679962822|1241004748138||ATTR_NCC(D5G3;NTY70;)S["exportsConnectedByParent vdd /vdd_[0-9]+/"]|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1241004760519
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NMetal-1-P-Active-Con|contact@0||-0.5|-50||20.8||
 NMetal-1-P-Active-Con|contact@1||-16.5|-50||20.8||
@@ -5724,6 +5724,8 @@ NN-Well-Node|plnode@2||0|50|63|52||A
 NP-Select-Node|plnode@3||0|-50|60|52||A
 NP-Select-Node|plnode@4||0|50|60|52||A
 NN-Select-Node|plnode@5||0|0|60|48||A
+NP-Select-Node|plnode@6||-33.5|-30|12|12||A
+NN-Select-Node|plnode@7||-33.5|-18|12|12||A
 NP-Transistor|pmos@0||-4.5|-50||26||
 NP-Transistor|pmos@2||-12.5|-50||26||
 NP-Transistor|pmos@3||3.5|-50||26||
@@ -6737,6 +6739,112 @@ Ein||D4G2;|conn@0|a|I
 Esucc||D6G2;|conn@1|y|O
 X
 
+# Cell sucNANDdri40keep;1{ic}
+CsucNANDdri40keep;1{ic}||artwork|1188825505548|1241024584364|EI
+Ngeneric:Facet-Center|art@0||0|0||||AV
+NThick-Circle|art@10||-0.5|-2|1|1||
+NThick-Circle|art@11||-0.5|2|1|1||
+Nschematic:Bus_Pin|pin@0||-4|-2|-1|-1|Y|
+Nschematic:Bus_Pin|pin@2||4|0|-1|-1||
+Ngeneric:Invisible-Pin|pin@41||1.5|0|||||ART_message(D5G2;)S40
+NPin|pin@47||2|2.75|1|1|RR|
+NPin|pin@48||2|3.5|1|1|RR|
+NPin|pin@49||3|3.5|1|1|RR|
+NPin|pin@50||0.5|3.5|1|1||
+NPin|pin@51||0.5|2.75|1|1||
+NPin|pin@64||3|1|1|1||
+NPin|pin@65||3|3.5|1|1||
+NPin|pin@66||1|3.5|1|1|RR|
+NPin|pin@67||2|4.25|1|1|RR|
+NPin|pin@68||0|-3.25|1|1||
+NPin|pin@69||0|3|1|1||
+NPin|pin@70||4|0|1|1||
+NPin|pin@71||-4|-4|1|1||
+NPin|pin@72||-4|0|1|1||
+Nschematic:Bus_Pin|pin@74||1|-4|-1|-1||
+NPin|pin@75||1|-4|1|1||
+NPin|pin@76||1|-2.5|1|1||
+Nschematic:Bus_Pin|pin@78||-1|2|-1|-1||
+NPin|pin@79||-1|-2|1|1||
+AThicker|net@48|||FS2700|pin@64||3|1|pin@65||3|3.5
+AThicker|net@49|||FS900|pin@67||2|4.25|pin@48||2|3.5
+AThicker|net@50|||FS1800|pin@48||2|3.5|pin@49||3|3.5
+AThicker|net@51|||FS369|pin@67||2|4.25|pin@66||1|3.5
+AThicker|net@52|||FS900|pin@48||2|3.5|pin@47||2|2.75
+AThicker|net@53|||FS0|pin@66||1|3.5|pin@50||0.5|3.5
+AThicker|net@54|||FS900|pin@50||0.5|3.5|pin@51||0.5|2.75
+AThicker|net@55|||FS2700|pin@68||0|-3.25|pin@69||0|3
+AThicker|net@56|||FS1431|pin@69||0|3|pin@70||4|0
+AThicker|net@57|||FS391|pin@70||4|0|pin@68||0|-3.25
+AThicker|net@58|||FS2700|pin@71||-4|-4|pin@72||-4|0
+AThicker|net@62|||FS3231|pin@47||2|2.75|pin@66||1|3.5
+AThicker|net@63|||FS2700|pin@75||1|-4|pin@76||1|-2.5
+AThicker|net@64|||FS1463|pin@72||-4|0|pin@79||-1|-2
+AThicker|net@65|||FS2137|pin@71||-4|-4|pin@79||-1|-2
+Ein||D5G2;|pin@0||I
+EinB||D5G2;|pin@78||I
+Emc||D5G2;|pin@74||I
+Esucc||D5G2;|pin@2||O
+X
+
+# Cell sucNANDdri40keep;1{sch}
+CsucNANDdri40keep;1{sch}||schematic|1188777360591|1241033551617|
+IorangeTSMC090nm:PMOSx;1{ic}|PMOSx@0||6|5.5|X||D0G4;|ATTR_Delay(D5G1;NPX3.5;Y-2;)I100|ATTR_X(D5G1.5;NPX3.5;Y0.5;)S4
+Ngeneric:Facet-Center|art@0||0|0||||AV
+NOff-Page|conn@1||36|0||||
+NOff-Page|conn@2||0|-15|||R|
+NOff-Page|conn@3||-30.5|6||||
+NOff-Page|conn@4||-30.5|10||||
+IredFive:inv;1{ic}|inv@3||26|-6|X||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S4|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:invI;2{ic}|invI@0||-22.5|6|||D5G4;|ATTR_Delay(D5G1;NPX1.75;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NPX1.25;Y2;)S20|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:nms1;2{ic}|nms1@0||-6|-6|X||D0G4;|ATTR_Delay(D5G1;NPX3;Y-0.5;)I100|ATTR_X(D5FLeave alone;G1.5;NPX-2.25;Y1.5;)S10
+IredFive:nms1;2{ic}|nms1@1||6|-6|X||D0G4;|ATTR_Delay(D5G1;NPX3;Y-0.5;)I100|ATTR_X(D5FLeave alone;G1.5;NPX-2.25;Y1.5;)S4
+Ngeneric:Invisible-Pin|pin@0||10|41|||||ART_message(D5G6;)SsucNANDdri40
+Ngeneric:Invisible-Pin|pin@1||8.5|25.5|||||ART_message(D5G3;)Sies 29 April 2009
+Ngeneric:Invisible-Pin|pin@2||8.5|33.5|||||ART_message(D5G4;)S[HI is full successor driver,with full keeper]
+NWire_Pin|pin@4||-6|0||||
+Ngeneric:Invisible-Pin|pin@43||-7|23|||||ART_message(D3G2;)S[drives a state wire for many successors,this state wire is cleared here and,should also be reported here]
+NWire_Pin|pin@44||0|10.5||||
+NWire_Pin|pin@45||0|-6||||
+NWire_Pin|pin@47||12|5.5||||
+NWire_Pin|pin@49||12|-6||||
+NWire_Pin|pin@50||6|0||||
+NWire_Pin|pin@51||30|-6||||
+NWire_Pin|pin@52||30|0||||
+IredFive:pms1;2{ic}|pms1@0||6|10.5|||D5G4;|ATTR_Delay(D5G1;NPX-2;Y0.25;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX3.25;Y2.75;)S4
+IredFive:pms2a;2{ic}|pms2a@0||-6|10|||D5G4;|ATTR_Delay(D5G1;NPX-2;Y0.25;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX3.25;Y2.75;)S40
+IsucNANDdri40keep;1{ic}|sucANDdr@0||22|10|||D5G4;
+IorangeTSMC090nm:wire90;1{ic}|wire90@1||-14.5|6|||D0G4;|ATTR_L(D5G1;PUD)D503.39999999999975|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NPY-1;)I1|ATTR_width(D5G1;NPY-2;)I3
+IorangeTSMC090nm:wire90;1{ic}|wire90@2||18|-6|X||D0G4;|ATTR_L(D5G1;PUD)D124.7|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NPY-1;)I1|ATTR_width(D5G1;NPY-2;)I3
+Awire|net@125|||2700|nms1@0|d|-6|-4|pin@4||-6|0
+Awire|net@141|||900|pms2a@0|d|-6|4|pin@4||-6|0
+Awire|net@142|||1800|conn@3|y|-28.5|6|invI@0|in|-25|6
+Awire|net@143|||0|pms2a@0|g|-9|10|conn@4|y|-28.5|10
+Awire|net@144|||0|wire90@1|a|-17|6|invI@0|out|-20|6
+Awire|net@145|||1800|wire90@1|b|-12|6|pms2a@0|g2|-9|6
+Awire|net@147|||0|pms1@0|g|3|10.5|pin@44||0|10.5
+Awire|net@148|||900|pin@44||0|10.5|pin@45||0|-6
+Awire|net@149|||900|pin@45||0|-6|conn@2|y|0|-13
+Awire|net@150|||1800|nms1@0|g|-3|-6|pin@45||0|-6
+Awire|net@152|||1800|pin@4||-6|0|pin@50||6|0
+Awire|net@155|||0|pin@47||12|5.5|PMOSx@0|g|9|5.5
+Awire|net@159|||1800|nms1@1|g|9|-6|pin@49||12|-6
+Awire|net@160|||900|pms1@0|d|6|8.5|PMOSx@0|s|6|7.5
+Awire|net@162|||900|PMOSx@0|d|6|3.5|pin@50||6|0
+Awire|net@163|||2700|nms1@1|d|6|-4|pin@50||6|0
+Awire|net@164|||900|pin@47||12|5.5|pin@49||12|-6
+Awire|net@165|||0|pin@52||30|0|pin@50||6|0
+Awire|net@167|||0|inv@3|out|23.5|-6|wire90@2|a|20.5|-6
+Awire|net@168|||0|wire90@2|b|15.5|-6|pin@49||12|-6
+Awire|net@169|||1800|inv@3|in|28.5|-6|pin@51||30|-6
+Awire|net@170|||0|conn@1|a|34|0|pin@52||30|0
+Awire|net@171|||2700|pin@51||30|-6|pin@52||30|0
+EinA|in|D4G2;|conn@3|a|I
+EinB||D4G2;|conn@4|a|I
+Emc||D4G2;|conn@2|a|I
+Esucc||D6G2;|conn@1|y|O
+X
+
 # Cell sucORdri20;1{ic}
 CsucORdri20;1{ic}||artwork|1188825505548|1219491615537|EI
 Ngeneric:Facet-Center|art@0||0|0||||AV
diff --git a/electric/experimental-branch/loopCountM.jelib b/electric/experimental-branch/loopCountM.jelib
index dcdeda1..f4577b3 100755 (executable)
--- a/electric/experimental-branch/loopCountM.jelib
+++ b/electric/experimental-branch/loopCountM.jelib
@@ -4448,7 +4448,7 @@ Evdd_9|vdd_7|D5G2;|sucDri10@0|vdd_3|P
 X
 
 # Cell olcLoad;4{sch}
-ColcLoad;4{sch}||schematic|1230935566337|1240772889243|
+ColcLoad;4{sch}||schematic|1230935566337|1241023276524|
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@6||-60|33|||XYR|
 NOff-Page|conn@7||-109.5|26|||Y|
@@ -4458,15 +4458,19 @@ NOff-Page|conn@14||-18|31.5|||XR|
 NOff-Page|conn@15||-107.5|-19|||XYRR|
 NOff-Page|conn@16||22|26|||XY|
 IcentersJ:ctrAND3in100A;1{ic}|ctrAND3i@2||-84|-3|R||D5G4;
-IredFive:inv;1{ic}|inv@26||-12|6|XR||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S10|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@26||-12|6|XR||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S5|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@27||14.5|-12|RR||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S5|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@28||-24|6|R||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S10|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@28||-24|6|R||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S5|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@30||-100|-24|XRR||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S5|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@32||-49.5|12|XRR||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S5|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@33||0|5.5|XR||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S10|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@34||-36|4.5|XR||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S10|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:invI;2{ic}|invI@6||0|-6|XR||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S5|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:invI;2{ic}|invI@7||-36|-6|XR||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S5|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:invI;2{ic}|invI@8||-36|18|XR||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S10|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:invI;2{ic}|invI@9||0|18|XR||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S10|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:invI;2{ic}|invI@9||0|18|XR||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S5|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:invI;2{ic}|invI@10||6.5|12|XRR||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S10|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:invI;2{ic}|invI@11||-39.5|12|RR||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S10|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:nand2;1{ic}|nand2@5||-100|-18|||D0G4;|ATTR_Delay(D5G1;NPX2.5;Y-3;)I100|ATTR_X(D5G1.5;NPX2.5;Y2.5;)S5|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:nand2;1{ic}|nand2@7||-48|-11|Y||D0G4;|ATTR_Delay(D5G1;NPX2.5;Y-3;)I100|ATTR_X(D5G1.5;NPX2.5;Y2.5;)S5|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:nand2n_sy;1{ic}|nand2n_s@1||-18|18|R||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2.5;)I100|ATTR_X(D5G1.5;NPX2;Y2.5;)S6|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
@@ -4480,7 +4484,6 @@ NWire_Pin|pin@310||18|-12|||X|
 NWire_Pin|pin@364||-60|8|||X|
 NWire_Pin|pin@372||0|0||||
 NWire_Pin|pin@374||-17|12||||
-NWire_Pin|pin@375||0|12||||
 NWire_Pin|pin@379||-24|0|||X|
 NWire_Pin|pin@380||-24|12|||X|
 NWire_Pin|pin@381||-19|12||||
@@ -4504,11 +4507,13 @@ NWire_Pin|pin@427||-54|-10||||
 NWire_Pin|pin@431||-36|12||||
 NWire_Pin|pin@432||-12|12||||
 NWire_Pin|pin@433||-12|0||||
-NWire_Pin|pin@434||-43.5|12||||
-NWire_Pin|pin@435||-43.5|0||||
+NWire_Pin|pin@434||-45|12||||
+NWire_Pin|pin@435||-45|0||||
 NWire_Pin|pin@436||-54|12||||
 NWire_Pin|pin@437||-54|24||||
 NWire_Pin|pin@439||-60|28||||
+NWire_Pin|pin@441||0|12||||
+Ngeneric:Invisible-Pin|pin@442||-18|-7.5|||||ART_message(D5G2;)Sextra load to limit speed
 IdriversM:predDri10wMC;1{ic}|predDri1@0||-67|6|XY||D5G4;
 IdriversM:predDri20wMC;1{ic}|predDri2@3||12|26|Y||D5G4;
 IdriversM:predDri40;1{ic}|predDri4@0||-98|24|X||D5G4;
@@ -4533,7 +4538,6 @@ Awire|net@885|||1800|wire90@22|a|9.5|-12|inv@27|out|12|-12
 Awire|net@887|||1800|wire90@40|b|-3.5|0|pin@372||0|0
 Awire|net@889|||0|wire90@40|a|-8.5|0|pin@433||-12|0
 Awire|net@891|||0|pin@432||-12|12|pin@374||-17|12
-Awire|net@893|||1800|wire90@41|b|-3.5|12|pin@375||0|12
 Awire|net@898|||2700|pin@374||-17|12|nand2n_s@1|ina|-17|15.5
 Awire|net@905|||1800|wire90@42|b|-27.5|0|pin@379||-24|0
 Awire|net@906|||2700|pin@379||-24|0|inv@28|in|-24|3.5
@@ -4541,7 +4545,6 @@ Awire|net@908|||900|pin@380||-24|12|inv@28|out|-24|8.5
 Awire|net@910|||2700|pin@381||-19|12|nand2n_s@1|inb|-19|15.5
 Awire|net@913|||2700|invI@7|out|-36|-3.5|pin@383||-36|0
 Awire|net@914|||1800|pin@383||-36|0|wire90@42|a|-32.5|0
-Awire|net@920|||900|invI@9|in|0|15.5|pin@375||0|12
 Awire|net@929|||900|invI@7|in|-36|-8.5|pin@416||-36|-11
 Awire|net@937|||0|pin@390||-36|24|wire90@39|b|-44|24
 Awire|net@938|||2700|invI@9|out|0|20.5|pin@392||0|24
@@ -4591,15 +4594,21 @@ Awire|net@1053|||2700|invI@6|out|0|-3.5|pin@372||0|0
 Awire|net@1054|||0|conn@16|y|20|26|pin@244||18|26
 Awire|net@1055|||900|pin@244||18|26|pin@310||18|-12
 Awire|net@1056|||900|pin@390||-36|24|invI@8|out|-36|20.5
-Awire|net@1057|||1800|inv@32|out|-47|12|pin@434||-43.5|12
-Awire|net@1058|||900|pin@434||-43.5|12|pin@435||-43.5|0
-Awire|net@1059|||0|pin@435||-43.5|0|wire90@51|b|-46.5|0
+Awire|net@1057|||1800|inv@32|out|-47|12|pin@434||-45|12
+Awire|net@1058|||900|pin@434||-45|12|pin@435||-45|0
+Awire|net@1059|||0|pin@435||-45|0|wire90@51|b|-46.5|0
 Awire|net@1060|||0|inv@32|in|-52|12|pin@436||-54|12
 Awire|net@1061|||0|wire90@39|a|-49|24|pin@437||-54|24
 Awire|net@1062|||2700|pin@436||-54|12|pin@437||-54|24
 Awire|net@1066|||900|conn@6|y|-60|31|pin@439||-60|28
 Awire|net@1070|||900|pin@439||-60|28|pin@364||-60|8
 Awire|net@1072|||0|predDri2@3|mc|9|28|pin@439||-60|28
+Awire|net@1073|||900|inv@33|in|0|3|pin@372||0|0
+Awire|net@1076|||1800|pin@441||0|12|invI@10|in|4|12
+Awire|net@1077|||1800|wire90@41|b|-3.5|12|pin@441||0|12
+Awire|net@1078|||900|invI@9|in|0|15.5|pin@441||0|12
+Awire|net@1079|||1800|invI@11|in|-37|12|pin@431||-36|12
+Awire|net@1080|||900|inv@34|in|-36|2|pin@383||-36|0
 Edo[Ld,Co,reD]|do[ins]|D4G2;|conn@7|a|I
 Emc_1|do[reD]|D4G2;|conn@16|a|I
 Es[4:6]|fire[zz]|D6G2;|conn@14|y|O
diff --git a/electric/experimental-branch/moveM.jelib b/electric/experimental-branch/moveM.jelib
index 9cf2034..b4d2a92 100755 (executable)
--- a/electric/experimental-branch/moveM.jelib
+++ b/electric/experimental-branch/moveM.jelib
@@ -1085,7 +1085,7 @@ EsinLO[M]|winLO[M]|D5G2;|pin@185||O
 X
 
 # Cell moveOut;3{sch}
-CmoveOut;3{sch}||schematic|1236301496751|1240755940630|
+CmoveOut;3{sch}||schematic|1236301496751|1241026330491|
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@1||6|36|||YR|
 NOff-Page|conn@3||-19|2|||Y|
@@ -1100,7 +1100,7 @@ NOff-Page|conn@25||9|42|||YRR|
 NOff-Page|conn@29||24|48|||YRRR|
 NOff-Page|conn@31||13|-1|||X|
 IredFive:inv;1{ic}|inv@9||18|-30|XYRR||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S5|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@10||39|43|X||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S5|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@10||39|43|X||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S10|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@13||-11|30|YRR||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S5|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@14||-11|18|YRR||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S5|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@15||-11|-18|YRR||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S5|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
@@ -1385,7 +1385,7 @@ EwinLO[M]||D5G5;|racesLoo@3|winLO[M]|O
 X
 
 # Cell moveRepeat;1{sch}
-CmoveRepeat;1{sch}||schematic|1236296906280|1240757378229|
+CmoveRepeat;1{sch}||schematic|1236296906280|1241026414003|
 IarbiterM:arbiter2;1{ic}|arbiter2@0||0|18|Y||D5G4;
 IarbiterM:arbiter2;1{ic}|arbiter2@1||0|-12|||D5G4;
 Ngeneric:Facet-Center|art@0||0|0||||AV
@@ -1400,7 +1400,7 @@ IredFive:invI;2{ic}|invI@0||56|3|||D5G4;|ATTR_Delay(D5G1;NPX1.75;Y-2;)I100|ATTR_
 IredFive:invI;2{ic}|invI@6||1|54|X||D5G4;|ATTR_Delay(D5G1;NPX1.75;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX1.25;Y2;)S5|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:invI;2{ic}|invI@7||-12|60|XR||D5G4;|ATTR_Delay(D5G1;NPX1.75;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX1.25;Y2;)S10|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 ImoveRepeat;1{ic}|moveRepe@0||64|69.5|||D5G4;
-IredFive:nand2;1{ic}|nand2@2||0|43|Y||D0G4;|ATTR_Delay(D5G1;NPX2.5;Y-3;)I100|ATTR_X(D5G1.5;NPX2.5;Y2.5;)S5|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:nand2;1{ic}|nand2@2||0|43|Y||D0G4;|ATTR_Delay(D5G1;NPX2.5;Y-3;)I100|ATTR_X(D5G1.5;NPX2.5;Y2.5;)S10|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:nand2;1{ic}|nand2@5||18|54|X||D0G4;|ATTR_Delay(D5G1;NPX2.5;Y-3;)I100|ATTR_X(D5G1.5;NPX2.5;Y2.5;)S5|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:nand2;1{ic}|nand2@6||0|3|||D0G4;|ATTR_Delay(D5G1;NPX2.5;Y-3;)I100|ATTR_X(D5G1.5;NPX2.5;Y2.5;)S10|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:nand2n;1{ic}|nand2n@0||18|23|Y||D0G4;|ATTR_Delay(D5G1;NPX2.5;Y-3;)I100|ATTR_X(D5G1.5;NPX2.5;Y2.5;)S20|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
diff --git a/electric/experimental-branch/predicateM.jelib b/electric/experimental-branch/predicateM.jelib
index d20d9c2..b6d4e71 100755 (executable)
--- a/electric/experimental-branch/predicateM.jelib
+++ b/electric/experimental-branch/predicateM.jelib
@@ -701,26 +701,28 @@ Evdd_34||D5G2;|scanEx3h@0|vdd_3|P
 X
 
 # Cell ohPredAll;3{sch}
-CohPredAll;3{sch}||schematic|1231960520598|1240862299703|
+CohPredAll;3{sch}||schematic|1231960520598|1241033920871|
 Ngeneric:Facet-Center|art@0||0|0||||AV
 IwiresL:bitAssignments;1{ic}|bitAssig@0||-37.5|11.5||V|D5G4;
-NOff-Page|conn@0||20.5|26||||
-NOff-Page|conn@1||20.5|29||||
-NOff-Page|conn@2||-24|23||||
+NOff-Page|conn@0||26.5|30||||
+NOff-Page|conn@1||26.5|27||||
+NOff-Page|conn@2||-24|24||||
 NOff-Page|conn@9||-23|-30||||
-NOff-Page|conn@11||-4|29||||
+NOff-Page|conn@11||-4|30||||
 NOff-Page|conn@16||-39|-19|||YRRR|
 NOff-Page|conn@17||-26.5|-9||||
 NOff-Page|conn@18||-42.5|-9|||Y|
+IredFive:inv;1{ic}|inv@1||22.5|36|||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S5|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:invI;2{ic}|invI@0||24|12|XR||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S40|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:invI;2{ic}|invI@1||-12|12|XR||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S10|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:invI;2{ic}|invI@2||39|-12|X||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S10|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:invI;2{ic}|invI@3||36.5|36|XRR||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S10|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:nand2_sy;1{ic}|nand2_sy@0||-12|1|XR||D0G4;|ATTR_Delay(D5G1;NPX2.5;Y-3;)I100|ATTR_X(D5G1.5;NPX2.5;Y2.5;)S10|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:nand2n_sy;1{ic}|nand2n_s@0||15|0|RRR||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2.5;)I100|ATTR_X(D5G1.5;NPX2;Y2.5;)S30|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 Inand3in20sr;1{ic}|nand3in2@1||24|0|R||D5G4;
 IredFive:nor2n_sy;1{ic}|nor2n_sy@0||40|-6|X||D0G4;|ATTR_Delay(D5G1;NPX3;Y-3;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX2.25;Y2.25;)S10|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IohPredAll;1{ic}|ohPredAl@1||40|35|||D5G4;
-IohPredDo;1{ic}|ohPredDo@1||9|26|||D5G4;
+IohPredAll;1{ic}|ohPredAl@1||-25|40|||D5G4;
+IohPredDo;1{ic}|ohPredDo@1||9|27|||D5G4;
 IohPredPred;1{ic}|ohPredPr@1||-4|-27|||D5G4;
 Ngeneric:Invisible-Pin|pin@0||2.5|48|||||ART_message(D5G5;)SohPredAll
 Ngeneric:Invisible-Pin|pin@1||3|44|||||ART_message(D5G3;)Sies 25 April 2009
@@ -729,7 +731,7 @@ NWire_Pin|pin@13||0|-9||||
 NWire_Pin|pin@14||18|-9||||
 NWire_Pin|pin@15||18|-0.5||||
 NBus_Pin|pin@17||-18|-24|-1|-1||
-NBus_Pin|pin@18||-18|23|-1|-1||
+NBus_Pin|pin@18||-18|24|-1|-1||
 NWire_Pin|pin@24||26|-6||||
 NWire_Pin|pin@25||24|-12||||
 NWire_Pin|pin@27||22|-12||||
@@ -757,6 +759,10 @@ NWire_Pin|pin@92||45|-16.5||||
 NBus_Pin|pin@93||-33|2|-1|-1||
 NWire_Pin|pin@94||-37|-3||||
 NBus_Pin|pin@95||-35|-16.5|-1|-1||
+NWire_Pin|pin@96||42|36|||X|
+NWire_Pin|pin@97||42|41|||X|
+NWire_Pin|pin@98||18|36||||
+NWire_Pin|pin@99||18|30||||
 IscanM:scanEx3h;1{ic}|scanEx3h@0||-32|-9|||D5G4;
 IorangeTSMC090nm:wire90;1{ic}|wire90@0||32|-6|X||D0G4;|ATTR_L(D5G1;PUD)D1000.9000000000001|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NPY-1;)I1|ATTR_width(D5G1;NPY-2;)I3
 IorangeTSMC090nm:wire90;1{ic}|wire90@1||29.5|-12|X||D0G4;|ATTR_L(D5G1;PUD)D544.0|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NPY-1;)I1|ATTR_width(D5G1;NPY-2;)I3
@@ -767,18 +773,20 @@ IorangeTSMC090nm:wire90;1{ic}|wire90@5||-5.5|6|X||D0G4;|ATTR_L(D5G1;PUD)D602.8|A
 IorangeTSMC090nm:wire90;1{ic}|wire90@6||-8.5|-9|X||D0G4;|ATTR_L(D5G1;PUD)D613.9|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NPY-1;)I1|ATTR_width(D5G1;NPY-2;)I3
 IorangeTSMC090nm:wire90;1{ic}|wire90@7||-0.5|18|X||D0G4;|ATTR_L(D5G1;PUD)D782.0|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NPY-1;)I1|ATTR_width(D5G1;NPY-2;)I3
 IorangeTSMC090nm:wire90;1{ic}|wire90@9||10|-27|X||D0G4;|ATTR_L(D5G1;PUD)D2516.8|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NPY-1;)I1|ATTR_width(D5G1;NPY-2;)I3
+IorangeTSMC090nm:wire90;1{ic}|wire90@10||30|36|||D0G4;|ATTR_L(D5G1;PUD)D215.39999999999998|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NPY-1;)I1|ATTR_width(D5G1;NPY-2;)I3
+IorangeTSMC090nm:wire90;1{ic}|wire90@11||18.5|18|X||D0G4;|ATTR_L(D5G1;PUD)D782.0|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NPY-1;)I1|ATTR_width(D5G1;NPY-2;)I3
 Awire|do[ins]|D5G2;||900|pin@91||45|-12|pin@92||45|-16.5
 Awire|fire[both]|D5G2;||900|nand2n_s@0|out|15|-2.5|pin@70||15|-27
 Awire|fire[skip]|D5G2;||900|pin@66||-12|18|invI@1|out|-12|14.5
 Awire|mc|D5G2;||2700|ohPredPr@1|mc|-11|-22|pin@46||-11|-19
-Awire|mc|D5G2;||2700|ohPredDo@1|mc|4|31|pin@75||4|36
+Awire|mc|D5G2;||2700|ohPredDo@1|mc|4|32|pin@75||4|36
 Awire|mc|D5G2;||2700|scanEx3h@0|mc|-37|-5|pin@94||-37|-3
 Awire|net@11|||2700|pin@7||-11|-6|nand2_sy@0|inb|-11|-1.5
 Awire|net@19|||2700|ohPredPr@1|resetLO|0|-22|pin@13||0|-9
 Awire|net@21|||2700|pin@14||18|-9|pin@15||18|-0.5
 Abus|net@23||-0.5|IJ0|ohPredPr@1|flag[A,B][set,clr]|-13|-24|pin@17||-18|-24
-Abus|net@24||-0.5|IJ2700|pin@17||-18|-24|pin@18||-18|23
-Abus|net@25||-0.5|IJ1800|pin@18||-18|23|ohPredDo@1|flag[A,B][set,clr]|2|23
+Abus|net@24||-0.5|IJ2700|pin@17||-18|-24|pin@18||-18|24
+Abus|net@25||-0.5|IJ1800|pin@18||-18|24|ohPredDo@1|flag[A,B][set,clr]|2|24
 Awire|net@35|||0|pin@24||26|-6|pin@7||-11|-6
 Awire|net@37|||900|nand3in2@1|inC|26|-2.5|pin@24||26|-6
 Awire|net@39|||0|nor2n_sy@0|out|37.5|-6|wire90@0|a|34.5|-6
@@ -790,8 +798,8 @@ Awire|net@50|||0|pin@27||22|-12|wire90@2|a|9|-12
 Awire|net@52|||1800|wire90@3|a|6.5|-9|pin@14||18|-9
 Awire|net@53|||0|wire90@3|b|1.5|-9|pin@13||0|-9
 Awire|net@57|||1800|pin@15||18|-0.5|nand3in2@1|resetLO|20|-0.5
-Abus|net@58||-0.5|IJ1800|ohPredDo@1|succ[skip,do]|16|29|conn@1|a|18.5|29
-Abus|net@62||-0.5|IJ1800|conn@2|y|-22|23|pin@18||-18|23
+Abus|net@58||-0.5|IJ1800|ohPredDo@1|succ[skip,do]|16|27|conn@1|a|24.5|27
+Abus|net@62||-0.5|IJ1800|conn@2|y|-22|24|pin@18||-18|24
 Awire|net@63|||2700|nand2_sy@0|out|-12|3.5|pin@29||-12|6
 Awire|net@64|||1800|pin@29||-12|6|wire90@5|b|-8|6
 Awire|net@82|||1800|wire90@4|a|22.5|6|pin@40||24|6
@@ -804,7 +812,7 @@ Awire|net@95|||2700|pin@45||-13|-9|nand2_sy@0|ina|-13|-1.5
 Awire|net@104|||1800|nor2n_sy@0|inb|42.5|-5|pin@50||45|-5
 Awire|net@106|||1800|nor2n_sy@0|ina|42.5|-7|pin@52||45|-7
 Abus|net@119||-0.5|IJ1800|conn@9|y|-21|-30|ohPredPr@1|m1cate[1:6][T,F]|-13|-30
-Abus|net@126||-0.5|IJ1800|conn@11|y|-2|29|ohPredDo@1|sel[Fl,Lo,Co,Tp,Mv,Lt,Cd]|2|29
+Abus|net@126||-0.5|IJ1800|conn@11|y|-2|30|ohPredDo@1|sel[Fl,Lo,Co,Tp,Mv,Lt,Cd]|2|30
 Awire|net@139|||0|wire90@2|b|4|-12|pin@64||3|-12
 Awire|net@140|||900|pin@64||3|-12|ohPredPr@1|do|3|-22
 Awire|net@144|||0|wire90@7|b|-3|18|pin@66||-12|18
@@ -812,24 +820,32 @@ Awire|net@146|||900|invI@0|in|24|9.5|pin@40||24|6
 Awire|net@147|||1800|wire90@5|a|-3|6|pin@30||14|6
 Awire|net@148|||900|invI@1|in|-12|9.5|pin@29||-12|6
 Awire|net@149|||1800|wire90@7|a|2|18|pin@67||5|18
-Awire|net@150|||2700|pin@67||5|18|ohPredDo@1|hit[skip]|5|21
-Awire|net@151|||900|ohPredDo@1|hit[do]|13|21|pin@68||13|18
+Awire|net@150|||2700|pin@67||5|18|ohPredDo@1|hit[skip]|5|22
+Awire|net@151|||900|ohPredDo@1|hit[do]|13|22|pin@68||13|18
 Awire|net@158|||900|pin@30||14|6|nand2n_s@0|ina|14|2.5
 Awire|net@159|||900|pin@41||16|6|nand2n_s@0|inb|16|2.5
 Awire|net@160|||0|wire90@9|b|7.5|-27|ohPredPr@1|hit[do]|5|-27
 Awire|net@161|||1800|wire90@9|a|12.5|-27|pin@70||15|-27
-Awire|net@162|||0|pin@69||24|18|pin@68||13|18
 Awire|net@166|||900|pin@69||24|18|invI@0|out|24|14.5
-Awire|net@191|||0|conn@0|a|18.5|26|ohPredDo@1|do[Lo,Co,Tp,Mv,Lt]|16|26
+Awire|net@191|||0|pin@99||18|30|ohPredDo@1|do[Lo,Co,Tp,Mv,Lt]|16|30
 Awire|net@193|||1800|wire90@1|a|32|-12|invI@2|out|36.5|-12
 Awire|net@194|||1800|invI@2|in|41.5|-12|pin@91||45|-12
 Awire|net@197|||0|scanEx3h@0|sin|-37|-9|conn@18|y|-40.5|-9
 Awire|net@198|||1800|scanEx3h@0|sout|-31|-9|conn@17|a|-28.5|-9
+Awire|net@199|||1800|invI@3|out|39|36|pin@96||42|36
+Awire|net@200|||0|invI@3|in|34|36|wire90@10|b|32.5|36
+Awire|net@202|||0|conn@0|a|24.5|30|pin@99||18|30
+Awire|net@203|||900|pin@98||18|36|pin@99||18|30
+Awire|net@205|||0|inv@1|in|20|36|pin@98||18|36
+Awire|net@206|||0|wire90@10|a|27.5|36|inv@1|out|25|36
+Awire|net@207|||0|wire90@11|b|16|18|pin@68||13|18
+Awire|net@208|||1800|wire90@11|a|21|18|pin@69||24|18
 Abus|p2p,p1p,rd|D5G2;|-0.5|IJ900|scanEx3h@0|p2p,p1p,rd|-35|-12|pin@95||-35|-16.5
 Awire|ps[do]|D5G2;||2700|pin@50||45|-5|pin@51||45|-2
 Awire|ps[skip]|D5G2;||900|pin@52||45|-7|pin@53||45|-10
-Abus|s[1,2],do[ins]|D5G2;|-0.5|IJ2700|scanEx3h@0|dIn[1:4]|-33|-6|pin@93||-33|2
+Abus|s[1,2,3]|D5G2;|-0.5|IJ2700|scanEx3h@0|dIn[1:4]|-33|-6|pin@93||-33|2
 Abus|s[1:2]|D5G2;|-0.5|IJ2700|ohPredPr@1|s[1,2]|-8|-22|pin@74||-8|-17
+Awire|s[3]|D5G2;||2700|pin@96||42|36|pin@97||42|41
 Edo[Ld,Co,Mv,Tp,Lt]|do[ins]|D6G2;|conn@0|y|O
 Eflag[A,B,D][set,clr]||D4G2;|conn@2|a|I
 Esel[rD,Fl,Ld,Co,Mv,Tp,Lt]|m1[Fl,rD]|D4G2;|conn@11|a|I
@@ -1102,15 +1118,15 @@ Esucc[do,skip]||D4G2;|conn@19|a|I
 X
 
 # Cell ohPredDo;1{ic}
-CohPredDo;1{ic}||artwork|1231960408046|1240862274120|E
+CohPredDo;1{ic}||artwork|1231960408046|1241033862816|E
 Ngeneric:Facet-Center|art@0||0|0||||AV
-Nschematic:Bus_Pin|pin@0||7|0|-1|-1||
+Nschematic:Bus_Pin|pin@0||7|3|-1|-1||
 Nschematic:Bus_Pin|pin@1||-7|-3|-1|-1||
 Nschematic:Bus_Pin|pin@3||4|-5|-1|-1||
 Nschematic:Bus_Pin|pin@4||-4|-5|-1|-1||
 Nschematic:Bus_Pin|pin@5||-5|5|-1|-1||
 Nschematic:Bus_Pin|pin@6||-7|3|-1|-1|R|
-Nschematic:Bus_Pin|pin@7||7|3|-1|-1||
+Nschematic:Bus_Pin|pin@7||7|0|-1|-1||
 NPin|pin@8||-6|-4|1|1||
 NPin|pin@9||-6|4|1|1||
 NPin|pin@10||6|4|1|1||
@@ -1119,29 +1135,29 @@ NPin|pin@12||-5|4|1|1||
 NPin|pin@13||-5|5|1|1||
 Ngeneric:Invisible-Pin|pin@14||0|0|||||ART_message(D5G2;)SpredDo
 Ngeneric:Invisible-Pin|pin@24||-6|-3|1|1||
-Ngeneric:Invisible-Pin|pin@25||6|3|1|1||
+Ngeneric:Invisible-Pin|pin@25||6|0|1|1||
 NPin|pin@26||-4|-4|1|1||
 NPin|pin@27||-4|-5|1|1||
 NPin|pin@28||4|-4|1|1||
 NPin|pin@29||4|-5|1|1||
 Ngeneric:Invisible-Pin|pin@31||-6|3|1|1|R|
-NPin|pin@32||6|0|1|1||
-NPin|pin@33||7|0|1|1||
+NPin|pin@32||6|3|1|1||
+NPin|pin@33||7|3|1|1||
 AThicker|net@0|||FS2700|pin@8||-6|-4|pin@9||-6|4
-AThicker|net@2|||FS900|pin@32||6|0|pin@11||6|-4
+AThicker|net@2|||FS900|pin@32||6|3|pin@11||6|-4
 AThicker|net@3|||FS0|pin@26||-4|-4|pin@8||-6|-4
 AThicker|net@4|||FS1800|pin@9||-6|4|pin@12||-5|4
 AThicker|net@5|||FS2700|pin@12||-5|4|pin@13||-5|5
 Aschematic:bus|net@11||-0.5|IJ0|pin@24||-6|-3|pin@1||-7|-3
-Aschematic:bus|net@14||-0.5|IJ0|pin@7||7|3|pin@25||6|3
+Aschematic:bus|net@14||-0.5|IJ0|pin@7||7|0|pin@25||6|0
 AThicker|net@21|||FS0|pin@28||4|-4|pin@26||-4|-4
 AThicker|net@22|||FS900|pin@26||-4|-4|pin@27||-4|-5
 AThicker|net@23|||FS0|pin@11||6|-4|pin@28||4|-4
 AThicker|net@24|||FS900|pin@28||4|-4|pin@29||4|-5
 Aschematic:bus|net@26||-0.5|IJ0|pin@31||-6|3|pin@6||-7|3
 AThicker|net@30|||FS0|pin@10||6|4|pin@12||-5|4
-AThicker|net@31|||FS900|pin@10||6|4|pin@32||6|0
-AThicker|net@32|||FS1800|pin@32||6|0|pin@33||7|0
+AThicker|net@31|||FS900|pin@10||6|4|pin@32||6|3
+AThicker|net@32|||FS1800|pin@32||6|3|pin@33||7|3
 Edo[Lo,Co,Tp,Mv,Lt]|do[ins]|D5G2;|pin@0||O
 Ehit[do]|fire[do]|D5G2;|pin@3||I
 Ehit[skip]|fire[skip]|D5G2;|pin@4||I
@@ -1152,7 +1168,7 @@ Esucc[skip,do]|ps[skip,do]|D5G2;|pin@7||O
 X
 
 # Cell ohPredDo;2{lay}
-CohPredDo;2{lay}||cmos90|1232115624448|1240872733825||ATTR_NCC(D5G4;NTX-0.75;Y282.75;)S["exportsConnectedByParent vdd /vdd_[0-9]+/","exportsConnectedByParent gnd /gnd_[0-9]+/","exportsConnectedByParent mc /mc_[0-9]+/"]|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1240876018803
+CohPredDo;2{lay}||cmos90|1232115624448|1241004693377||ATTR_NCC(D5G4;NTX-0.75;Y282.75;)S["exportsConnectedByParent vdd /vdd_[0-9]+/","exportsConnectedByParent gnd /gnd_[0-9]+/","exportsConnectedByParent mc /mc_[0-9]+/"]
 Ngeneric:Facet-Center|art@0||0|0||||AV
 IpredFlagDri;1{lay}|ohPredDo@2||0|-144|X||D5G4;
 NMetal-1-Pin|pin@16||36|0.5||||
@@ -1239,7 +1255,7 @@ Evdd_31||D5G4;|pinsVddG@3|vdd_1|P
 X
 
 # Cell ohPredDo;2{sch}
-CohPredDo;2{sch}||schematic|1231958508838|1240863635800|
+CohPredDo;2{sch}||schematic|1231958508838|1241025907021|
 Ngeneric:Facet-Center|art@0||0|0||||AV
 IwiresL:bitAssignments;1{ic}|bitAssig@0||-41.5|-7.5||V|D5G4;
 NOff-Page|conn@0||18.5|0||||
@@ -1266,16 +1282,20 @@ NWire_Pin|pin@51||10.5|6||||
 NWire_Pin|pin@52||-14|6||||
 NWire_Pin|pin@53||0|6||||
 Ngeneric:Invisible-Pin|pin@54||0.5|20|||||ART_message(D5G2;)Sdo[ins] is a state wire HI when instrucion underway
+NWire_Pin|pin@57||0|2||||
+NWire_Pin|pin@58||4.5|-2||||
+NWire_Pin|pin@59||4.5|-5.5||||
+Ngeneric:Invisible-Pin|pin@60||6.5|-5.5|||||ART_message(D3G2;)SSet flags instruction doesn't set do[ins]
 IpredFlagDri;1{ic}|predFlag@1||-18|1|X||D5G4;
 IdriversM:sucDri20;1{ic}|sucDri20@0||-15|-18|||D5G4;
 IdriversM:sucDri20;1{ic}|sucDri20@1||9|-18|||D5G4;
-IdriversM:sucDri40keep;1{ic}|sucDri40@0||9.5|0|Y||D5G4;
+IdriversM:sucNANDdri40keep;1{ic}|sucNANDd@0||9.5|0|Y||D5G4;
 IorangeTSMC090nm:wire90;1{ic}|wire90@2||-24|-18|||D0G4;|ATTR_L(D5G1;PUD)D309.00000000000006|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NPY-1;)S1|ATTR_width(D5G1;NPY-2;)I3
+Awire|m1[Fl]|D5G2;||900|pin@58||4.5|-2|pin@59||4.5|-5.5
 Awire|net@45|||1800|sucDri20@0|succ|-11|-18|pin@28||-6|-18
 Awire|net@47|||1800|sucDri20@1|succ|13|-18|pin@30||18|-18
 Awire|net@54|||0|wire90@2|a|-26.5|-18|pin@27||-30|-18
 Awire|net@55|||1800|wire90@2|b|-21.5|-18|sucDri20@0|in|-19|-18
-Awire|net@57|||900|pin@12||0|0|pin@35||0|-18
 Awire|net@59|||0|sucDri20@1|in|5|-18|pin@35||0|-18
 Awire|net@106|||2700|pin@25||-14|3|pin@52||-14|6
 Abus|net@112||-0.5|IJ1800|predFlag@1|sel[Cd,Fl]|-12|-2|pin@49||-7.5|-2
@@ -1284,13 +1304,16 @@ Abus|net@119||-0.5|IJ1800|conn@2|y|-29|1|predFlag@1|flag[A,B,D][set,clr]|-23|1
 Awire|net@120|||1800|predFlag@1|mc|-16|3|pin@25||-14|3
 Awire|net@121|||2700|conn@4|y|0|-28|pin@35||0|-18
 Awire|net@122|||2700|conn@6|y|-30|-28|pin@27||-30|-18
-Awire|net@123|||1800|pin@12||0|0|sucDri40@0|in|5.5|0
-Awire|net@124|||0|conn@0|a|16.5|0|sucDri40@0|succ|13.5|0
-Awire|net@125|||2700|sucDri40@0|in_1|10.5|4|pin@51||10.5|6
 Awire|net@127|||0|pin@51||10.5|6|pin@53||0|6
 Awire|net@128|||0|pin@53||0|6|pin@52||-14|6
 Awire|net@129|||900|conn@5|y|0|8|pin@53||0|6
 Abus|net@131||-0.5|IJ900|pin@49||-7.5|-2|conn@1|y|-7.5|-4.5
+Awire|net@134|||900|pin@12||0|0|pin@35||0|-18
+Awire|net@135|||1800|sucNANDd@0|succ|13.5|0|conn@0|a|16.5|0
+Awire|net@138|||900|pin@57||0|2|pin@12||0|0
+Awire|net@139|||0|sucNANDd@0|inB|8.5|-2|pin@58||4.5|-2
+Awire|net@141|||900|pin@51||10.5|6|sucNANDd@0|mc|10.5|4
+Awire|net@142|||0|sucNANDd@0|in|5.5|2|pin@57||0|2
 Awire|ps[do]|D5G2;||2700|pin@30||18|-18|pin@31||18|-13
 Awire|ps[skip]|D5G2;||2700|pin@28||-6|-18|pin@29||-6|-13
 Edo[Ld,Co,Mv,Tp,Lt]|do[ins]|D6G2;|conn@0|y|O
diff --git a/electric/experimental-branch/stageGroupsM.jelib b/electric/experimental-branch/stageGroupsM.jelib
index 814d3e4..d9376c5 100755 (executable)
--- a/electric/experimental-branch/stageGroupsM.jelib
+++ b/electric/experimental-branch/stageGroupsM.jelib
@@ -2661,7 +2661,7 @@ Esor[1:9]||D5G2;|pin@18||O
 X
 
 # Cell epiRQod;4{lay}
-CepiRQod;4{lay}||cmos90|1234832013083|1240848417057||DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1240924096374
+CepiRQod;4{lay}||cmos90|1234832013083|1241004092025||DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1240924096374
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NX-Metal-2-Metal-3-Con|contact@0||1626|-128||||
 NX-Metal-2-Metal-3-Con|contact@10||126|-116||||
The FleetCode -- http://fleet.cs.berkeley.edu/