From cbf7a2beb75f6061f7eeba22d83e49e339684770 Mon Sep 17 00:00:00 2001 From: rkao Date: Thu, 6 Nov 2008 21:43:45 +0000 Subject: [PATCH] make sendToken work again --- electric/gaspJ.jelib | 29 +- electric/loopCountL.jelib | 10 +- electric/marina.jelib | 458 ++++++++++++++++---- .../sun/vlsi/chips/marina/test/IsolatedInDock.java | 10 +- testCode/isolatedInDock.spi | 340 +++++++++------ testCode/isolatedInDock.xml | 95 ++-- 6 files changed, 623 insertions(+), 319 deletions(-) diff --git a/electric/gaspJ.jelib b/electric/gaspJ.jelib index 8c6d0d9..2710b09 100755 --- a/electric/gaspJ.jelib +++ b/electric/gaspJ.jelib @@ -1,5 +1,5 @@ # header information: -HgaspJ|8.08j +HgaspJ|8.08k # Views: Vicon|ic @@ -37,7 +37,7 @@ Tmocmos|ScaleFORmocmos()D100.0|SelectedFoundryFormocmos()STSMC Trcmos|ScaleFORrcmos()D1000.0 # Cell gaspBranch;1{ic} -CgaspBranch;1{ic}||artwork|1189094730318|1197068523152|EI +CgaspBranch;1{ic}||artwork|1189094730318|1226008007621|EI Ngeneric:Facet-Center|art@0||0|0||||AV Nschematic:Bus_Pin|pin@2||0|-7|-2|-2|| Nschematic:Bus_Pin|pin@4||-3|-3|-2|-2|| @@ -57,7 +57,7 @@ NPin|pin@22||1|10|1|1|| NPin|pin@23||-2|10|1|1|| NPin|pin@24||-1|9|1|1|| NPin|pin@25||-2|8|1|1|| -Ngeneric:Invisible-Pin|pin@30||0|0|||||ART_message(D5G2;)S[BRANCH,GasP] +Ngeneric:Invisible-Pin|pin@30||0|0|||||ART_message(D5G2;)S[Torpedo,GasP] Nschematic:Bus_Pin|pin@31||3|3|-2|-2|Y| Nschematic:Bus_Pin|pin@32||-3|-4|-2|-2|| NPin|pin@33||0|-6|1|1|| @@ -77,13 +77,13 @@ AThicker|net@18|||FS450|pin@24||-1|9|pin@25||-2|8 AThicker|net@19|||FS1800|pin@25||-2|8|pin@19||0|8 AThicker|net@22|||FS0|pin@17||3|-6|pin@33||0|-6 AThicker|net@23|||FS900|pin@33||0|-6|pin@34||0|-7 -EDtoB||D5G2;|pin@32||U Efire||D5G2;|pin@2||O Epred||D5G2;|pin@6||I Erscni[1:9]|sir[1:9]|D5G2;|pin@8||B Erscnt[1:9]|sor[1:9]|D5G2;|pin@10||B -Esucc[A]||D5G2;|pin@12||O Esucc[B]||D5G2;|pin@31||U +Esucc[A]|torpedo|D5G2;|pin@12||O +EDtoB|torpedoLO|D5G2;|pin@32||U X # Cell gaspBranch;2{lay} @@ -229,7 +229,7 @@ Evdd_8||D5G2;|scanEx1v@0|vdd_3|P X # Cell gaspBranch;1{sch} -CgaspBranch;1{sch}||schematic|1188827292653|1219492274970| +CgaspBranch;1{sch}||schematic|1188827292653|1226008042770| Ngeneric:Facet-Center|art@0||0|0||||AV IcentersJ:ctrAND3in100;1{ic}|center2i@0||0|10|R||D5G4; NOff-Page|conn@0||0|29|||R| @@ -240,13 +240,12 @@ NOff-Page|conn@7||-36|-6.5|||YRRR| NOff-Page|conn@8||45.5|-12|||| NOff-Page|conn@9||-13|-11|||| IgaspBranch;1{ic}|gaspMerg@0||24|37|||D5G4; +NGround|gnd@0||0|-3|||| IredFour:inv;1{ic}|inv@0||-18|0|||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S10|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1 IredFour:inv;1{ic}|inv@1||11|7|R||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S20|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1 -Ngeneric:Invisible-Pin|pin@0||-1.5|44|||||ART_message(D5G6;)SgaspBranch +Ngeneric:Invisible-Pin|pin@0||-1.5|44|||||ART_message(D5G6;)SgaspTorpedo Ngeneric:Invisible-Pin|pin@1||-2.5|35|||||ART_message(D5G3;)Sies 30 September 2007 Ngeneric:Invisible-Pin|pin@2||-3.5|39|||||ART_message(D5G4;)Sthe simple branch -NWire_Pin|pin@26||38|0|||| -NWire_Pin|pin@28||38|21|||| NWire_Pin|pin@46||-24|24|||| NWire_Pin|pin@47||-24|0|||| NWire_Pin|pin@53||-12|26|||| @@ -261,7 +260,6 @@ NWire_Pin|pin@106||11|-11|||| NWire_Pin|pin@109||-3|0|||| NWire_Pin|pin@112||38|-12|||| NWire_Pin|pin@113||38|-3|||| -NWire_Pin|pin@125||0|0|||| NWire_Pin|pin@126||3|-3|||| IdriversJ:predDri60wMC;2{ic}|predDri6@0||-18|24|RR||D5G4; IscanJ:scanEx1vertA;1{ic}|scanEx1v@0||-36|2|X||D5G4; @@ -269,8 +267,6 @@ IdriversJ:sucANDdri60;1{ic}|sucANDdr@0||24.5|21|Y||D5G4; IdriversJ:sucANDdri60;1{ic}|sucANDdr@1||24.5|-12|||D5G4; IorangeTSMC090nm:wire90;1{ic}|wire90@0||-9|0|||D0G4;|ATTR_L(D5G1;PUD)D602.3000000000004|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NPY-1;)I1|ATTR_width(D5G1;NPY-2;)I3 IorangeTSMC090nm:wire90;1{ic}|wire90@4||-48|1|||D0G4;|ATTR_L(D5G1;PUD)D602.3000000000004|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NPY-1;)I1|ATTR_width(D5G1;NPY-2;)I3 -Awire|net@39|||0|conn@2|a|41.5|21|pin@28||38|21 -Awire|net@41|||2700|pin@26||38|0|pin@28||38|21 Awire|net@79|||900|pin@46||-24|24|pin@47||-24|0 Awire|net@94|||1800|conn@4|y|-34|24|pin@46||-24|24 Awire|net@104|||2700|pin@53||-12|26|pin@54||-12|30 @@ -300,20 +296,19 @@ Abus|net@349||-0.5|IJ2700|conn@7|y|-36|-4.5|scanEx1v@0|si[1:9]|-36|0 Abus|net@350||-0.5|IJ900|conn@6|a|-36|10|scanEx1v@0|so[1:9]|-36|4 Awire|net@363|||1800|pin@105||11|20|sucANDdr@0|inB|19.5|20 Awire|net@364|||1800|pin@102||6|22|sucANDdr@0|inA|19.5|22 -Awire|net@365|||0|pin@28||38|21|sucANDdr@0|succ|29.5|21 Awire|net@366|||0|pin@112||38|-12|sucANDdr@1|succ|29.5|-12 Awire|net@367|||1800|pin@106||11|-11|sucANDdr@1|inB|19.5|-11 Awire|net@368|||1800|pin@104||6|-13|sucANDdr@1|inA|19.5|-13 -Awire|net@373|||2700|pin@125||0|0|center2i@0|inB|0|4 Awire|net@375|||2700|pin@126||3|-3|center2i@0|inA|3|4 -Awire|net@376|||0|pin@26||38|0|pin@125||0|0 -EDtoB||D4G2;|conn@9|a|I +Awire|net@377|||2700|gnd@0||0|-1|center2i@0|inB|0|4 +Awire|net@378|||0|conn@2|a|41.5|21|sucANDdr@0|succ|29.5|21 Efire||D6G2;|conn@0|y|O Epred||D4G2;|conn@4|a|I Erscni[1:9]|sir[1:9]|D4G2;|conn@7|a|B Erscnt[1:9]|sor[1:9]|D6G2;|conn@6|y|B -Esucc[A]||D6G2;|conn@2|y|O Esucc[B]||D6G2;|conn@8|y|O +Esucc[A]|torpedo|D6G2;|conn@2|y|O +EDtoB|torpedoLO|D4G2;|conn@9|a|I X # Cell gaspCross;1{ic} diff --git a/electric/loopCountL.jelib b/electric/loopCountL.jelib index fd3735a..04925d1 100755 --- a/electric/loopCountL.jelib +++ b/electric/loopCountL.jelib @@ -2302,7 +2302,7 @@ Evdd_29||D5G2;|pinsVddG@10|vdd_1|P X # Cell inMux;2{sch} -CinMux;2{sch}||schematic|1216238895693|1225909014458| +CinMux;2{sch}||schematic|1216238895693|1226011461565| Ngeneric:Facet-Center|art@0||0|0||||AV NOff-Page|conn@0||-5.5|-7.5|||| NOff-Page|conn@1||-6.5|8|||| @@ -2346,10 +2346,10 @@ NWire_Pin|pin@43||-46|-6|||| NWire_Pin|pin@44||-36|17.5|||| Ngeneric:Invisible-Pin|pin@47||-51|27.5|||||ART_message(D3G2;)S["out[7]=HI if out[1:6]",all zero = HI.,"bit[7] is also the",done bit.] NWire_Pin|pin@53||-12.5|6|||| -IorangeTSMC090nm:wire90;1{ic}|wire90@0||-0.5|15.5|||D0G4;|ATTR_L(D5FLeave alone;G1;PUD)D1400.8999999999996|ATTR_LEWIRE(P)I1|ATTR_layer(D5FLeave alone;G1;NPY-1;)I1|ATTR_width(D5FLeave alone;G1;NPY-2;)I3 -IorangeTSMC090nm:wire90;1{ic}|wire90@1||15|15.5|||D0G4;|ATTR_L(D5FLeave alone;G1;PUD)D1400.8999999999996|ATTR_LEWIRE(P)I1|ATTR_layer(D5FLeave alone;G1;NPY-1;)I1|ATTR_width(D5FLeave alone;G1;NPY-2;)I3 -IorangeTSMC090nm:wire90;1{ic}|wire90@2||-41.5|6|||D0G4;|ATTR_L(D5FLeave alone;G1;PUD)S1.4009|ATTR_LEWIRE(P)I1|ATTR_layer(D5FLeave alone;G1;NPY-1;)I1|ATTR_width(D5FLeave alone;G1;NPY-2;)I3 -IorangeTSMC090nm:wire90;1{ic}|wire90@3||-30.5|6|||D0G4;|ATTR_L(D5FLeave alone;G1;PUD)S1.4009|ATTR_LEWIRE(P)I1|ATTR_layer(D5FLeave alone;G1;NPY-1;)I1|ATTR_width(D5FLeave alone;G1;NPY-2;)I3 +IorangeTSMC090nm:wire90;1{ic}|wire90@0||-0.5|15.5|||D0G4;|ATTR_L(D5FLeave alone;G1;PUD)S0|ATTR_LEWIRE(P)I1|ATTR_layer(D5FLeave alone;G1;NPY-1;)I1|ATTR_width(D5FLeave alone;G1;NPY-2;)I3 +IorangeTSMC090nm:wire90;1{ic}|wire90@1||15|15.5|||D0G4;|ATTR_L(D5FLeave alone;G1;PUD)S0|ATTR_LEWIRE(P)I1|ATTR_layer(D5FLeave alone;G1;NPY-1;)I1|ATTR_width(D5FLeave alone;G1;NPY-2;)I3 +IorangeTSMC090nm:wire90;1{ic}|wire90@2||-41.5|6|||D0G4;|ATTR_L(D5FLeave alone;G1;PUD)S0|ATTR_LEWIRE(P)I1|ATTR_layer(D5FLeave alone;G1;NPY-1;)I1|ATTR_width(D5FLeave alone;G1;NPY-2;)I3 +IorangeTSMC090nm:wire90;1{ic}|wire90@3||-30.5|6|||D0G4;|ATTR_L(D5FLeave alone;G1;PUD)S0|ATTR_LEWIRE(P)I1|ATTR_layer(D5FLeave alone;G1;NPY-1;)I1|ATTR_width(D5FLeave alone;G1;NPY-2;)I3 Abus|inA[1:6],xx|D5G2;|-0.5|IJ900|pin@3||-3|6|pin@4||-3|2 Abus|inB[1:6,8]|D5G2;|-0.5|IJ2700|pin@5||-3|-6|pin@6||-3|-2 Abus|net@2||-0.5|IJ1800|pin@4||-3|2|mux[1:6,8]|inA[1]|5|2 diff --git a/electric/marina.jelib b/electric/marina.jelib index aedb7a9..9e8b521 100644 --- a/electric/marina.jelib +++ b/electric/marina.jelib @@ -7,10 +7,20 @@ Vschematic|sch # External Libraries: +LcentersJ|centersJ + LdockPartOD|dockPartOD +LdriversJ|driversJ + +LgaspJ|gaspJ + +LorangeTSMC090nm|orangeTSMC090nm + LredFour|redFour +LregistersJ|registersJ + LscanJ|scanJ LstageGroupsJ|stageGroupsJ @@ -83,7 +93,7 @@ Ngeneric:Facet-Center|art@0||0|0||||AV X # Cell inputDock;1{ic} -CinputDock;1{ic}||artwork|1219269890555|1225472899674|E +CinputDock;1{ic}||artwork|1219269890555|1226005359353|E Ngeneric:Facet-Center|art@0||0|0||||AV Nschematic:Bus_Pin|pin@0||-4|2|-1|-1|X| Nschematic:Bus_Pin|pin@1||0|-5|-1|-1|X| @@ -161,7 +171,7 @@ Aschematic:bus|net@43||-0.5|IJ2700|pin@41||0|7|pin@42||0|8 Aschematic:bus|net@44||-0.5|IJ1800|pin@42||0|8|pin@4||0|8 Ein[1:37,T,38:51,S]|datIn[1:37,T,38:51,S]|D5G2;|pin@0||I Eins[1:37,T,38:51,S]|instr[1:37,T,38:51,S]|D5G2;|pin@1||I -Eship[1:38,S]||D5G2;|pin@3||O +Eship[1:38,S]|ship[1:37,T,38:51,S]|D5G2;|pin@3||O Esin||D5G2;|pin@40||U Esir[2:9]||D5G2;|pin@4||B Esout||D5G2;|pin@5||B @@ -169,53 +179,82 @@ EtokOut[1:37,T,38:51,S]||D5G2;|pin@2||O X # Cell inputDock;1{sch} -CinputDock;1{sch}||schematic|1217961575693|1225903898315| +CinputDock;1{sch}||schematic|1217961575693|1226008896733| Ngeneric:Facet-Center|art@0||0|0||||AV -NOff-Page|conn@0||7|-19.5|||| -NOff-Page|conn@2||21|3.5|||| -NOff-Page|conn@4||-32.5|8|||| -NOff-Page|conn@5||-27|-19|||| -NOff-Page|conn@6||22.5|19|||| +NOff-Page|conn@0||40|10.5|||| +NOff-Page|conn@2||23|-6.5|||| +NOff-Page|conn@4||-55.5|12|||| +NOff-Page|conn@5||-55|-5|||| +NOff-Page|conn@6||21.5|34|||| NOff-Page|conn@7||-36.5|34|||Y| NOff-Page|conn@8||-37|28|||Y| NWire_Con|conn@10||-7|3|||| -NWire_Con|conn@11||-21|-22|||| -NGround|gnd@0||-17|3|||| +NWire_Con|conn@11||12|8|||| +NWire_Con|conn@13||11|-3|||| NGround|gnd@2||-7|0|||| -IinputDock;1{ic}|inputDoc@1||26.5|40.5|||D5G4; +IinputDock;1{ic}|inputDoc@1||34.5|49.5|||D5G4; Ngeneric:Invisible-Pin|pin@0||-9.5|50.5|||||ART_message(D5G4;)SFor testing Dock. RK Ngeneric:Invisible-Pin|pin@1||-10|56|||||ART_message(D5G6;)SinputDock Ngeneric:Invisible-Pin|pin@3||-48.5|46|||||ART_message(D3G2;)S["[1:37] are data bits,","T is token bit,","[38:51] are address bits",S is state wire] -NBus_Pin|pin@4||-17|-6.5|-1|-1|| -NBus_Pin|pin@5||-5|-6.5|-1|-1|| -NBus_Pin|pin@6||-21|-19.5|-1|-1|| -NBus_Pin|pin@7||-1|-19.5|-1|-1|| -NWire_Pin|pin@8||-18|-10.5|||| -NWire_Pin|pin@9||-5|-10.5|||| +NBus_Pin|pin@4||16|23.5|-1|-1|| +NBus_Pin|pin@5||28|23.5|-1|-1|| +NBus_Pin|pin@6||12|10.5|-1|-1|| +NBus_Pin|pin@7||32|10.5|-1|-1|| +NWire_Pin|pin@8||7|19.5|||| +NWire_Pin|pin@9||28|19.5|||| NBus_Pin|pin@21||-7|3|-1|-1|| NBus_Pin|pin@48||-7|34|-1|-1|| NWire_Pin|pin@49||7|28|||| -NBus_Pin|pin@50||-23|17|-1|-1|| -NWire_Pin|pin@51||-23|23|||| +NBus_Pin|pin@50||-17|17|-1|-1|| +NWire_Pin|pin@51||-32|23|||| NBus_Pin|pin@52||-7|1.75|-1|-1|| NBus_Pin|pin@53||-7|1.75|-1|-1|| -NWire_Pin|pin@54||-17|9|||| -NWire_Pin|pin@55||-17|11|||| -NWire_Pin|pin@56||-17|21|||| +NWire_Pin|pin@56||-31|21|||| NWire_Pin|pin@57||1|25|||| NWire_Pin|pin@58||1|21|||| NBus_Pin|pin@59||1|13|-1|-1|| -IstageGroupsJ:plainStageFour;1{ic}|plainSta@0||-11|-12.5|||D5G4; -NPower|pwr@0||-21|-26|||| +NBus_Pin|pin@60||-15|13|-1|-1|| +NWire_Pin|pin@63||7|-3|||| +NWire_Pin|pin@64||15|-3|||| +NBus_Pin|pin@67||-50|-11|-1|-1|| +NBus_Pin|pin@68||15|-11|-1|-1|| +NWire_Pin|pin@69||-50|-2|||| +NWire_Pin|pin@70||-25|-2|||| +NWire_Pin|pin@71||-25|13|||| +NWire_Pin|pin@72||-20|13|||| +NWire_Pin|pin@73||7|15|||| +NWire_Pin|pin@74||4|15|||| +NWire_Pin|pin@75||7|11|||| +NWire_Pin|pin@76||4|11|||| +NBus_Pin|pin@77||-48|2|-1|-1|| +NBus_Pin|pin@78||-35|2|-1|-1|| +NWire_Pin|pin@79||-11|9|||| +NWire_Pin|pin@80||-11|-8|||| +NBus_Pin|pin@81||-50|8|-1|-1|| +NWire_Pin|pin@82||-50|17|||| +NWire_Pin|pin@83||-32|18|||| +NWire_Pin|pin@84||-31|14|||| +NBus_Pin|pin@85||-29|8|-1|-1|| +NBus_Pin|pin@86||-29|17|-1|-1|| +NBus_Pin|pin@87||-22|17|-1|-1|| +NBus_Pin|pin@88||-50|21|-1|-1|| +NBus_Pin|pin@89||-37|21|-1|-1|| +IstageGroupsJ:plainStageFour;1{ic}|plainSta@0||22|17.5|||D5G4; +IstageGroupsJ:plainStageEight;1{ic}|plainSta@1||-42|-4|||D5G4; +NPower|pwr@0||12|4|||| +NPower|pwr@1||-13|11|||| IdockPartOD:ringSkipMoveLit;1{ic}|ringSkip@1||-7|23|||D5G4; IscanConverter;1{ic}|scanConv@0||-26|34|||D5G4; -Abus|data[1:37,T,38:51]|D5G1;X-1;Y1;|-0.5|IJ0|plainSta@0|ain[1:14,T],in[1:37]|-13|-19.5|pin@6||-21|-19.5 -Awire|dock2plain|D5G1;X9;||1800|ringSkip@1|sout|-5|28|pin@49||7|28 -Abus|dock2plain,sir[2:9]|D5G1;X-5;Y1;|-0.5|IJ0|plainSta@0|rscanIn[1:9]|-12|-6.5|pin@4||-17|-6.5 +ItorpedoStage;1{ic}|torpedoS@0||-42|15|||D5G4; +Abus|datIn[1:37,T,38:51]|D5G1;X-2;Y1;|-0.5|IJ0|plainSta@1|ain[1:14,T],in[1:37]|-44|-11|pin@67||-50|-11 +Awire|dataIn[S]|D5G1;X-2;Y1;||0|plainSta@1|pred|-44|-2|pin@69||-50|-2 +Abus|data[1:37,T,38:51]|D5G1;X-1;Y1;|-0.5|IJ0|plainSta@0|ain[1:14,T],in[1:37]|20|10.5|pin@6||12|10.5 Awire|fireL|D5G1;X4;||1800|ringSkip@1|fire[L]|-4|25|pin@57||1|25 Awire|fireM|D5G1;X4;||1800|ringSkip@1|fire[M]|-4|21|pin@58||1|21 -Abus|instr[1:36]|D5G1;X-3;Y1;|-0.5|IJ0|ringSkip@1|inE[1:36]|-12|17|pin@50||-23|17 -Awire|instr[S]|D5G1;X-5;Y1;||0|ringSkip@1|do[epi]|-10|23|pin@51||-23|23 +Abus|instr2[1:36]|D5G1;Y1;|-0.5|IJ0|ringSkip@1|inE[1:36]|-12|17|pin@50||-17|17 +Abus|instr2[1:37,T,38:51]|D5G1;X9;Y10;|-0.5|IJ1800|torpedoS@0|out[1:37],aout[T,1:14]|-40|8|pin@85||-29|8 +Abus|instr[1:37,T,38:51]|D5G1;X-3;Y1;|-0.5|IJ0|torpedoS@0|in[1:37],ain[T,1:14]|-44|8|pin@81||-50|8 +Awire|instr[S]|D5G1;X-1;Y1;||0|torpedoS@0|pred|-44|17|pin@82||-50|17 Abus|net@19||-1|IJ0|pin@53||-7|1.75|pin@52||-7|1.75 Awire|net@20|||2700|gnd@2||-7|2|pin@21||-7|3 Abus|net@28||-0.5|IJ0|scanConv@0|oldScan[1:9]|-28|34|conn@7|y|-34.5|34 @@ -225,22 +264,44 @@ Abus|net@43||-0.5|IJ900|pin@48||-7|34|ringSkip@1|cl[T,F],clS[T,F],rd[T,F],mc|-7| Abus|net@47||-1|IJ900|conn@10||-7|2.5|pin@53||-7|1.75 Abus|net@48||-1|FS2700|pin@52||-7|1.75|pin@21||-7|3 Abus|net@49||-0.5|900|ringSkip@1|inA[1:6]|-7|7|pin@21||-7|3 -Awire|net@50|||2700|gnd@0||-17|5|pin@54||-17|9 -Awire|net@51|||1800|pin@54||-17|9|ringSkip@1|in[C]|-10|9 -Awire|net@52|||2700|pin@54||-17|9|pin@55||-17|11 -Awire|net@53|||1800|pin@55||-17|11|ringSkip@1|loadC[T]|-10|11 -Awire|net@54|||2700|pin@55||-17|11|pin@56||-17|21 -Awire|net@55|||1800|pin@56||-17|21|ringSkip@1|torp|-10|21 -Awire|net@57|||2700|pwr@0||-21|-26|conn@11||-21|-22 -Abus|net@58||-0.5|IJ900|pin@6||-21|-19.5|conn@11||-21|-22 -Abus|sout,unused1[2:9]|D5G1;X2;Y1;|-0.5|IJ1800|plainSta@0|rscanOut[1:9]|-9|-6.5|pin@5||-5|-6.5 +Awire|net@55|||1800|pin@56||-31|21|ringSkip@1|torp|-10|21 +Awire|net@57|||2700|pwr@0||12|4|conn@11||12|8 +Abus|net@58||-0.5|IJ900|pin@6||12|10.5|conn@11||12|8 +Awire|net@63|||1800|plainSta@1|succ|-40|-2|pin@70||-25|-2 +Awire|net@64|||2700|pin@70||-25|-2|pin@71||-25|13 +Awire|net@66|||900|pin@8||7|19.5|pin@73||7|15 +Awire|net@68|||0|plainSta@0|pred|20|19.5|pin@8||7|19.5 +Awire|net@69|||2700|pin@63||7|-3|pin@75||7|11 +Awire|net@71|||0|conn@13||11|-3|pin@63||7|-3 +Awire|net@72|||0|ringSkip@1|in[C]|-10|9|pin@79||-11|9 +Awire|net@74|||0|ringSkip@1|loadC[T]|-10|11|pwr@1||-13|11 +Awire|net@77|||1800|torpedoS@0|succ[B]|-40|18|pin@83||-32|18 +Awire|net@78|||900|pin@51||-32|23|pin@83||-32|18 +Awire|net@79|||0|ringSkip@1|do[epi]|-10|23|pin@51||-32|23 +Awire|net@80|||1800|torpedoS@0|succ[A]|-40|14|pin@84||-31|14 +Awire|net@81|||2700|pin@84||-31|14|pin@56||-31|21 +Abus|net@83||-0.5|IJ2700|pin@85||-29|8|pin@86||-29|17 +Abus|net@84||-0.5|IJ1800|pin@86||-29|17|pin@87||-22|17 +Awire|pred[D]|D5G1;X2;Y1;||1800|pin@71||-25|13|pin@72||-20|13 +Abus|pred[T,D]|D5G1;Y1;|-0.5|IJ0|ringSkip@1|pred[T,D]|-10|13|pin@60||-15|13 +Awire|scan1|D5G1;X9;||1800|ringSkip@1|sout|-5|28|pin@49||7|28 +Abus|scan1,sir[2:9]|D5G1;X-1;Y1;|-0.5|IJ0|torpedoS@0|sir[1:9]|-43|21|pin@88||-50|21 +Abus|scan2,sir[2:9]|D5G1;X-2;Y1;|-0.5|IJ0|plainSta@0|rscanIn[1:9]|21|23.5|pin@4||16|23.5 +Abus|scan2,unused3[2:9]|D5G1;X1;Y2;|-0.5|IJ1800|torpedoS@0|sor[1:9]|-40|21|pin@89||-37|21 +Abus|scan3,sir[2:9]|D5G1;X-2;Y1;|-0.5|IJ0|plainSta@1|rscanIn[1:9]|-43|2|pin@77||-48|2 +Abus|scan3,unused1[2:9]|D5G1;X2;Y1;|-0.5|IJ1800|plainSta@0|rscanOut[1:9]|24|23.5|pin@5||28|23.5 +Abus|ship[1:37,T,38:51]|D5G1;X8;Y1;|-0.5|IJ1800|plainSta@1|aout[1:14,T],out[1:37]|-40|-11|pin@68||15|-11 +Awire|ship[38]|D5G1;Y-9;||900|pin@79||-11|9|pin@80||-11|-8 +Awire|ship[S]|D5G1;X2;Y1;||1800|conn@13||11|-3|pin@64||15|-3 +Abus|sout,unused2[2:9]|D5G1;X1;Y1;|-0.5|IJ1800|plainSta@1|rscanOut[1:9]|-40|2|pin@78||-35|2 +Awire|succ[D]|D5G1;Y1;||0|pin@75||7|11|pin@76||4|11 Abus|succ[T,D]|D5G1;Y-1;|-0.5|IJ1800|ringSkip@1|succ[T,D]|-4|13|pin@59||1|13 -Awire|succ[T]|D5G1;Y1;||0|plainSta@0|pred|-13|-10.5|pin@8||-18|-10.5 -Abus|tokOut[1:37,T,38:51]|D5G1;X2;Y1;|-0.5|IJ1800|plainSta@0|aout[1:14,T],out[1:37]|-9|-19.5|pin@7||-1|-19.5 -Awire|tokOut[S]|D5G1;X1;Y1;||1800|plainSta@0|succ|-9|-10.5|pin@9||-5|-10.5 +Awire|succ[T]|D5G1;Y-1;||0|pin@73||7|15|pin@74||4|15 +Abus|tokOut[1:37,T,38:51]|D5G1;X2;Y1;|-0.5|IJ1800|plainSta@0|aout[1:14,T],out[1:37]|24|10.5|pin@7||32|10.5 +Awire|tokOut[S]|D5G1;X1;Y1;||1800|plainSta@0|succ|24|19.5|pin@9||28|19.5 Ein[1:37,T,38:51,S]|datIn[1:37,T,38:51,S]|D4G2;|conn@5|a|I Eins[1:37,T,38:51,S]|instr[1:37,T,38:51,S]|D4G2;|conn@4|a|I -Eship[1:38,S]||D6G2;|conn@2|y|O +Eship[1:38,S]|ship[1:37,T,38:51,S]|D6G2;|conn@2|y|O Esin||D4G2;|conn@8|a|B Esir[2:9]||D4G2;|conn@7|a|B Esout||D6G2;|conn@6|y|B @@ -248,7 +309,7 @@ EtokOut[1:37,T,38:51,S]||D6G2;|conn@0|y|O X # Cell isolatedInDock;1{sch} -CisolatedInDock;1{sch}||schematic|1220652359667|1225831735496| +CisolatedInDock;1{sch}||schematic|1220652359667|1226006714231| Ngeneric:Facet-Center|art@0||0|0||||AV NOff-Page|conn@0||-35|21|||| NOff-Page|conn@1||-35|18|||| @@ -262,27 +323,22 @@ NBus_Pin|pin@2||0|-48|-1|-1|| NBus_Pin|pin@3||11|0|-1|-1|| NBus_Pin|pin@4||-18|2|-1|-1|| NBus_Pin|pin@5||-18|-4|-1|-1|| -NBus_Pin|pin@6||-34|2|-1|-1|| +NBus_Pin|pin@6||-41|2|-1|-1|| NBus_Pin|pin@7||-34|-4|-1|-1|| -NBus_Pin|pin@8||13|2|-1|-1|| -NBus_Pin|pin@9||28|2|-1|-1|| -NBus_Pin|pin@10||31|15|-1|-1|| -NBus_Pin|pin@11||31|-17|-1|-1|| -NBus_Pin|pin@12||34|-20|-1|-1|| -NBus_Pin|pin@13||34|18|-1|-1|| -NBus_Pin|pin@14||37|-23|-1|-1|| -NBus_Pin|pin@15||37|21|-1|-1|| +NBus_Pin|pin@10||19|15|-1|-1|| +NBus_Pin|pin@11||19|-17|-1|-1|| +NBus_Pin|pin@12||22|-20|-1|-1|| +NBus_Pin|pin@13||22|18|-1|-1|| +NBus_Pin|pin@14||25|-23|-1|-1|| +NBus_Pin|pin@15||25|21|-1|-1|| NWire_Pin|pin@16||-18|11|||| NWire_Pin|pin@17||-18|-13|||| NWire_Pin|pin@18||-34|11|||| NWire_Pin|pin@19||-34|-13|||| -NWire_Pin|pin@20||13|11|||| -NWire_Pin|pin@21||28|11|||| NWire_Pin|pin@22||-6|6|||| NWire_Pin|pin@23||6|6|||| -NBus_Pin|pin@24||0|10|-1|-1|| +NBus_Pin|pin@24||0|15|-1|-1|| NBus_Pin|pin@25||-17|15|-1|-1|| -NBus_Pin|pin@26||13|15|-1|-1|| NBus_Pin|pin@27||-16|-48|-1|-1|| NBus_Pin|pin@30||-34|-23|-1|-1|| NBus_Pin|pin@31||-34|-29|-1|-1|| @@ -293,41 +349,35 @@ NBus_Pin|pin@35||-38|-35|-1|-1|| NBus_Pin|pin@36||-35|-48|-1|-1|| NWire_Pin|pin@37||-34|-39|||| NWire_Pin|pin@38||-16|-39|||| -Ngeneric:Invisible-Pin|pin@39||9|-10|||||ART_message(D5G1;)Stext -Ngeneric:Invisible-Pin|pin@40||2|1|||||ART_message(D5G1;)Stext +NWire_Pin|pin@51||-42|11|||| +NBus_Pin|pin@52||11|-8|-1|-1|| +NBus_Pin|pin@53||-49|-8|-1|-1|| +NBus_Pin|pin@54||-49|7|-1|-1|| +NBus_Pin|pin@55||-44|7|-1|-1|| +NBus_Pin|pin@56||11|15|-1|-1|| IscanJ:scanCap;1{ic}|scanCap@0||-23|-29|||D5G4; IscanJ:scanCap;1{ic}|scanCap@1||-19|-32|||D5G4; IscanJ:scanCap;1{ic}|scanCap@2||-23|-35|||D5G4; -IstageGroupsJ:properStopper;1{ic}|shipOut|D5G1;Y12;|24|9|||D5G4; IstageGroupsJ:properStopper;1{ic}|tokOut|D5G1;Y-12;|-30|-11|XY||D5G4; Abus|datIn[1:37,T,38:51,S]|D5G1;X-1;Y1;|-0.5|IJ0|inDock|in[1:37,T,38:51,S]|-4|2|pin@0||-15|2 Abus|datIn[1:37,T,38:51]|D5G1;X1;Y1;|-0.5|IJ1800|datIn|aout[1:14,T],out[1:37]|-28|2|pin@4||-18|2 Awire|datIn[S]|D5G1;X3;Y1;||1800|datIn|succ|-28|11|pin@16||-18|11 -Abus|dockScanR[2:9]|D5G1;|-0.5|IJ2700|inDock|sir[2:9]|0|8|pin@24||0|10 +Abus|dockScanR[2:9]|D5G1;|-0.5|IJ2700|inDock|sir[2:9]|0|8|pin@24||0|15 Abus|dockScanR[I,2:9]|D5G1;X1;Y1;|-0.5|IJ1800|datIn|rscnt[1:9]|-28|15|pin@25||-17|15 Awire|dockScanR[I]|D5G1;X-2;Y1;||0|inDock|sin|-1|6|pin@22||-6|6 -Abus|dockScanR[O,2:9]|D5G1;X-1;Y1;|-0.5|IJ0|shipOut|rscni[1:9]|23|15|pin@26||13|15 +Abus|dockScanR[O,2:9]|D5G1;X-1;Y1;|-0.5|IJ0|pin@10||19|15|pin@56||11|15 Awire|dockScanR[O]|D5G1;X1;Y1;||1800|inDock|sout|2|6|pin@23||6|6 Abus|instr[1:37,T,38:51,S]|D5G1;X1;Y-17;|-0.5|IJ900|inDock|ins[1:37,T,38:51,S]|0|-5|pin@2||0|-48 Abus|instr[1:37,T,38:51]|D5G1;X2;Y1;|-0.5|IJ1800|instrIn|aout[1:14,T],out[1:37]|-28|-48|pin@27||-16|-48 Awire|instr[S]|D5G1;X5;Y1;||1800|instrIn|succ|-28|-39|pin@38||-16|-39 -Abus|net@6||-0.5|IJ0|datIn|ain[1:14,T],in[1:37]|-32|2|pin@6||-34|2 Abus|net@7||-0.5|IJ0|tokOut|aout[1:14,T],out[1:37]|-32|-4|pin@7||-34|-4 -Abus|net@9||-0.5|IJ1800|shipOut|aout[1:14,T],out[1:37]|26|2|pin@9||28|2 -Abus|net@10||-0.5|IJ1800|datIn|so[1:9]|-28|21|shipOut|si[1:9]|23|21 -Abus|net@11||-0.5|IJ1800|datIn|cscanOut[1:9]|-28|18|shipOut|cscanIn[1:9]|23|18 -Abus|net@13||-0.5|IJ1800|shipOut|rscnt[1:9]|26|15|pin@10||31|15 -Abus|net@14||-0.5|IJ900|pin@10||31|15|pin@11||31|-17 -Abus|net@15||-0.5|IJ0|pin@11||31|-17|tokOut|rscni[1:9]|-29|-17 -Abus|net@16||-0.5|IJ1800|tokOut|cscanIn[1:9]|-29|-20|pin@12||34|-20 -Abus|net@17||-0.5|IJ2700|pin@12||34|-20|pin@13||34|18 -Abus|net@18||-0.5|IJ0|pin@13||34|18|shipOut|cscanOut[1:9]|26|18 -Abus|net@19||-0.5|IJ1800|tokOut|si[1:9]|-29|-23|pin@14||37|-23 -Abus|net@20||-0.5|IJ2700|pin@14||37|-23|pin@15||37|21 -Abus|net@21||-0.5|IJ0|pin@15||37|21|shipOut|so[1:9]|26|21 +Abus|net@15||-0.5|IJ0|pin@11||19|-17|tokOut|rscni[1:9]|-29|-17 +Abus|net@16||-0.5|IJ1800|tokOut|cscanIn[1:9]|-29|-20|pin@12||22|-20 +Abus|net@17||-0.5|IJ2700|pin@12||22|-20|pin@13||22|18 +Abus|net@19||-0.5|IJ1800|tokOut|si[1:9]|-29|-23|pin@14||25|-23 +Abus|net@20||-0.5|IJ2700|pin@14||25|-23|pin@15||25|21 Awire|net@24|||0|datIn|pred|-32|11|pin@18||-34|11 Awire|net@25|||0|tokOut|succ|-32|-13|pin@19||-34|-13 -Awire|net@27|||1800|shipOut|succ|26|11|pin@21||28|11 Abus|net@38||-0.5|IJ1800|conn@0|y|-33|21|datIn|si[1:9]|-31|21 Abus|net@39||-0.5|IJ1800|conn@1|y|-33|18|datIn|cscanIn[1:9]|-31|18 Abus|net@40||-0.5|IJ1800|conn@2|y|-33|15|datIn|rscni[1:9]|-31|15 @@ -345,9 +395,16 @@ Awire|net@55|||0|instrIn|pred|-32|-39|pin@37||-34|-39 Abus|net@57||-0.5|IJ1800|instrIn|so[1:9]|-28|-29|scanCap@0|si[1:9]|-23|-29 Abus|net@58||-0.5|IJ1800|instrIn|cscanOut[1:9]|-28|-32|scanCap@1|si[1:9]|-19|-32 Abus|net@59||-0.5|IJ1800|instrIn|rscnt[1:9]|-28|-35|scanCap@2|si[1:9]|-23|-35 -Abus|ship[1:37,T,38],junk[39:51]|D5G1;X-2;Y1;|-0.5|IJ0|shipOut|ain[1:14,T],in[1:37]|22|2|pin@8||13|2 -Abus|ship[1:38,S]|D5G1;Y1;|-0.5|IJ1800|inDock|ship[1:38,S]|4|0|pin@3||11|0 -Awire|ship[S]|D5G1;X-3;Y1;||0|shipOut|pred|22|11|pin@20||13|11 +Abus|net@67||-0.5|IJ0|pin@15||25|21|datIn|so[1:9]|-28|21 +Abus|net@68||-0.5|IJ0|pin@13||22|18|datIn|cscanOut[1:9]|-28|18 +Abus|net@71||-0.5|IJ900|pin@10||19|15|pin@11||19|-17 +Abus|net@72||-0.5|IJ900|pin@3||11|0|pin@52||11|-8 +Abus|net@73||-0.5|IJ0|pin@52||11|-8|pin@53||-49|-8 +Abus|net@74||-0.5|IJ2700|pin@53||-49|-8|pin@54||-49|7 +Abus|net@76||-0.5|IJ1800|inDock|ship[1:38,S]|4|0|pin@3||11|0 +Abus|ship[1:37,T,38:51,S]|D5G1;Y1;|-0.5|IJ1800|pin@54||-49|7|pin@55||-44|7 +Abus|ship[1:37,T,38:51]|D5G1;X-1;Y1;|-0.5|IJ0|datIn|ain[1:14,T],in[1:37]|-32|2|pin@6||-41|2 +Awire|ship[S]|D5G1;X-2;Y1;||0|pin@18||-34|11|pin@51||-42|11 Abus|tokOut[1:37,T,38:51,S]|D5G1;Y1;|-0.5|IJ0|inDock|tokOut[1:37,T,38:51,S]|-4|-2|pin@1||-15|-2 Abus|tokOut[1:37,T,38:51]|D5G1;Y1;|-0.5|IJ1800|tokOut|ain[1:14,T],in[1:37]|-28|-4|pin@5||-18|-4 Awire|tokOut[S]|D5G1;X3;Y1;||1800|tokOut|pred|-28|-13|pin@17||-18|-13 @@ -537,3 +594,248 @@ Awire|rd[T]|D5G1;X4;||1800|inv@5|out|7.5|-11|pin@7||12|-11 Ecl[T,F],clS[T,F],rd[T,F],mc||D5G2;X12;|conn@1|y|U EoldScan[2:9]||D5G2;X-6;|conn@0|a|U X + +# Cell torpedoBranch;1{ic} +CtorpedoBranch;1{ic}||artwork|1189094730318|1197068523152|EI +Ngeneric:Facet-Center|art@0||0|0||||AV +Nschematic:Bus_Pin|pin@2||0|-7|-2|-2|| +Nschematic:Bus_Pin|pin@4||-3|-3|-2|-2|| +Nschematic:Bus_Pin|pin@6||-3|0|-2|-2|| +Nschematic:Bus_Pin|pin@8||-1|9|-2|-2|| +Nschematic:Bus_Pin|pin@10||2|9|-2|-2|| +Nschematic:Bus_Pin|pin@12||3|-1|-2|-2|Y| +NPin|pin@14||-3|-6|1|1|| +NPin|pin@15||-3|6|1|1|| +NPin|pin@16||3|6|1|1|| +NPin|pin@17||3|-6|1|1|| +NPin|pin@18||0|6|1|1|| +NPin|pin@19||0|8|1|1|| +NPin|pin@20||1|8|1|1|| +NPin|pin@21||2|9|1|1|| +NPin|pin@22||1|10|1|1|| +NPin|pin@23||-2|10|1|1|| +NPin|pin@24||-1|9|1|1|| +NPin|pin@25||-2|8|1|1|| +Ngeneric:Invisible-Pin|pin@30||0|0|||||ART_message(D5G2;)S[BRANCH,GasP] +Nschematic:Bus_Pin|pin@31||3|3|-2|-2|Y| +Nschematic:Bus_Pin|pin@32||-3|-4|-2|-2|| +NPin|pin@33||0|-6|1|1|| +NPin|pin@34||0|-7|1|1|| +AThicker|net@7|||FS2700|pin@14||-3|-6|pin@15||-3|6 +AThicker|net@8|||FS1800|pin@18||0|6|pin@16||3|6 +AThicker|net@9|||FS900|pin@16||3|6|pin@17||3|-6 +AThicker|net@10|||FS0|pin@33||0|-6|pin@14||-3|-6 +AThicker|net@11|||FS1800|pin@15||-3|6|pin@18||0|6 +AThicker|net@12|||FS2700|pin@18||0|6|pin@19||0|8 +AThicker|net@13|||FS1800|pin@19||0|8|pin@20||1|8 +AThicker|net@14|||FS2250|pin@20||1|8|pin@21||2|9 +AThicker|net@15|||FS3150|pin@21||2|9|pin@22||1|10 +AThicker|net@16|||FS0|pin@22||1|10|pin@23||-2|10 +AThicker|net@17|||FS1350|pin@23||-2|10|pin@24||-1|9 +AThicker|net@18|||FS450|pin@24||-1|9|pin@25||-2|8 +AThicker|net@19|||FS1800|pin@25||-2|8|pin@19||0|8 +AThicker|net@22|||FS0|pin@17||3|-6|pin@33||0|-6 +AThicker|net@23|||FS900|pin@33||0|-6|pin@34||0|-7 +EDtoB||D5G2;|pin@32||U +Efire||D5G2;|pin@2||O +Epred||D5G2;|pin@6||I +Esir[1:9]||D5G2;|pin@8||B +Esor[1:9]||D5G2;|pin@10||B +Esucc[A]||D5G2;|pin@12||O +Esucc[B]||D5G2;|pin@31||U +X + +# Cell torpedoBranch;1{sch} +CtorpedoBranch;1{sch}||schematic|1188827292653|1219492274970| +Ngeneric:Facet-Center|art@0||0|0||||AV +IcentersJ:ctrAND3in100;1{ic}|center2i@0||0|10|R||D5G4; +NOff-Page|conn@0||0|29|||R| +NOff-Page|conn@2||43.5|21|||| +NOff-Page|conn@4||-36|24|||| +NOff-Page|conn@6||-36|12|||R| +NOff-Page|conn@7||-36|-6.5|||YRRR| +NOff-Page|conn@8||45.5|-12|||| +NOff-Page|conn@9||-13|-11|||| +ItorpedoBranch;1{ic}|gaspMerg@0||24|37|||D5G4; +IredFour:inv;1{ic}|inv@0||-18|0|||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S10|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1 +IredFour:inv;1{ic}|inv@1||11|7|R||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2;)S20|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1 +Ngeneric:Invisible-Pin|pin@0||-1.5|44|||||ART_message(D5G6;)SgaspBranch +Ngeneric:Invisible-Pin|pin@1||-2.5|35|||||ART_message(D5G3;)Sies 30 September 2007 +Ngeneric:Invisible-Pin|pin@2||-3.5|39|||||ART_message(D5G4;)Sthe simple branch +NWire_Pin|pin@26||38|0|||| +NWire_Pin|pin@28||38|21|||| +NWire_Pin|pin@46||-24|24|||| +NWire_Pin|pin@47||-24|0|||| +NWire_Pin|pin@53||-12|26|||| +NWire_Pin|pin@54||-12|30|||| +NWire_Pin|pin@55||-54|30|||| +NWire_Pin|pin@86||-54|1|||| +NWire_Pin|pin@100||0|22|||| +NWire_Pin|pin@102||6|22|||| +NWire_Pin|pin@104||6|-13|||| +NWire_Pin|pin@105||11|20|||| +NWire_Pin|pin@106||11|-11|||| +NWire_Pin|pin@109||-3|0|||| +NWire_Pin|pin@112||38|-12|||| +NWire_Pin|pin@113||38|-3|||| +NWire_Pin|pin@125||0|0|||| +NWire_Pin|pin@126||3|-3|||| +IdriversJ:predDri60wMC;2{ic}|predDri6@0||-18|24|RR||D5G4; +IscanJ:scanEx1vertA;1{ic}|scanEx1v@0||-36|2|X||D5G4; +IdriversJ:sucANDdri60;1{ic}|sucANDdr@0||24.5|21|Y||D5G4; +IdriversJ:sucANDdri60;1{ic}|sucANDdr@1||24.5|-12|||D5G4; +IorangeTSMC090nm:wire90;1{ic}|wire90@0||-9|0|||D0G4;|ATTR_L(D5G1;PUD)D602.3000000000004|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NPY-1;)I1|ATTR_width(D5G1;NPY-2;)I3 +IorangeTSMC090nm:wire90;1{ic}|wire90@4||-48|1|||D0G4;|ATTR_L(D5G1;PUD)D602.3000000000004|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NPY-1;)I1|ATTR_width(D5G1;NPY-2;)I3 +Awire|net@39|||0|conn@2|a|41.5|21|pin@28||38|21 +Awire|net@41|||2700|pin@26||38|0|pin@28||38|21 +Awire|net@79|||900|pin@46||-24|24|pin@47||-24|0 +Awire|net@94|||1800|conn@4|y|-34|24|pin@46||-24|24 +Awire|net@104|||2700|pin@53||-12|26|pin@54||-12|30 +Awire|net@105|||0|pin@54||-12|30|pin@55||-54|30 +Awire|net@133|||1800|pin@46||-24|24|predDri6@0|pred|-21|24 +Awire|net@137|||0|pin@53||-12|26|predDri6@0|mc|-15|26 +Awire|net@163|||1800|wire90@0|b|-6.5|0|pin@109||-3|0 +Awire|net@185|||900|pin@55||-54|30|pin@86||-54|1 +Awire|net@188|||0|wire90@4|a|-50.5|1|pin@86||-54|1 +Awire|net@211|||0|pin@100||0|22|predDri6@0|in|-15|22 +Awire|net@240|||0|wire90@0|a|-11.5|0|inv@0|out|-15.5|0 +Awire|net@249|||1800|pin@47||-24|0|inv@0|in|-20.5|0 +Awire|net@262|||900|conn@0|a|0|27|pin@100||0|22 +Awire|net@263|||900|pin@100||0|22|center2i@0|out|0|16 +Awire|net@276|||1800|pin@112||38|-12|conn@8|a|43.5|-12 +Awire|net@277|||1800|pin@100||0|22|pin@102||6|22 +Awire|net@287|||900|pin@102||6|22|pin@104||6|-13 +Awire|net@288|||2700|inv@1|out|11|9.5|pin@105||11|20 +Awire|net@290|||900|inv@1|in|11|4.5|pin@106||11|-11 +Awire|net@296|||0|pin@106||11|-11|conn@9|y|-11|-11 +Awire|net@306|||2700|pin@112||38|-12|pin@113||38|-3 +Awire|net@315|||900|center2i@0|inC|-3|4|pin@109||-3|0 +Awire|net@327|||0|pin@113||38|-3|pin@126||3|-3 +Awire|net@347|||0|pin@47||-24|0|scanEx1v@0|dIn[1]|-31|0 +Awire|net@348|||1800|wire90@4|b|-45.5|1|scanEx1v@0|mc|-41|1 +Abus|net@349||-0.5|IJ2700|conn@7|y|-36|-4.5|scanEx1v@0|si[1:9]|-36|0 +Abus|net@350||-0.5|IJ900|conn@6|a|-36|10|scanEx1v@0|so[1:9]|-36|4 +Awire|net@363|||1800|pin@105||11|20|sucANDdr@0|inB|19.5|20 +Awire|net@364|||1800|pin@102||6|22|sucANDdr@0|inA|19.5|22 +Awire|net@365|||0|pin@28||38|21|sucANDdr@0|succ|29.5|21 +Awire|net@366|||0|pin@112||38|-12|sucANDdr@1|succ|29.5|-12 +Awire|net@367|||1800|pin@106||11|-11|sucANDdr@1|inB|19.5|-11 +Awire|net@368|||1800|pin@104||6|-13|sucANDdr@1|inA|19.5|-13 +Awire|net@373|||2700|pin@125||0|0|center2i@0|inB|0|4 +Awire|net@375|||2700|pin@126||3|-3|center2i@0|inA|3|4 +Awire|net@376|||0|pin@26||38|0|pin@125||0|0 +EDtoB||D4G2;|conn@9|a|I +Efire||D6G2;|conn@0|y|O +Epred||D4G2;|conn@4|a|I +Esir[1:9]||D4G2;|conn@7|a|B +Esor[1:9]||D6G2;|conn@6|y|B +Esucc[A]||D6G2;|conn@2|y|O +Esucc[B]||D6G2;|conn@8|y|O +X + +# Cell torpedoStage;1{ic} +CtorpedoStage;1{ic}||artwork|1181158446025|1226008557142|EI +Ngeneric:Facet-Center|art@0||0|0||||AV +Nschematic:Bus_Pin|pin@0||-2|-7|-2|-2|| +Nschematic:Bus_Pin|pin@1||2|-7|-2|-2|| +NPin|pin@4||1.5|-6|1|1|| +NPin|pin@5||2|-7|1|1|| +NPin|pin@6||1.5|-8|1|1|| +NPin|pin@12||-2|-4|1|1|| +NPin|pin@13||2|-4|1|1|| +NPin|pin@14||2|4|1|1|| +NPin|pin@15||-2|4|1|1|| +NPin|pin@16||0|-4|1|1|| +NPin|pin@17||0|-6|1|1|| +NPin|pin@20||-2|7|1|1|| +NPin|pin@21||-1|6|1|1|| +NPin|pin@22||-2|5|1|1|| +NPin|pin@23||1|5|1|1|| +NPin|pin@24||2|6|1|1|| +NPin|pin@25||1|7|1|1|| +NPin|pin@26||0|4|1|1|| +NPin|pin@27||0|5|1|1|| +Ngeneric:Invisible-Pin|pin@28||0|1|||||ART_message(D5G2;)S[torpedo,Branch] +NPin|pin@29||-2|-8|1|1|| +NPin|pin@30||-2|-6|1|1|| +Nschematic:Bus_Pin|pin@31||-1|6|-2|-2|| +Nschematic:Bus_Pin|pin@32||2|6|-2|-2|| +Nschematic:Bus_Pin|pin@33||-2|2|-2|-2|| +Nschematic:Bus_Pin|pin@34||2|-1|-2|-2|| +Nschematic:Bus_Pin|pin@35||2|-5|-2|-2|| +Nschematic:Bus_Pin|pin@36||2|3|-2|-2|| +Nschematic:Bus_Pin|pin@37||-2|-3|-2|-2|| +AThicker|net@0|||FS2700|pin@29||-2|-8|pin@30||-2|-6 +AThicker|net@1|||FS1800|pin@30||-2|-6|pin@17||0|-6 +AThicker|net@2|||FS1800|pin@16||0|-4|pin@13||2|-4 +AThicker|net@4|||FS0|pin@26||0|4|pin@15||-2|4 +AThicker|net@5|||FS900|pin@15||-2|4|pin@12||-2|-4 +AThicker|net@6|||FS1800|pin@12||-2|-4|pin@16||0|-4 +AThicker|net@7|||FS1800|pin@17||0|-6|pin@4||1.5|-6 +AThicker|net@12|||FS1166|pin@4||1.5|-6|pin@5||2|-7 +AThicker|net@13|||FS1350|pin@20||-2|7|pin@21||-1|6 +AThicker|net@14|||FS450|pin@21||-1|6|pin@22||-2|5 +AThicker|net@15|||FS1800|pin@22||-2|5|pin@27||0|5 +AThicker|net@16|||FS2250|pin@23||1|5|pin@24||2|6 +AThicker|net@17|||FS3150|pin@24||2|6|pin@25||1|7 +AThicker|net@18|||FS0|pin@25||1|7|pin@20||-2|7 +AThicker|net@19|||FS0|pin@14||2|4|pin@26||0|4 +AThicker|net@20|||FS1800|pin@27||0|5|pin@23||1|5 +AThicker|net@21|||FS2700|pin@26||0|4|pin@27||0|5 +AThicker|net@22|||FS634|pin@5||2|-7|pin@6||1.5|-8 +AThicker|net@31|||FS900|pin@14||2|4|pin@13||2|-4 +AThicker|net@34|||FS0|pin@6||1.5|-8|pin@29||-2|-8 +AThicker|net@35|||FS2700|pin@17||0|-6|pin@16||0|-4 +Ein[1:37],ain[T,1:14]||D5G2;|pin@0||I +Eout[1:37],aout[T,1:14]||D5G2;|pin@1||O +Epred||D5G2;|pin@33||I +Esir[1:9]||D5G2;|pin@31||I +Esor[1:9]||D5G2;|pin@32||O +Esucc[B]||D5G2;|pin@36||U +Esucc[A]|torpedo|D5G2;|pin@34||O +X + +# Cell torpedoStage;1{sch} +CtorpedoStage;1{sch}||schematic|1195254411267|1226008069045||ATTR_FLAG(D5G2;NTY19;)S[atomic] +IregistersJ:all1in52;1{ic}|all1in52@0||11|-18|Y||D5G4; +Ngeneric:Facet-Center|art@0||0|0||||AV +ItorpedoStage;1{ic}|branchSt@0||29|18|||D5G4; +NOff-Page|conn@0||22|-18|||| +NOff-Page|conn@1||-4|-18|||| +NOff-Page|conn@2||9|-1|||| +NOff-Page|conn@3||-8.5|0|||| +NOff-Page|conn@4||9.5|9|||| +NOff-Page|conn@5||-7.5|9|||Y| +NOff-Page|conn@6||9|3|||| +IgaspJ:gaspBranch;1{ic}|gaspPlai@0||0|0|||D5G4; +Ngeneric:Invisible-Pin|pin@0||0.5|31.5|||||ART_message(D5G6;)StorepedoStage +Ngeneric:Invisible-Pin|pin@1||-0.5|22.5|||||ART_message(D5G3;)Sies 16 November 2007 +Ngeneric:Invisible-Pin|pin@2||-1.5|26.5|||||ART_message(D5G4;)Sa stage with two successors +NWire_Pin|pin@3||0|-11|||| +NWire_Pin|pin@4||9|-11|||| +NBus_Pin|pin@5||21|11|-1|-1|| +NBus_Pin|pin@6||34|11|-1|-1|| +NWire_Pin|pin@7||-7|-4|||| +IorangeTSMC090nm:wire90;1{ic}|wire90@0||4|-11|||D0G4;|ATTR_L(D5G1;PUD)S1847|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NPY-1;)I1|ATTR_width(D5G1;NPY-2;)I3 +Awire|ain[T]|D5G1;X-2;Y-1;||0|gaspPlai@0|DtoB|-3|-4|pin@7||-7|-4 +Awire|net@0|||900|gaspPlai@0|fire|0|-7|pin@3||0|-11 +Awire|net@1|||1800|pin@3||0|-11|wire90@0|a|1.5|-11 +Awire|net@2|||1800|wire90@0|b|6.5|-11|pin@4||9|-11 +Awire|net@3|||900|pin@4||9|-11|all1in52@0|fire|9|-15 +Abus|net@4||-0.5|IJ0|conn@0|a|20|-18|all1in52@0|aout[T],out[1:37]|14|-18 +Abus|net@5||-0.5|IJ1800|conn@1|y|-2|-18|all1in52@0|ain[T],inA[1:37]|8|-18 +Awire|net@15|||1800|conn@3|y|-6.5|0|gaspPlai@0|pred|-3|0 +Awire|net@16|||0|conn@2|a|7|-1|gaspPlai@0|succ[A]|3|-1 +Awire|net@17|||0|conn@6|a|7|3|gaspPlai@0|succ[B]|3|3 +Abus|net@19||-0.5|IJ1800|conn@5|y|-5.5|9|gaspPlai@0|rscni[1:9]|-1|9 +Abus|net@20||-0.5|IJ1800|gaspPlai@0|rscnt[1:9]|2|9|conn@4|a|7.5|9 +Abus|net@21||-0.5|IJ0|branchSt@0|in[1:37],ain[T,1:14]|27|11|pin@5||21|11 +Abus|net@22||-0.5|IJ1800|branchSt@0|out[1:37],aout[T,1:14]|31|11|pin@6||34|11 +Ein[1:37],ain[T,1:14]||D4G2;|conn@1|a|I +Eout[1:37],aout[T,1:14]||D6G2;|conn@0|y|O +Epred||D4G2;|conn@3|a|I +Esir[1:9]||D4G2;|conn@5|a|B +Esor[1:9]||D6G2;|conn@4|y|B +Esucc[B]||D6G2;|conn@6|y|O +Esucc[A]|torpedo|D6G2;|conn@2|y|O +X diff --git a/testCode/com/sun/vlsi/chips/marina/test/IsolatedInDock.java b/testCode/com/sun/vlsi/chips/marina/test/IsolatedInDock.java index 89f1703..0811e0a 100644 --- a/testCode/com/sun/vlsi/chips/marina/test/IsolatedInDock.java +++ b/testCode/com/sun/vlsi/chips/marina/test/IsolatedInDock.java @@ -21,7 +21,7 @@ public class IsolatedInDock implements Design { // The instance path, from the top cell of the netlist, of the instance of infinityWithCover private final ChainControl cc; // specifies the scan chain private final ChipModel model; - public final ProperStopper datIn, tokOut, shipOut; + public final ProperStopper datIn, tokOut; public final InstructionStopper instrIn; /** Shift the report scan chain */ @@ -47,11 +47,6 @@ public class IsolatedInDock implements Design { DATA_CHAIN, REPORT_CHAIN, cc, model, indenter); - shipOut = new ProperStopper("shipOut", - CONTROL_CHAIN, - DATA_CHAIN, - REPORT_CHAIN, - cc, model, indenter); } public void masterClear(JtagTester tester) { final double WIDTH = 10; // ns @@ -72,17 +67,14 @@ public class IsolatedInDock implements Design { datIn.clear(); tokOut.clear(); instrIn.clear(); - shipOut.clear(); datIn.stop(); tokOut.stop(); instrIn.stop(); - shipOut.stop(); datIn.resetAfterMasterClear(); tokOut.resetAfterMasterClear(); instrIn.resetAfterMasterClear(); - shipOut.resetAfterMasterClear(); } public int getOLC() { shiftReport(true, false); diff --git a/testCode/isolatedInDock.spi b/testCode/isolatedInDock.spi index 4d63bf8..e5a32af 100644 --- a/testCode/isolatedInDock.spi +++ b/testCode/isolatedInDock.spi @@ -1,7 +1,7 @@ *** SPICE deck for cell isolatedInDock{sch} from library marina *** Created on Fri Sep 05, 2008 15:05:59 -*** Last revised on Tue Nov 04, 2008 12:48:55 -*** Written on Thu Nov 06, 2008 07:34:41 by Electric VLSI Design System, +*** Last revised on Thu Nov 06, 2008 13:25:14 +*** Written on Thu Nov 06, 2008 14:44:47 by Electric VLSI Design System, *version 8.08k *** Layout tech: cmos90, foundry TSMC *** UC SPICE *** , MIN_RESIST 50.0, MIN_CAPAC 0.04FF @@ -1851,6 +1851,52 @@ Xstg[4] net@48[4] net@48[3] net@48[2] net@48[1] net@48[0] net@48[13] +rscanIn[6] rscanIn[7] rscanIn[8] rscanIn[9] rscanOut[1] succ plainStage .ENDS plainStageFour +*** CELL: stageGroupsJ:plainStageEight{sch} +.SUBCKT plainStageEight ain[10] ain[11] ain[12] ain[13] ain[14] ain[1] ain[2] ++ain[3] ain[4] ain[5] ain[6] ain[7] ain[8] ain[9] ain[T] aout[10] aout[11] ++aout[12] aout[13] aout[14] aout[1] aout[2] aout[3] aout[4] aout[5] aout[6] ++aout[7] aout[8] aout[9] aout[T] in[10] in[11] in[12] in[13] in[14] in[15] ++in[16] in[17] in[18] in[19] in[1] in[20] in[21] in[22] in[23] in[24] in[25] ++in[26] in[27] in[28] in[29] in[2] in[30] in[31] in[32] in[33] in[34] in[35] ++in[36] in[37] in[3] in[4] in[5] in[6] in[7] in[8] in[9] out[10] out[11] ++out[12] out[13] out[14] out[15] out[16] out[17] out[18] out[19] out[1] ++out[20] out[21] out[22] out[23] out[24] out[25] out[26] out[27] out[28] ++out[29] out[2] out[30] out[31] out[32] out[33] out[34] out[35] out[36] ++out[37] out[3] out[4] out[5] out[6] out[7] out[8] out[9] pred rscanIn[1] ++rscanIn[2] rscanIn[3] rscanIn[4] rscanIn[5] rscanIn[6] rscanIn[7] rscanIn[8] ++rscanIn[9] rscanOut[1] succ +Xgp[1] ain[10] ain[11] ain[12] ain[13] ain[14] ain[1] ain[2] ain[3] ain[4] ++ain[5] ain[6] ain[7] ain[8] ain[9] ain[T] net@89[5] net@89[4] net@89[3] ++net@89[2] net@89[1] net@89[14] net@89[13] net@89[12] net@89[11] net@89[10] ++net@89[9] net@89[8] net@89[7] net@89[6] net@89[0] in[10] in[11] in[12] in[13] ++in[14] in[15] in[16] in[17] in[18] in[19] in[1] in[20] in[21] in[22] in[23] ++in[24] in[25] in[26] in[27] in[28] in[29] in[2] in[30] in[31] in[32] in[33] ++in[34] in[35] in[36] in[37] in[3] in[4] in[5] in[6] in[7] in[8] in[9] ++net@89[42] net@89[41] net@89[40] net@89[39] net@89[38] net@89[37] net@89[36] ++net@89[35] net@89[34] net@89[33] net@89[51] net@89[32] net@89[31] net@89[30] ++net@89[29] net@89[28] net@89[27] net@89[26] net@89[25] net@89[24] net@89[23] ++net@89[50] net@89[22] net@89[21] net@89[20] net@89[19] net@89[18] net@89[17] ++net@89[16] net@89[15] net@89[49] net@89[48] net@89[47] net@89[46] net@89[45] ++net@89[44] net@89[43] pred rscanIn[1] rscanIn[2] rscanIn[3] rscanIn[4] ++rscanIn[5] rscanIn[6] rscanIn[7] rscanIn[8] rscanIn[9] net@76[8] net@71 ++plainStageFour +Xgp[2] net@89[5] net@89[4] net@89[3] net@89[2] net@89[1] net@89[14] ++net@89[13] net@89[12] net@89[11] net@89[10] net@89[9] net@89[8] net@89[7] ++net@89[6] net@89[0] aout[10] aout[11] aout[12] aout[13] aout[14] aout[1] ++aout[2] aout[3] aout[4] aout[5] aout[6] aout[7] aout[8] aout[9] aout[T] ++net@89[42] net@89[41] net@89[40] net@89[39] net@89[38] net@89[37] net@89[36] ++net@89[35] net@89[34] net@89[33] net@89[51] net@89[32] net@89[31] net@89[30] ++net@89[29] net@89[28] net@89[27] net@89[26] net@89[25] net@89[24] net@89[23] ++net@89[50] net@89[22] net@89[21] net@89[20] net@89[19] net@89[18] net@89[17] ++net@89[16] net@89[15] net@89[49] net@89[48] net@89[47] net@89[46] net@89[45] ++net@89[44] net@89[43] out[10] out[11] out[12] out[13] out[14] out[15] out[16] ++out[17] out[18] out[19] out[1] out[20] out[21] out[22] out[23] out[24] ++out[25] out[26] out[27] out[28] out[29] out[2] out[30] out[31] out[32] ++out[33] out[34] out[35] out[36] out[37] out[3] out[4] out[5] out[6] out[7] ++out[8] out[9] net@71 net@76[8] rscanIn[2] rscanIn[3] rscanIn[4] rscanIn[5] ++rscanIn[6] rscanIn[7] rscanIn[8] rscanIn[9] rscanOut[1] succ plainStageFour +.ENDS plainStageEight + *** CELL: wiresL:bitAssignments{sch} .SUBCKT bitAssignments .ENDS bitAssignments @@ -8751,68 +8797,20 @@ XtriInv@1 s[F] s[T] inB[1] out[1] triInv-X_10 .ENDS mux10 *** CELL: orangeTSMC090nm:wire{sch} -.SUBCKT wire-C_0_011f-2740_3-R_34_667m a b -Ccap@0 gnd net@14 10.048f -Ccap@1 gnd net@8 10.048f -Ccap@2 gnd net@11 10.048f -Rres@0 net@14 a 15.833 -Rres@1 net@11 net@14 31.666 -Rres@2 b net@8 15.833 -Rres@3 net@8 net@11 31.666 -.ENDS wire-C_0_011f-2740_3-R_34_667m - -*** CELL: orangeTSMC090nm:wire90{sch} -.SUBCKT wire90-2740_3-layer_1-width_3 a b -Xwire@0 a b wire-C_0_011f-2740_3-R_34_667m -.ENDS wire90-2740_3-layer_1-width_3 - -*** CELL: orangeTSMC090nm:wire{sch} -.SUBCKT wire-C_0_011f-2463-R_34_667m a b -Ccap@0 gnd net@14 9.031f -Ccap@1 gnd net@8 9.031f -Ccap@2 gnd net@11 9.031f -Rres@0 net@14 a 14.231 -Rres@1 net@11 net@14 28.461 -Rres@2 b net@8 14.231 -Rres@3 net@8 net@11 28.461 -.ENDS wire-C_0_011f-2463-R_34_667m - -*** CELL: orangeTSMC090nm:wire90{sch} -.SUBCKT wire90-2463-layer_1-width_3 a b -Xwire@0 a b wire-C_0_011f-2463-R_34_667m -.ENDS wire90-2463-layer_1-width_3 - -*** CELL: orangeTSMC090nm:wire{sch} -.SUBCKT wire-C_0_011f-406_3-R_34_667m a b -Ccap@0 gnd net@14 1.49f -Ccap@1 gnd net@8 1.49f -Ccap@2 gnd net@11 1.49f -Rres@0 net@14 a 2.348 -Rres@1 net@11 net@14 4.695 -Rres@2 b net@8 2.348 -Rres@3 net@8 net@11 4.695 -.ENDS wire-C_0_011f-406_3-R_34_667m - -*** CELL: orangeTSMC090nm:wire90{sch} -.SUBCKT wire90-406_3-layer_1-width_3 a b -Xwire@0 a b wire-C_0_011f-406_3-R_34_667m -.ENDS wire90-406_3-layer_1-width_3 - -*** CELL: orangeTSMC090nm:wire{sch} -.SUBCKT wire-C_0_011f-381_8-R_34_667m a b -Ccap@0 gnd net@14 1.4f -Ccap@1 gnd net@8 1.4f -Ccap@2 gnd net@11 1.4f -Rres@0 net@14 a 2.206 -Rres@1 net@11 net@14 4.412 -Rres@2 b net@8 2.206 -Rres@3 net@8 net@11 4.412 -.ENDS wire-C_0_011f-381_8-R_34_667m +.SUBCKT wire-C_0_011f-0-R_34_667m a b +Ccap@0 gnd net@14 0 +Ccap@1 gnd net@8 0 +Ccap@2 gnd net@11 0 +Rres@0 net@14 a 0 +Rres@1 net@11 net@14 0 +Rres@2 b net@8 0 +Rres@3 net@8 net@11 0 +.ENDS wire-C_0_011f-0-R_34_667m *** CELL: orangeTSMC090nm:wire90{sch} -.SUBCKT wire90-381_8-layer_1-width_3 a b -Xwire@0 a b wire-C_0_011f-381_8-R_34_667m -.ENDS wire90-381_8-layer_1-width_3 +.SUBCKT wire90-0-layer_1-width_3 a b +Xwire@0 a b wire-C_0_011f-0-R_34_667m +.ENDS wire90-0-layer_1-width_3 *** CELL: loopCountL:inMux{sch} .SUBCKT inMux inA[1] inA[2] inA[3] inA[4] inA[5] inA[6] inB[1] inB[2] inB[3] @@ -8830,10 +8828,10 @@ Xmux[8] gnd inB[8] out[8] s[F] s[T] mux10 Xnand3@1 out[1] out[2] out[5] net@25 nand3-X_6_667 Xnand3@2 out[3] out[4] out[6] net@24 nand3-X_6_667 Xnor2n_sy@0 net@18 net@20 out[7] nor2n_sy-X_10 -Xwire90@0 net@10 s[F] wire90-2740_3-layer_1-width_3 -Xwire90@1 net@12 s[T] wire90-2463-layer_1-width_3 -Xwire90@2 net@24 net@20 wire90-406_3-layer_1-width_3 -Xwire90@3 net@18 net@25 wire90-381_8-layer_1-width_3 +Xwire90@0 net@10 s[F] wire90-0-layer_1-width_3 +Xwire90@1 net@12 s[T] wire90-0-layer_1-width_3 +Xwire90@2 net@24 net@20 wire90-0-layer_1-width_3 +Xwire90@3 net@18 net@25 wire90-0-layer_1-width_3 .ENDS inMux *** CELL: orangeTSMC090nm:wire{sch} @@ -11119,6 +11117,50 @@ Xinv@6 oldScan[9] net@3 inv-X_5 Xinv@7 net@3 mc inv-X_5 .ENDS scanConverter +*** CELL: gaspJ:gaspBranch{sch} +.SUBCKT gaspBranch fire pred sir[1] sir[2] sir[3] sir[4] sir[5] sir[6] sir[7] ++sir[8] sir[9] sor[1] succ[B] torpedo torpedoLO +Xcenter2i@0 succ[B] gnd net@163 fire ctrAND3in100 +Xinv@0 pred net@240 inv-X_10 +Xinv@1 torpedoLO net@288 inv-X_20 +XpredDri6@0 fire net@104 pred predDri60wMC +XscanEx1v@0 pred sir[9] sir[1] sir[2] sir[3] sir[4] sir[5] sir[6] sir[7] ++sir[8] sor[1] scanEx1vertA +XsucANDdr@0 fire net@288 torpedo sucANDdri60 +XsucANDdr@1 fire torpedoLO succ[B] sucANDdri60 +Xwire90@0 net@240 net@163 wire90-602_3-layer_1-width_3 +Xwire90@4 net@104 sir[9] wire90-602_3-layer_1-width_3 +.ENDS gaspBranch + +*** CELL: torpedoStage{sch} +.SUBCKT torpedoStage ain[10] ain[11] ain[12] ain[13] ain[14] ain[1] ain[2] ++ain[3] ain[4] ain[5] ain[6] ain[7] ain[8] ain[9] ain[T] aout[10] aout[11] ++aout[12] aout[13] aout[14] aout[1] aout[2] aout[3] aout[4] aout[5] aout[6] ++aout[7] aout[8] aout[9] aout[T] in[10] in[11] in[12] in[13] in[14] in[15] ++in[16] in[17] in[18] in[19] in[1] in[20] in[21] in[22] in[23] in[24] in[25] ++in[26] in[27] in[28] in[29] in[2] in[30] in[31] in[32] in[33] in[34] in[35] ++in[36] in[37] in[3] in[4] in[5] in[6] in[7] in[8] in[9] out[10] out[11] ++out[12] out[13] out[14] out[15] out[16] out[17] out[18] out[19] out[1] ++out[20] out[21] out[22] out[23] out[24] out[25] out[26] out[27] out[28] ++out[29] out[2] out[30] out[31] out[32] out[33] out[34] out[35] out[36] ++out[37] out[3] out[4] out[5] out[6] out[7] out[8] out[9] pred sir[1] sir[2] ++sir[3] sir[4] sir[5] sir[6] sir[7] sir[8] sir[9] sor[1] succ[B] torpedo +Xall1in52@0 ain[10] ain[11] ain[12] ain[13] ain[14] ain[1] ain[2] ain[3] ++ain[4] ain[5] ain[6] ain[7] ain[8] ain[9] ain[T] aout[10] aout[11] aout[12] ++aout[13] aout[14] aout[1] aout[2] aout[3] aout[4] aout[5] aout[6] aout[7] ++aout[8] aout[9] aout[T] net@2 in[10] in[11] in[12] in[13] in[14] in[15] ++in[16] in[17] in[18] in[19] in[1] in[20] in[21] in[22] in[23] in[24] in[25] ++in[26] in[27] in[28] in[29] in[2] in[30] in[31] in[32] in[33] in[34] in[35] ++in[36] in[37] in[3] in[4] in[5] in[6] in[7] in[8] in[9] out[10] out[11] ++out[12] out[13] out[14] out[15] out[16] out[17] out[18] out[19] out[1] ++out[20] out[21] out[22] out[23] out[24] out[25] out[26] out[27] out[28] ++out[29] out[2] out[30] out[31] out[32] out[33] out[34] out[35] out[36] ++out[37] out[3] out[4] out[5] out[6] out[7] out[8] out[9] all1in52 +XgaspPlai@0 net@0 pred sir[1] sir[2] sir[3] sir[4] sir[5] sir[6] sir[7] ++sir[8] sir[9] sor[1] succ[B] torpedo ain[T] gaspBranch +Xwire90@0 net@0 net@2 wire90-1847-layer_1-width_3 +.ENDS torpedoStage + *** CELL: inputDock{sch} .SUBCKT inputDock datIn[10] datIn[11] datIn[12] datIn[13] datIn[14] datIn[15] +datIn[16] datIn[17] datIn[18] datIn[19] datIn[1] datIn[20] datIn[21] @@ -11138,16 +11180,18 @@ Xinv@7 net@3 mc inv-X_5 +ship[12] ship[13] ship[14] ship[15] ship[16] ship[17] ship[18] ship[19] +ship[1] ship[20] ship[21] ship[22] ship[23] ship[24] ship[25] ship[26] +ship[27] ship[28] ship[29] ship[2] ship[30] ship[31] ship[32] ship[33] -+ship[34] ship[35] ship[36] ship[37] ship[38] ship[3] ship[4] ship[5] ship[6] -+ship[7] ship[8] ship[9] ship[S] sin sir[2] sir[3] sir[4] sir[5] sir[6] sir[7] -+sir[8] sir[9] sout tokOut[10] tokOut[11] tokOut[12] tokOut[13] tokOut[14] -+tokOut[15] tokOut[16] tokOut[17] tokOut[18] tokOut[19] tokOut[1] tokOut[20] -+tokOut[21] tokOut[22] tokOut[23] tokOut[24] tokOut[25] tokOut[26] tokOut[27] -+tokOut[28] tokOut[29] tokOut[2] tokOut[30] tokOut[31] tokOut[32] tokOut[33] -+tokOut[34] tokOut[35] tokOut[36] tokOut[37] tokOut[38] tokOut[39] tokOut[3] -+tokOut[40] tokOut[41] tokOut[42] tokOut[43] tokOut[44] tokOut[45] tokOut[46] -+tokOut[47] tokOut[48] tokOut[49] tokOut[4] tokOut[50] tokOut[51] tokOut[5] -+tokOut[6] tokOut[7] tokOut[8] tokOut[9] tokOut[S] tokOut[T] ++ship[34] ship[35] ship[36] ship[37] ship[38] ship[39] ship[3] ship[40] ++ship[41] ship[42] ship[43] ship[44] ship[45] ship[46] ship[47] ship[48] ++ship[49] ship[4] ship[50] ship[51] ship[5] ship[6] ship[7] ship[8] ship[9] ++ship[S] ship[T] sin sir[2] sir[3] sir[4] sir[5] sir[6] sir[7] sir[8] sir[9] ++sout tokOut[10] tokOut[11] tokOut[12] tokOut[13] tokOut[14] tokOut[15] ++tokOut[16] tokOut[17] tokOut[18] tokOut[19] tokOut[1] tokOut[20] tokOut[21] ++tokOut[22] tokOut[23] tokOut[24] tokOut[25] tokOut[26] tokOut[27] tokOut[28] ++tokOut[29] tokOut[2] tokOut[30] tokOut[31] tokOut[32] tokOut[33] tokOut[34] ++tokOut[35] tokOut[36] tokOut[37] tokOut[38] tokOut[39] tokOut[3] tokOut[40] ++tokOut[41] tokOut[42] tokOut[43] tokOut[44] tokOut[45] tokOut[46] tokOut[47] ++tokOut[48] tokOut[49] tokOut[4] tokOut[50] tokOut[51] tokOut[5] tokOut[6] ++tokOut[7] tokOut[8] tokOut[9] tokOut[S] tokOut[T] XplainSta@0 vdd vdd vdd vdd vdd vdd vdd vdd vdd vdd vdd vdd vdd vdd vdd +tokOut[46] tokOut[47] tokOut[48] tokOut[49] tokOut[50] tokOut[T] tokOut[38] +tokOut[39] tokOut[40] tokOut[41] tokOut[42] tokOut[43] tokOut[44] tokOut[45] @@ -11158,19 +11202,52 @@ XplainSta@0 vdd vdd vdd vdd vdd vdd vdd vdd vdd vdd vdd vdd vdd vdd vdd +tokOut[22] tokOut[23] tokOut[24] tokOut[25] tokOut[26] tokOut[27] tokOut[28] +tokOut[29] tokOut[2] tokOut[30] tokOut[31] tokOut[32] tokOut[33] tokOut[34] +tokOut[35] tokOut[36] tokOut[37] tokOut[3] tokOut[4] tokOut[5] tokOut[6] -+tokOut[7] tokOut[8] tokOut[9] succ[T] dock2plain sir[2] sir[3] sir[4] sir[5] -+sir[6] sir[7] sir[8] sir[9] sout tokOut[S] plainStageFour -XringSkip@1 net@43[3] net@43[4] net@43[5] net@43[6] instr[S] fireL fireM -+net@49[5] net@49[4] net@49[3] net@49[2] net@49[1] net@49[0] instr[10] -+instr[11] instr[12] instr[13] instr[14] instr[15] instr[16] instr[17] -+instr[18] instr[19] instr[1] instr[20] instr[21] instr[22] instr[23] -+instr[24] instr[25] instr[26] instr[27] instr[28] instr[29] instr[2] -+instr[30] instr[31] instr[32] instr[33] instr[34] instr[35] instr[36] -+instr[3] instr[4] instr[5] instr[6] instr[7] instr[8] instr[9] gnd gnd -+net@43[0] ringSkip@1_olcNZ ringSkip@1_pred[D] ringSkip@1_pred[T] net@43[1] -+net@43[2] sin dock2plain succ[D] succ[T] gnd ringSkipMoveLit ++tokOut[7] tokOut[8] tokOut[9] succ[T] scan2 sir[2] sir[3] sir[4] sir[5] ++sir[6] sir[7] sir[8] sir[9] scan3 tokOut[S] plainStageFour +XplainSta@1 datIn[46] datIn[47] datIn[48] datIn[49] datIn[50] datIn[T] ++datIn[38] datIn[39] datIn[40] datIn[41] datIn[42] datIn[43] datIn[44] ++datIn[45] datIn[51] ship[46] ship[47] ship[48] ship[49] ship[50] ship[T] ++ship[38] ship[39] ship[40] ship[41] ship[42] ship[43] ship[44] ship[45] ++ship[51] datIn[10] datIn[11] datIn[12] datIn[13] datIn[14] datIn[15] ++datIn[16] datIn[17] datIn[18] datIn[19] datIn[1] datIn[20] datIn[21] ++datIn[22] datIn[23] datIn[24] datIn[25] datIn[26] datIn[27] datIn[28] ++datIn[29] datIn[2] datIn[30] datIn[31] datIn[32] datIn[33] datIn[34] ++datIn[35] datIn[36] datIn[37] datIn[3] datIn[4] datIn[5] datIn[6] datIn[7] ++datIn[8] datIn[9] ship[10] ship[11] ship[12] ship[13] ship[14] ship[15] ++ship[16] ship[17] ship[18] ship[19] ship[1] ship[20] ship[21] ship[22] ++ship[23] ship[24] ship[25] ship[26] ship[27] ship[28] ship[29] ship[2] ++ship[30] ship[31] ship[32] ship[33] ship[34] ship[35] ship[36] ship[37] ++ship[3] ship[4] ship[5] ship[6] ship[7] ship[8] ship[9] dataIn[S] scan3 ++sir[2] sir[3] sir[4] sir[5] sir[6] sir[7] sir[8] sir[9] sout pred[D] ++plainStageEight +XringSkip@1 net@43[3] net@43[4] net@43[5] net@43[6] net@77 fireL fireM ++net@49[5] net@49[4] net@49[3] net@49[2] net@49[1] net@49[0] instr2[10] ++instr2[11] instr2[12] instr2[13] instr2[14] instr2[15] instr2[16] instr2[17] ++instr2[18] instr2[19] instr2[1] instr2[20] instr2[21] instr2[22] instr2[23] ++instr2[24] instr2[25] instr2[26] instr2[27] instr2[28] instr2[29] instr2[2] ++instr2[30] instr2[31] instr2[32] instr2[33] instr2[34] instr2[35] instr2[36] ++instr2[3] instr2[4] instr2[5] instr2[6] instr2[7] instr2[8] instr2[9] ++ship[38] vdd net@43[0] ringSkip@1_olcNZ pred[D] pred[T] net@43[1] net@43[2] ++sin scan1 ship[S] succ[T] net@55 ringSkipMoveLit XscanConv@0 net@43[3] net@43[4] net@43[5] net@43[6] net@43[0] sir[2] sir[3] +sir[4] sir[5] sir[6] sir[7] sir[8] sir[9] net@43[1] net@43[2] scanConverter +XtorpedoS@0 instr[47] instr[48] instr[49] instr[50] instr[51] instr[38] ++instr[39] instr[40] instr[41] instr[42] instr[43] instr[44] instr[45] ++instr[46] instr[T] instr2[47] instr2[48] instr2[49] instr2[50] instr2[51] ++instr2[38] instr2[39] instr2[40] instr2[41] instr2[42] instr2[43] instr2[44] ++instr2[45] instr2[46] instr2[T] instr[10] instr[11] instr[12] instr[13] ++instr[14] instr[15] instr[16] instr[17] instr[18] instr[19] instr[1] ++instr[20] instr[21] instr[22] instr[23] instr[24] instr[25] instr[26] ++instr[27] instr[28] instr[29] instr[2] instr[30] instr[31] instr[32] ++instr[33] instr[34] instr[35] instr[36] instr[37] instr[3] instr[4] instr[5] ++instr[6] instr[7] instr[8] instr[9] instr2[10] instr2[11] instr2[12] ++instr2[13] instr2[14] instr2[15] instr2[16] instr2[17] instr2[18] instr2[19] ++instr2[1] instr2[20] instr2[21] instr2[22] instr2[23] instr2[24] instr2[25] ++instr2[26] instr2[27] instr2[28] instr2[29] instr2[2] instr2[30] instr2[31] ++instr2[32] instr2[33] instr2[34] instr2[35] instr2[36] instr2[37] instr2[3] ++instr2[4] instr2[5] instr2[6] instr2[7] instr2[8] instr2[9] instr[S] scan1 ++sir[2] sir[3] sir[4] sir[5] sir[6] sir[7] sir[8] sir[9] scan2 net@77 net@55 ++torpedoStage .ENDS inputDock *** CELL: scanJ:scanCap{sch} @@ -11180,26 +11257,25 @@ XscanConv@0 net@43[3] net@43[4] net@43[5] net@43[6] net@43[0] sir[2] sir[3] .global gnd vdd *** TOP LEVEL CELL: isolatedInDock{sch} -XdatIn net@6[4] net@6[3] net@6[2] net@6[1] net@6[0] net@6[13] net@6[12] -+net@6[11] net@6[10] net@6[9] net@6[8] net@6[7] net@6[6] net@6[5] net@6[14] +XdatIn ship[47] ship[48] ship[49] ship[50] ship[51] ship[38] ship[39] ++ship[40] ship[41] ship[42] ship[43] ship[44] ship[45] ship[46] ship[T] +datIn[47] datIn[48] datIn[49] datIn[50] datIn[51] datIn[38] datIn[39] +datIn[40] datIn[41] datIn[42] datIn[43] datIn[44] datIn[45] datIn[46] -+datIn[T] net@6[42] net@6[41] net@6[40] net@6[39] net@6[38] net@6[37] -+net@6[36] net@6[35] net@6[34] net@6[33] net@6[51] net@6[32] net@6[31] -+net@6[30] net@6[29] net@6[28] net@6[27] net@6[26] net@6[25] net@6[24] -+net@6[23] net@6[50] net@6[22] net@6[21] net@6[20] net@6[19] net@6[18] -+net@6[17] net@6[16] net@6[15] net@6[49] net@6[48] net@6[47] net@6[46] -+net@6[45] net@6[44] net@6[43] datIn[10] datIn[11] datIn[12] datIn[13] -+datIn[14] datIn[15] datIn[16] datIn[17] datIn[18] datIn[19] datIn[1] -+datIn[20] datIn[21] datIn[22] datIn[23] datIn[24] datIn[25] datIn[26] -+datIn[27] datIn[28] datIn[29] datIn[2] datIn[30] datIn[31] datIn[32] -+datIn[33] datIn[34] datIn[35] datIn[36] datIn[37] datIn[3] datIn[4] datIn[5] -+datIn[6] datIn[7] datIn[8] datIn[9] net@24 scanInC[1] scanInC[2] scanInC[3] -+scanInC[4] scanInC[5] scanInC[3] scanInC[2] scanInC[8] scanInC[9] scanInD[1] -+scanInD[2] scanInD[3] scanInD[4] scanInD[5] scanInD[6] scanInD[7] scanInD[8] -+scanInD[9] scanInR[1] scanInR[2] scanInR[3] scanInR[4] scanInR[5] scanInR[3] -+scanInR[2] scanInR[8] scanInR[9] net@11[8] net@10[8] net@10[7] net@10[6] -+net@10[5] net@10[4] dockScanR[I] datIn[S] properStopper ++datIn[T] ship[10] ship[11] ship[12] ship[13] ship[14] ship[15] ship[16] ++ship[17] ship[18] ship[19] ship[1] ship[20] ship[21] ship[22] ship[23] ++ship[24] ship[25] ship[26] ship[27] ship[28] ship[29] ship[2] ship[30] ++ship[31] ship[32] ship[33] ship[34] ship[35] ship[36] ship[37] ship[3] ++ship[4] ship[5] ship[6] ship[7] ship[8] ship[9] datIn[10] datIn[11] datIn[12] ++datIn[13] datIn[14] datIn[15] datIn[16] datIn[17] datIn[18] datIn[19] ++datIn[1] datIn[20] datIn[21] datIn[22] datIn[23] datIn[24] datIn[25] ++datIn[26] datIn[27] datIn[28] datIn[29] datIn[2] datIn[30] datIn[31] ++datIn[32] datIn[33] datIn[34] datIn[35] datIn[36] datIn[37] datIn[3] datIn[4] ++datIn[5] datIn[6] datIn[7] datIn[8] datIn[9] ship[S] scanInC[1] scanInC[2] ++scanInC[3] scanInC[4] scanInC[5] scanInC[3] scanInC[2] scanInC[8] scanInC[9] ++scanInD[1] scanInD[2] scanInD[3] scanInD[4] scanInD[5] scanInD[6] scanInD[7] ++scanInD[8] scanInD[9] scanInR[1] scanInR[2] scanInR[3] scanInR[4] scanInR[5] ++scanInR[3] scanInR[2] scanInR[8] scanInR[9] net@68[8] net@67[8] net@67[7] ++net@67[6] net@67[5] net@67[4] dockScanR[I] datIn[S] properStopper XinDock datIn[10] datIn[11] datIn[12] datIn[13] datIn[14] datIn[15] datIn[16] +datIn[17] datIn[18] datIn[19] datIn[1] datIn[20] datIn[21] datIn[22] +datIn[23] datIn[24] datIn[25] datIn[26] datIn[27] datIn[28] datIn[29] @@ -11218,17 +11294,19 @@ XinDock datIn[10] datIn[11] datIn[12] datIn[13] datIn[14] datIn[15] datIn[16] +ship[13] ship[14] ship[15] ship[16] ship[17] ship[18] ship[19] ship[1] +ship[20] ship[21] ship[22] ship[23] ship[24] ship[25] ship[26] ship[27] +ship[28] ship[29] ship[2] ship[30] ship[31] ship[32] ship[33] ship[34] -+ship[35] ship[36] ship[37] ship[38] ship[3] ship[4] ship[5] ship[6] ship[7] -+ship[8] ship[9] ship[S] dockScanR[I] scanInR[2] scanInR[3] scanInR[4] -+scanInR[5] scanInR[3] scanInR[2] scanInR[8] scanInR[9] dockScanR[O] -+tokOut[10] tokOut[11] tokOut[12] tokOut[13] tokOut[14] tokOut[15] tokOut[16] -+tokOut[17] tokOut[18] tokOut[19] tokOut[1] tokOut[20] tokOut[21] tokOut[22] -+tokOut[23] tokOut[24] tokOut[25] tokOut[26] tokOut[27] tokOut[28] tokOut[29] -+tokOut[2] tokOut[30] tokOut[31] tokOut[32] tokOut[33] tokOut[34] tokOut[35] -+tokOut[36] tokOut[37] tokOut[38] tokOut[39] tokOut[3] tokOut[40] tokOut[41] -+tokOut[42] tokOut[43] tokOut[44] tokOut[45] tokOut[46] tokOut[47] tokOut[48] -+tokOut[49] tokOut[4] tokOut[50] tokOut[51] tokOut[5] tokOut[6] tokOut[7] -+tokOut[8] tokOut[9] tokOut[S] tokOut[T] inputDock ++ship[35] ship[36] ship[37] ship[38] ship[39] ship[3] ship[40] ship[41] ++ship[42] ship[43] ship[44] ship[45] ship[46] ship[47] ship[48] ship[49] ++ship[4] ship[50] ship[51] ship[5] ship[6] ship[7] ship[8] ship[9] ship[S] ++ship[T] dockScanR[I] scanInR[2] scanInR[3] scanInR[4] scanInR[5] scanInR[3] ++scanInR[2] scanInR[8] scanInR[9] dockScanR[O] tokOut[10] tokOut[11] ++tokOut[12] tokOut[13] tokOut[14] tokOut[15] tokOut[16] tokOut[17] tokOut[18] ++tokOut[19] tokOut[1] tokOut[20] tokOut[21] tokOut[22] tokOut[23] tokOut[24] ++tokOut[25] tokOut[26] tokOut[27] tokOut[28] tokOut[29] tokOut[2] tokOut[30] ++tokOut[31] tokOut[32] tokOut[33] tokOut[34] tokOut[35] tokOut[36] tokOut[37] ++tokOut[38] tokOut[39] tokOut[3] tokOut[40] tokOut[41] tokOut[42] tokOut[43] ++tokOut[44] tokOut[45] tokOut[46] tokOut[47] tokOut[48] tokOut[49] tokOut[4] ++tokOut[50] tokOut[51] tokOut[5] tokOut[6] tokOut[7] tokOut[8] tokOut[9] ++tokOut[S] tokOut[T] inputDock XinstrIn net@54[4] net@54[3] net@54[2] net@54[1] net@54[0] net@54[13] +net@54[12] net@54[11] net@54[10] net@54[9] net@54[8] net@54[7] net@54[6] +net@54[5] net@54[14] instr[47] instr[48] instr[49] instr[50] instr[51] @@ -11256,25 +11334,6 @@ XscanCap@1 scanInC[8] scanInC[2] scanInC[3] scanInC[4] scanInC[5] scanInC[9] +scanCap XscanCap@2 scanInR[8] scanInR[2] scanInR[3] scanInR[4] scanInR[5] scanInR[9] +scanCap -XshipOut junk[47] junk[48] junk[49] junk[50] junk[51] ship[38] junk[39] -+junk[40] junk[41] junk[42] junk[43] junk[44] junk[45] junk[46] ship[T] -+net@9[4] net@9[3] net@9[2] net@9[1] net@9[0] net@9[13] net@9[12] net@9[11] -+net@9[10] net@9[9] net@9[8] net@9[7] net@9[6] net@9[5] net@9[14] ship[10] -+ship[11] ship[12] ship[13] ship[14] ship[15] ship[16] ship[17] ship[18] -+ship[19] ship[1] ship[20] ship[21] ship[22] ship[23] ship[24] ship[25] -+ship[26] ship[27] ship[28] ship[29] ship[2] ship[30] ship[31] ship[32] -+ship[33] ship[34] ship[35] ship[36] ship[37] ship[3] ship[4] ship[5] ship[6] -+ship[7] ship[8] ship[9] net@9[42] net@9[41] net@9[40] net@9[39] net@9[38] -+net@9[37] net@9[36] net@9[35] net@9[34] net@9[33] net@9[51] net@9[32] -+net@9[31] net@9[30] net@9[29] net@9[28] net@9[27] net@9[26] net@9[25] -+net@9[24] net@9[23] net@9[50] net@9[22] net@9[21] net@9[20] net@9[19] -+net@9[18] net@9[17] net@9[16] net@9[15] net@9[49] net@9[48] net@9[47] -+net@9[46] net@9[45] net@9[44] net@9[43] ship[S] net@11[8] scanInC[2] -+scanInC[3] scanInC[4] scanInC[5] scanInC[3] scanInC[2] scanInC[8] scanInC[9] -+net@10[8] net@10[7] net@10[6] net@10[5] net@10[4] scanInD[6] scanInD[7] -+scanInD[8] scanInD[9] dockScanR[O] scanInR[2] scanInR[3] scanInR[4] -+scanInR[5] scanInR[3] scanInR[2] scanInR[8] scanInR[9] net@18[8] net@21[8] -+net@21[7] net@21[6] net@21[5] net@21[4] net@15[8] net@27 properStopper XtokOut tokOut[47] tokOut[48] tokOut[49] tokOut[50] tokOut[51] tokOut[38] +tokOut[39] tokOut[40] tokOut[41] tokOut[42] tokOut[43] tokOut[44] tokOut[45] +tokOut[46] tokOut[T] net@7[4] net@7[3] net@7[2] net@7[1] net@7[0] net@7[13] @@ -11289,10 +11348,11 @@ XtokOut tokOut[47] tokOut[48] tokOut[49] tokOut[50] tokOut[51] tokOut[38] +net@7[32] net@7[31] net@7[30] net@7[29] net@7[28] net@7[27] net@7[26] +net@7[25] net@7[24] net@7[23] net@7[50] net@7[22] net@7[21] net@7[20] +net@7[19] net@7[18] net@7[17] net@7[16] net@7[15] net@7[49] net@7[48] -+net@7[47] net@7[46] net@7[45] net@7[44] net@7[43] tokOut[S] net@18[8] ++net@7[47] net@7[46] net@7[45] net@7[44] net@7[43] tokOut[S] net@68[8] +scanInC[2] scanInC[3] scanInC[4] scanInC[5] scanInC[3] scanInC[2] scanInC[8] -+scanInC[9] net@21[8] net@21[7] net@21[6] net@21[5] net@21[4] scanInD[6] -+scanInD[7] scanInD[8] scanInD[9] net@15[8] scanInR[2] scanInR[3] scanInR[4] -+scanInR[5] scanInR[3] scanInR[2] scanInR[8] scanInR[9] net@50[8] net@47[8] -+net@47[7] net@47[6] net@47[5] net@47[4] net@53[8] net@25 properStopper ++scanInC[9] net@67[8] net@67[7] net@67[6] net@67[5] net@67[4] scanInD[6] ++scanInD[7] scanInD[8] scanInD[9] dockScanR[O] scanInR[2] scanInR[3] ++scanInR[4] scanInR[5] scanInR[3] scanInR[2] scanInR[8] scanInR[9] net@50[8] ++net@47[8] net@47[7] net@47[6] net@47[5] net@47[4] net@53[8] net@25 ++properStopper .END diff --git a/testCode/isolatedInDock.xml b/testCode/isolatedInDock.xml index 40985e7..eca5542 100644 --- a/testCode/isolatedInDock.xml +++ b/testCode/isolatedInDock.xml @@ -14,11 +14,6 @@ - - - - - @@ -85,60 +80,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -249,7 +190,7 @@ '> + @@ -291,17 +232,22 @@ - - - + + + + - - - - + + + + + + + + @@ -364,6 +310,9 @@ &gaspL_anAltStartS_sin; '> + &scanJ_scanEx1vertA_sir_1_; +'> &scanJ_scanFx3hor_sic_1_; '> @@ -390,7 +339,12 @@ '> &dockPartOD_ringSkipMoveLit_sin; + &marina_torpedoStage_sir_1_; &stageGroupsJ_plainStageFour_rscanIn_1_; + &stageGroupsJ_plainStageEight_rscanIn_1_; +'> + &gaspJ_gaspBranch_sir_1_; '> &latchGroupsK_latchWscan_sin; @@ -508,6 +462,10 @@ '> + &stageGroupsJ_plainStageFour_rscanIn_1_; + &stageGroupsJ_plainStageFour_rscanIn_1_; +'> &stagesJ_plainStage_sir_1_; &stagesJ_plainStage_sir_1_; @@ -550,20 +508,17 @@ &stageGroupsJ_properStopper_sic_1_; - &stageGroupsJ_properStopper_sic_1_; &stageGroupsJ_properStopper_sic_1_; &stageGroupsJ_properStopper_sic_1_; &stageGroupsJ_properStopper_sid_1_; - &stageGroupsJ_properStopper_sid_1_; &stageGroupsJ_properStopper_sid_1_; &stageGroupsJ_properStopper_sid_1_; &stageGroupsJ_properStopper_sir_1_; &marina_inputDock_sin; - &stageGroupsJ_properStopper_sir_1_; &stageGroupsJ_properStopper_sir_1_; &stageGroupsJ_properStopper_sir_1_; -- 1.7.10.4