From: rkao Date: Mon, 15 Dec 2008 22:12:44 +0000 (+0000) Subject: fix schematic bug that contributes to 3021 not working X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=add513210e5b1f66353f3629065709ee45e89a0a;p=fleet.git fix schematic bug that contributes to 3021 not working --- diff --git a/electric/registersL.jelib b/electric/registersL.jelib index 387567c..a35f5fe 100755 --- a/electric/registersL.jelib +++ b/electric/registersL.jelib @@ -13377,7 +13377,7 @@ Esign||D4G2;|conn@14|a|I X # Cell thePathRegister;1{ic} -CthePathRegister;1{ic}||artwork|1226687594576|1227525469330|EI +CthePathRegister;1{ic}||artwork|1226687594576|1229382094422|EI Ngeneric:Facet-Center|art@0||0|0||||AV Nschematic:Bus_Pin|pin@0||3|0|-1|-1|| Nschematic:Bus_Pin|pin@1||-2|-3|-1|-1|| @@ -13403,7 +13403,7 @@ AThicker|net@6|||FS2700|pin@4||1|-3|pin@5||1|-2 AThicker|net@7|||FS0|pin@12||-2|-2|pin@7||-3|-2 AThicker|net@8|||FS900|pin@12||-2|-2|pin@13||-2|-3 Eaout[1:14]||D5G2;|pin@0||O -EinB[1:14]|datPred[1:11]|D5G2;|pin@2||I +EinB[1:14]|dataPred[1:11]|D5G2;|pin@2||I Efire[M]||D5G2;|pin@1||I Eod[1:14]|path[1:14]|D5G2;|pin@3||I X @@ -13622,7 +13622,7 @@ Evdd_11||D5G2;|nor10sym@0|vdd_3|P X # Cell thePathRegister;1{sch} -CthePathRegister;1{sch}||schematic|1226686552822|1227525584326|I +CthePathRegister;1{sch}||schematic|1226686552822|1229382094422|I Iaddr2in14;1{ic}|addr2in1@2||13|0|||D5G4; Ngeneric:Facet-Center|art@0||0|0||||AV NOff-Page|conn@0||-32|-18.5|||YRRR| @@ -13676,7 +13676,7 @@ Abus|take[A,B]|D5G2;|-0.5|IJ900|addr2in1@2|dcl[A,B]|11|-3|pin@15||11|-6 Awire|take[A]|D5G2;||900|pin@11||-11.5|-10|pin@13||-11.5|-14.5 Awire|take[B]|D5G2;||900|pin@12||-11.5|3|pin@14||-11.5|-0.5 Eaout[1:14]||D6G2;|conn@3|y|O -Eod[15:28]|datPred[1:11]|D4G2;|conn@2|a|I +Eod[15:28]|dataPred[1:11]|D4G2;|conn@2|a|I Efire[A,B]|fire[M]|D4G2;|conn@0|a|I Efire[M_1]|path[1:14]|D4G2;|conn@1|a|I X diff --git a/testCode/marina.spi b/testCode/marina.spi index d9b435e..d1da205 100644 --- a/testCode/marina.spi +++ b/testCode/marina.spi @@ -1,7 +1,7 @@ *** SPICE deck for cell marina{sch} from library marinaL *** Created on Mon Nov 17, 2008 08:47:24 *** Last revised on Mon Dec 08, 2008 14:05:37 -*** Written on Wed Dec 10, 2008 14:45:43 by Electric VLSI Design System, +*** Written on Mon Dec 15, 2008 15:03:31 by Electric VLSI Design System, *version 8.08n *** Layout tech: cmos90, foundry TSMC *** UC SPICE *** , MIN_RESIST 50.0, MIN_CAPAC 0.04FF @@ -767,11 +767,11 @@ Xnor2@0 ina inb out nor2_sy-X_10 *** CELL: registersL:thePathRegister{sch} .SUBCKT thePathRegister 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] datPred[10] -+datPred[11] datPred[1] datPred[2] datPred[3] datPred[4] datPred[5] datPred[6] -+datPred[7] datPred[8] datPred[9] fire[M] path[10] path[11] path[12] path[13] -+path[14] path[1] path[2] path[3] path[4] path[5] path[6] path[7] path[8] -+path[9] ++aout[2] aout[3] aout[4] aout[5] aout[6] aout[7] aout[8] aout[9] dataPred[10] ++dataPred[11] dataPred[1] dataPred[2] dataPred[3] dataPred[4] dataPred[5] ++dataPred[6] dataPred[7] dataPred[8] dataPred[9] fire[M] path[10] path[11] ++path[12] path[13] path[14] path[1] path[2] path[3] path[4] path[5] path[6] ++path[7] path[8] path[9] Xaddr2in1@2 dataPred[10] dataPred[11] dataPred[11] dataPred[11] dataPred[11] +dataPred[1] dataPred[2] dataPred[3] dataPred[4] dataPred[5] dataPred[6] +dataPred[7] dataPred[8] dataPred[9] path[10] path[11] path[12] path[13]