fix connection of doo[T,D] and ddo[T,D] at top level

diff --git a/electric/aMarinaM.jelib b/electric/aMarinaM.jelib
index 9f4332d..60c80f9 100755 (executable)
--- a/electric/aMarinaM.jelib
+++ b/electric/aMarinaM.jelib
@@ -1,5 +1,5 @@
 # header information:
-HaMarinaM|8.09a
+HaMarinaM|8.08k
 
 # Views:
 Vicon|ic
@@ -98,7 +98,7 @@ Esir[1:9]||D5G2;|pin@8||B
 X
 
 # Cell marinaOut;2{sch}
-CmarinaOut;2{sch}||schematic|1226940444999|1237558369802|
+CmarinaOut;2{sch}||schematic|1226940444999|1237752268760|
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@0||-49|-1||||
 NOff-Page|conn@1||70|-2||||
@@ -157,12 +157,12 @@ IfifoL:tokenFIFO;1{ic}|tokenFIF@0||24|1|||D5G4;
 Awire|ain[14]|D5G2;||2700|pin@92||-6|-2|pin@93||-6|1
 Abus|ain[T,1:14],din[1:37]|D5G2;|-0.5|IJ2700|pin@51||66|-12|pin@7||66|-6
 Abus|aout[T,1:14],iout[1:37]|D5G2;|-0.5|IJ2700|pin@58||-18|-6|pin@59||-18|0
+Abus|ddo[D,T]|D5G2;|-0.5|IJ900|pin@17||10|3|pin@18||10|0
 Awire|ddo[D]|D5G2;||900|pin@20||48|3|pin@21||48|0
-Abus|ddo[T,D]|D5G2;|-0.5|IJ900|pin@17||10|3|pin@18||10|0
 Awire|ddo[T]|D5G2;||900|pin@76||17|1|pin@77||17|-4
 Abus|din[1:37],ain[6]|D5G2;|-0.5|IJ2700|pin@9||66|-24|pin@88||66|-18
+Abus|doo[D,T]|D5G2;|-0.5|IJ900|pin@22||-11|3|pin@27||-11|1
 Awire|doo[D]|D5G2;||900|pin@25||67|6|pin@30||67|3
-Abus|doo[T,D]|D5G2;|-0.5|IJ900|pin@22||-11|3|pin@27||-11|1
 Awire|doo[T]|D5G2;||900|pin@78||32|1|pin@79||32|-3
 Abus|dsA[TT,1:14],dsD[1:37]|D5G2;|-0.5|IJ900|pin@80||30|-6|pin@81||30|-12
 Abus|iout[1:36],aout[T]|D5G2;|-0.5|IJ2700|pin@60||-18|-12|pin@61||-18|-9

diff --git a/testCode/marina.spi b/testCode/marina.spi
index 2e9ccc7..19e98d4 100644 (file)
--- a/testCode/marina.spi
+++ b/testCode/marina.spi
@@ -1,7 +1,7 @@
 *** SPICE deck for cell marinaOut{sch} from library aMarinaM
 *** Created on Mon Nov 17, 2008 08:47:24
-*** Last revised on Fri Mar 20, 2009 07:12:49
-*** Written on Fri Mar 20, 2009 16:35:52 by Electric VLSI Design System, 
+*** Last revised on Sun Mar 22, 2009 13:04:28
+*** Written on Sun Mar 22, 2009 13:04:40 by Electric VLSI Design System, 
 *version 8.08k
 *** Layout tech: cmos90, foundry TSMC
 *** UC SPICE *** , MIN_RESIST 50.0, MIN_CAPAC 0.04FF
@@ -8240,8 +8240,8 @@ XoutputDo@0 net@14 din[10] din[11] din[12] din[13] din[14] din[15] din[16]
 +iout[19] iout[1] iout[20] iout[21] iout[22] iout[23] iout[24] iout[25] 
 +iout[26] iout[27] iout[28] iout[29] iout[2] iout[30] iout[31] iout[32] 
 +iout[33] iout[34] iout[35] iout[36] iout[3] iout[4] iout[5] iout[6] iout[7] 
-+iout[8] iout[9] aout[T] doo[T] doo[D] ain[14] net@119[8] sir[2] sir[3] sir[4] 
-+sir[5] sir[3] sir[2] sir[8] sir[9] net@120[8] ddo[T] ddo[D] outputDock
++iout[8] iout[9] aout[T] doo[D] doo[T] ain[14] net@119[8] sir[2] sir[3] sir[4] 
++sir[5] sir[3] sir[2] sir[8] sir[9] net@120[8] ddo[D] ddo[T] outputDock
 XsouthFif@1 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@44 fin 
 +net@38 iout[10] iout[11] iout[12] iout[13] iout[14] iout[15] iout[16]