X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=electric%2FwiresL.jelib;h=9c80bb40df8af40cd0d117b82597db6cd8e52e3b;hb=1b4dfdfeab3325f3a6a6454129d62822a55b8b14;hp=66915c16d609726f827b80592b0b81148d65a393;hpb=fb7674e61d9f9c360a7384c2075f4a72cd4696f2;p=fleet.git

diff --git a/electric/wiresL.jelib b/electric/wiresL.jelib
index 66915c1..9c80bb4 100755
--- a/electric/wiresL.jelib
+++ b/electric/wiresL.jelib
@@ -1,5 +1,5 @@
 # header information:
-HwiresL|8.09a
+HwiresL|8.09j
 
 # Views:
 Vicon|ic
@@ -35,14 +35,14 @@ AThicker|net@3|||FS0|pin@3||5|-1|pin@0||-5|-1
 X
 
 # Cell bitAssignments;1{sch}
-CbitAssignments;1{sch}||schematic|1225032312390|1232961495575|
+CbitAssignments;1{sch}||schematic|1225032312390|1240677374881|
 Ngeneric:Facet-Center|art@0||0|0||||AV
 IbitAssignments;1{ic}|bitAssig@0||3|8||V|D5G4;
-Ngeneric:Invisible-Pin|pin@0||-4.5|6|||||ART_message(D3G1.5;)S[updated 24 Jan 09,bit 20 HI is D to a counter OR,bit 20 HI is long literal,"rD = bit 21 HI removes flag[D]",Fl = bit 22 HI loads flags,Ld = bit 23 HI loads OLC or ILC,. . . . bit 21 decides which HI = OLC,. . . . bit 20 decides where from,Co = bit 24 HI decrements OLC,Mv = bit 25 HI executes move,Tp = bit 26 HI allows torpedo,Lt = bit 27 HI does literal,bit 28 HI marks a TAIL,bit 29 HI is an ABORT,bit 30 HI marks a HEAD]
+Ngeneric:Invisible-Pin|pin@0||-4.5|6|||||ART_message(D3G1.5;)S[updated 25 April 09,To = bit 15 HI is make Token output,Do = bit 16 HI is make Data output,Dc = bit 17 HI is capture data,Di = bit 18 HI is wait for data input,Ti = bit 19 HI is wait for token input,LL = bit 20 LO is immediate to a counter,LL = bit 20 HI is D to a counter OR,LL = bit 20 HI is long literal,"rD = bit 21 HI removes flag[D]",Fl = bit 22 HI loads flags,Ld = bit 23 HI loads OLC or ILC,. . . . bit 21 decides which HI = OLC,. . . . bit 20 decides where from,Co = bit 24 HI decrements OLC,Mv = bit 25 HI executes move,Tp = bit 26 HI allows torpedo,Lt = bit 27 HI does literal,bit 28 HI marks a TAIL,bit 29 HI is an ABORT,bit 30 HI marks a HEAD]
 X
 
 # Cell centerPins;1{lay}
-CcenterPins;1{lay}||cmos90|1180462114023|1238257435226|I|FACET_characteristic_spacing()D[0.0,144.0]
+CcenterPins;1{lay}||cmos90|1180462114023|1238257435226|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1242129162262|FACET_characteristic_spacing()D[0.0,144.0]
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NMetal-2-Pin|pin@3||0|3.9||||
 NMetal-2-Pin|pin@4||0|22||||
@@ -71,7 +71,7 @@ Evdd_1||D5G2;|pin@6||P
 X
 
 # Cell pinsVddGnd;1{lay}
-CpinsVddGnd;1{lay}||cmos90|1180462114023|1239549868233|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1239553775974|FACET_characteristic_spacing()D[0.0,144.0]
+CpinsVddGnd;1{lay}||cmos90|1180462114023|1241981698008|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1242253744604|FACET_characteristic_spacing()D[0.0,144.0]
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NMetal-2-Pin|pin@0||0|50|||Y|
 NMetal-2-Pin|pin@1||0|0|||Y|
@@ -82,7 +82,7 @@ Evdd_1||D5G2;|pin@2||P
 X
 
 # Cell select15;1{lay}
-Cselect15;1{lay}||cmos90|1180136751346|1239549868233|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1239553775974
+Cselect15;1{lay}||cmos90|1180136751346|1241981698008|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1241981714344
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NP-Well-Node|plnode@0||0|0|15|48||A
 NN-Well-Node|plnode@1||0|-50|15|52||A
@@ -93,7 +93,7 @@ NN-Select-Node|plnode@5||0|0|12|48||A
 X
 
 # Cell select22;1{lay}
-Cselect22;1{lay}||cmos90|1180136751346|1239549868233|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1239553775974
+Cselect22;1{lay}||cmos90|1180136751346|1241981698008|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1241981751253
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NP-Well-Node|plnode@0||0|0|22|48||A
 NN-Well-Node|plnode@1||0|-50|22|52||A
@@ -104,7 +104,7 @@ NN-Select-Node|plnode@5||0|0|19|48||A
 X
 
 # Cell select30;1{lay}
-Cselect30;1{lay}||cmos90|1180136751346|1239549868233|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1239553775974
+Cselect30;1{lay}||cmos90|1180136751346|1241981698008|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1241981714344
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NP-Well-Node|plnode@0||0|0|30|48||A
 NN-Well-Node|plnode@1||0|-50|30|52||A
@@ -115,7 +115,7 @@ NN-Select-Node|plnode@5||0|0|27|48||A
 X
 
 # Cell select40;1{lay}
-Cselect40;1{lay}||cmos90|1180136751346|1239549868233|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1239553775974
+Cselect40;1{lay}||cmos90|1180136751346|1241981698008|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1241981714344
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NP-Well-Node|plnode@0||0|0|40|48||A
 NN-Well-Node|plnode@1||0|-50|40|52||A
@@ -126,7 +126,7 @@ NN-Select-Node|plnode@5||0|0|37|48||A
 X
 
 # Cell select50;1{lay}
-Cselect50;1{lay}||cmos90|1180136751346|1239549868233|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1239553775974
+Cselect50;1{lay}||cmos90|1180136751346|1241981698008|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1241981714344
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NP-Well-Node|plnode@0||0|0|50|48||A
 NN-Well-Node|plnode@1||0|-50|50|52||A
@@ -137,7 +137,7 @@ NN-Select-Node|plnode@5||0|0|47|48||A
 X
 
 # Cell select60;1{lay}
-Cselect60;1{lay}||cmos90|1180136751346|1239549868233|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1239553775974
+Cselect60;1{lay}||cmos90|1180136751346|1241981698008|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1241981751253
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NP-Well-Node|plnode@0||0|0|60|48||A
 NN-Well-Node|plnode@1||0|-50|60|52||A
@@ -148,7 +148,7 @@ NN-Select-Node|plnode@5||0|0|57|48||A
 X
 
 # Cell select70;1{lay}
-Cselect70;1{lay}||cmos90|1180136751346|1239549868233|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1239553775974
+Cselect70;1{lay}||cmos90|1180136751346|1241981698008|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1241981751253
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NP-Well-Node|plnode@0||0|0|70|48||A
 NN-Well-Node|plnode@1||0|-50|70|52||A
@@ -159,7 +159,7 @@ NN-Select-Node|plnode@5||0|0|67|48||A
 X
 
 # Cell select80;1{lay}
-Cselect80;1{lay}||cmos90|1180136751346|1239549868233|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1239553775974
+Cselect80;1{lay}||cmos90|1180136751346|1241981698008|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1241981714344
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NP-Well-Node|plnode@0||0|0|80|48||A
 NN-Well-Node|plnode@1||0|-50|80|52||A
@@ -170,7 +170,7 @@ NN-Select-Node|plnode@5||0|0|77|48||A
 X
 
 # Cell select90;1{lay}
-Cselect90;1{lay}||cmos90|1180136751346|1239549868233|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1239553775974
+Cselect90;1{lay}||cmos90|1180136751346|1241981698008|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1241981751253
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NP-Well-Node|plnode@0||0|0|90|48||A
 NN-Well-Node|plnode@1||0|-50|90|52||A
@@ -181,7 +181,7 @@ NN-Select-Node|plnode@5||0|0|87|48||A
 X
 
 # Cell select100;1{lay}
-Cselect100;1{lay}||cmos90|1180136751346|1239549868233|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1239553775974
+Cselect100;1{lay}||cmos90|1180136751346|1241981698008|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1241981714344
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NP-Well-Node|plnode@0||0|0|100|48||A
 NN-Well-Node|plnode@1||0|-50|100|52||A
@@ -192,7 +192,7 @@ NN-Select-Node|plnode@5||0|0|97|48||A
 X
 
 # Cell select110;1{lay}
-Cselect110;1{lay}||cmos90|1180136751346|1239549868233|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1239553775974
+Cselect110;1{lay}||cmos90|1180136751346|1241981698008|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1241981751253
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NP-Well-Node|plnode@0||0|0|110|48||A
 NN-Well-Node|plnode@1||0|-50|110|52||A
@@ -203,7 +203,7 @@ NN-Select-Node|plnode@5||0|0|107|48||A
 X
 
 # Cell select132;1{lay}
-Cselect132;1{lay}||cmos90|1180136751346|1239549868233|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1239553775974
+Cselect132;1{lay}||cmos90|1180136751346|1241981698008|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1241981826991
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NP-Well-Node|plnode@0||0|0|132|48||A
 NN-Well-Node|plnode@1||0|-50|132|52||A
@@ -214,7 +214,7 @@ NN-Select-Node|plnode@5||0|0|129|48||A
 X
 
 # Cell select144;1{lay}
-Cselect144;1{lay}||cmos90|1180136751346|1239549868233|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1239553775974
+Cselect144;1{lay}||cmos90|1180136751346|1241981698008|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1241981714344
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NP-Well-Node|plnode@0||0|0|158|48||A
 NN-Well-Node|plnode@1||0|-50|158|52||A
@@ -326,7 +326,7 @@ AThicker|net@20|||FS2700|pin@25||0|1|pin@26||0|2
 X
 
 # Cell tranCap;1{lay}
-CtranCap;1{lay}||cmos90|1238423100662|1239549868233||ATTR_NCC(D5G3;NTY70;)S["exportsConnectedByParent vdd /vdd_[0-9]+/"]|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1239553775974
+CtranCap;1{lay}||cmos90|1238423100662|1241981698008||ATTR_NCC(D5G3;NTY70;)S["exportsConnectedByParent vdd /vdd_[0-9]+/"]|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1241981751253
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NMetal-1-N-Active-Con|contact@0||54|0||20.8||
 NMetal-1-P-Active-Con|contact@1||54|-48||20.8||
@@ -737,7 +737,7 @@ Evdd_3||D5G2;|pinsVddG@1|vdd_1|P
 X
 
 # Cell tranCap;1{sch}
-CtranCap;1{sch}||schematic|1238462072675|1238472309831|
+CtranCap;1{sch}||schematic|1238462072675|1241477870940||ATTR_NCC(D5G1;NTX-20.5;Y12;)SnotSubcircuit    merge fill cells
 IorangeTSMC090nm:NMOSf;1{ic}|NMOSf@1||0|-5.5|||D5G4;|ATTR_Delay(D5G1;NPX5;Y-2;)I100|ATTR_L(D5FLeave alone;G1;NOLPX5;)S3|ATTR_W(D6FLeave alone;G1;NOLPX3.5;Y1;)S360
 IorangeTSMC090nm:PMOSf;1{ic}|PMOSf@2||0|5|X||D5G4;|ATTR_Delay(D5G1;NPX5;Y-2;)I100|ATTR_L(D5FLeave alone;G1;NOLPX5;)S3|ATTR_W(D6FLeave alone;G1;NOLPX3.5;Y1;)S720
 Ngeneric:Facet-Center|art@0||0|0||||AV
@@ -776,7 +776,7 @@ Awire|net@20|||900|pwr@1||0|12|pin@7||0|9
 X
 
 # Cell wellContacts13;1{lay}
-CwellContacts13;1{lay}||cmos90|1180136751346|1239549868233|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1239553775974|FACET_characteristic_spacing()D[0.0,144.0]
+CwellContacts13;1{lay}||cmos90|1180136751346|1241981698008|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1241981714344|FACET_characteristic_spacing()D[0.0,144.0]
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NX-Metal-1-Metal-2-Con|contact@0||0|0||6.2||
 NX-Metal-1-Metal-2-Con|contact@1||0|50||6.2||
@@ -813,7 +813,7 @@ Evdd_3||D5G2;|pin@6||P
 X
 
 # Cell wellContacts26;1{lay}
-CwellContacts26;1{lay}||cmos90|1180136751346|1239549868233|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1239553775974|FACET_characteristic_spacing()D[0.0,144.0]
+CwellContacts26;1{lay}||cmos90|1180136751346|1241981698008|I|DRC_last_good_drc_bit()I10|DRC_last_good_drc_date()G1241981714344|FACET_characteristic_spacing()D[0.0,144.0]
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NX-Metal-1-Metal-2-Con|contact@0||0|0||6.2||
 NX-Metal-1-Metal-2-Con|contact@1||0|50||6.2||