From: rkao Date: Fri, 31 Oct 2008 19:44:55 +0000 (+0000) Subject: disassembly X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=15b242903218772ad893cbf9ce8a5f311b01223a;p=fleet.git disassembly --- diff --git a/electric/marina.jelib b/electric/marina.jelib index b890a01..d5f5d47 100644 --- a/electric/marina.jelib +++ b/electric/marina.jelib @@ -82,7 +82,7 @@ Ngeneric:Facet-Center|art@0||0|0||||AV X # Cell inputDock;1{ic} -CinputDock;1{ic}||artwork|1219269890555|1219275529352|E +CinputDock;1{ic}||artwork|1219269890555|1225472899674|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| @@ -158,8 +158,8 @@ AThicker|net@39|||FS450|pin@38||-1|6|pin@39||-2|5 AThicker|net@40|||FS1800|pin@39||-2|5|pin@33||0|5 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]||D5G2;|pin@0||I -Eins[1:37,T,38:51,S]||D5G2;|pin@1||I +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 Esin||D5G2;|pin@40||U Esir[2:9]||D5G2;|pin@4||B @@ -168,7 +168,7 @@ EtokOut[1:37,T,38:51,S]||D5G2;|pin@2||O X # Cell inputDock;1{sch} -CinputDock;1{sch}||schematic|1217961575693|1225404221476| +CinputDock;1{sch}||schematic|1217961575693|1225473587546| Ngeneric:Facet-Center|art@0||0|0||||AV NOff-Page|conn@0||7|-19.5|||| NOff-Page|conn@2||21|3.5|||| @@ -215,16 +215,16 @@ NWire_Pin|pin@36||9|19|||| IstageGroupsJ:plainStageFour;1{ic}|plainSta@0||-11|-12.5|||D5G4; IdockPartOD:ringSkip;1{ic}|ringSkip@0||-10|14|||D5G4; IscanConverter;1{ic}|scanConv@0||-24|30|||D5G4; +Abus|datIn[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|datIn[S]|D5G1;Y1;||0|plainSta@0|pred|-13|-10.5|pin@8||-18|-10.5 Awire|doL|D5G1;X9;||1800|ringSkip@0|do[L]|-7|12|pin@16||9|12 Awire|doM|D5G1;X8;||1800|pin@18||-4|14|pin@19||9|14 Awire|dock2plain|D5G1;X11;||1800|ringSkip@0|sout|-8|19|pin@36||9|19 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 Awire|ilcDone|D5G1;X6.5;||1800|ringSkip@0|ilc[done]|1|16|pin@14||9|16 Awire|inC|D5G1;Y-3;||900|ringSkip@0|in[C]|-3|6|pin@25||-3|2 -Abus|in[1:37,T,38:51]|D5G1;Y1;|-0.5|IJ0|plainSta@0|ain[1:14,T],in[1:37]|-13|-19.5|pin@6||-21|-19.5 -Awire|in[S]|D5G1;Y1;||0|plainSta@0|pred|-13|-10.5|pin@8||-18|-10.5 -Abus|ins[1:36]|D5G2;X-2;Y1;|-0.5|IJ0|ringSkip@0|inE[1:36]|-15|8|pin@10||-23|8 -Awire|ins[S]|D5G1;X-6;||0|ringSkip@0|do[epi]|-13|14|pin@20||-23|14 +Abus|instr[1:36]|D5G2;X-2;Y1;|-0.5|IJ0|ringSkip@0|inE[1:36]|-15|8|pin@10||-23|8 +Awire|instr[S]|D5G1;X-6;||0|ringSkip@0|do[epi]|-13|14|pin@20||-23|14 Awire|kill|D5G1;X-1;Y-1;||0|ringSkip@0|kill|-16|5|pin@22||-23|5 Awire|net@5|||1800|ringSkip@0|do[M]|-7|16|pin@17||-4|16 Awire|net@6|||900|pin@17||-4|16|pin@18||-4|14 @@ -252,8 +252,8 @@ Awire|olcNZ|D5G1;X6.5;||1800|ringSkip@0|olcNZ|0|18|pin@13||9|18 Abus|sout,unused1[2:9]|D5G1;X2;Y1;|-0.5|IJ1800|plainSta@0|rscanOut[1:9]|-9|-6.5|pin@5||-5|-6.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 -Ein[1:37,T,38:51,S]||D4G2;|conn@5|a|I -Eins[1:37,T,38:51,S]||D4G2;|conn@4|a|I +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 Esin||D4G2;|conn@8|a|B Esir[2:9]||D4G2;|conn@7|a|B @@ -262,14 +262,14 @@ EtokOut[1:37,T,38:51,S]||D6G2;|conn@0|y|O X # Cell isolatedInDock;1{sch} -CisolatedInDock;1{sch}||schematic|1220652359667|1221170259860| +CisolatedInDock;1{sch}||schematic|1220652359667|1225473632830| Ngeneric:Facet-Center|art@0||0|0||||AV NOff-Page|conn@0||-35|21|||| NOff-Page|conn@1||-35|18|||| NOff-Page|conn@2||-35|15|||| IstageGroupsJ:properStopper;1{ic}|datIn|D5G1;Y12;|-30|9|||D5G4; IinputDock;1{ic}|inDock|D5G1;X3;Y-6.5;|0|0|||D5G4; -IstageGroupsJ:properStopper;1{ic}|insIn|D5G1;Y12;|-30|-41|||D5G4; +IstageGroupsJ:properStopper;1{ic}|instrIn|D5G1;Y12;|-30|-41|||D5G4; NBus_Pin|pin@0||-15|2|-1|-1|| NBus_Pin|pin@1||-15|-2|-1|-1|| NBus_Pin|pin@2||0|-48|-1|-1|| @@ -312,17 +312,17 @@ 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[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 Awire|dockScanR[O]|D5G1;X1;Y1;||1800|inDock|sout|2|6|pin@23||6|6 -Abus|in[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|in[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|in[S]|D5G1;X4;Y1;||1800|datIn|succ|-28|11|pin@16||-18|11 -Abus|ins[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|ins[1:37,T,38:51]|D5G1;X2;Y1;|-0.5|IJ1800|insIn|aout[1:14,T],out[1:37]|-28|-48|pin@27||-16|-48 -Awire|ins[S]|D5G1;X5;Y1;||1800|insIn|succ|-28|-39|pin@38||-16|-39 +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 @@ -345,18 +345,18 @@ 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 Abus|net@45||-0.5|IJ0|tokOut|so[1:9]|-32|-23|pin@30||-34|-23 Abus|net@46||-0.5|IJ900|pin@30||-34|-23|pin@31||-34|-29 -Abus|net@47||-0.5|IJ1800|pin@31||-34|-29|insIn|si[1:9]|-31|-29 +Abus|net@47||-0.5|IJ1800|pin@31||-34|-29|instrIn|si[1:9]|-31|-29 Abus|net@48||-0.5|IJ0|tokOut|cscanOut[1:9]|-32|-20|pin@32||-36|-20 Abus|net@49||-0.5|IJ900|pin@32||-36|-20|pin@33||-36|-32 -Abus|net@50||-0.5|IJ1800|pin@33||-36|-32|insIn|cscanIn[1:9]|-31|-32 +Abus|net@50||-0.5|IJ1800|pin@33||-36|-32|instrIn|cscanIn[1:9]|-31|-32 Abus|net@51||-0.5|IJ0|tokOut|rscnt[1:9]|-32|-17|pin@34||-38|-17 Abus|net@52||-0.5|IJ900|pin@34||-38|-17|pin@35||-38|-35 -Abus|net@53||-0.5|IJ1800|pin@35||-38|-35|insIn|rscni[1:9]|-31|-35 -Abus|net@54||-0.5|IJ0|insIn|ain[1:14,T],in[1:37]|-32|-48|pin@36||-35|-48 -Awire|net@55|||0|insIn|pred|-32|-39|pin@37||-34|-39 -Abus|net@57||-0.5|IJ1800|insIn|so[1:9]|-28|-29|scanCap@0|si[1:9]|-23|-29 -Abus|net@58||-0.5|IJ1800|insIn|cscanOut[1:9]|-28|-32|scanCap@1|si[1:9]|-19|-32 -Abus|net@59||-0.5|IJ1800|insIn|rscnt[1:9]|-28|-35|scanCap@2|si[1:9]|-23|-35 +Abus|net@53||-0.5|IJ1800|pin@35||-38|-35|instrIn|rscni[1:9]|-31|-35 +Abus|net@54||-0.5|IJ0|instrIn|ain[1:14,T],in[1:37]|-32|-48|pin@36||-35|-48 +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 diff --git a/testCode/com/sun/vlsi/chips/marina/test/InstructionStopper.java b/testCode/com/sun/vlsi/chips/marina/test/InstructionStopper.java index 3150d28..4d714a0 100644 --- a/testCode/com/sun/vlsi/chips/marina/test/InstructionStopper.java +++ b/testCode/com/sun/vlsi/chips/marina/test/InstructionStopper.java @@ -38,7 +38,7 @@ public class InstructionStopper extends ProperStopper { pad.setFromLong(0); instr = instr.cat(pad); } - BitVector t = new BitVector(1, "token"); t.setFromLong(0); + BitVector t = new BitVector(1, "token"); t.setFromLong(1); BitVector a = new BitVector(14, "addr"); a.setFromLong(0); super.fill(instr.cat(t).cat(a)); } diff --git a/testCode/com/sun/vlsi/chips/marina/test/IsolatedInDock.java b/testCode/com/sun/vlsi/chips/marina/test/IsolatedInDock.java index d0f699c..df75077 100644 --- a/testCode/com/sun/vlsi/chips/marina/test/IsolatedInDock.java +++ b/testCode/com/sun/vlsi/chips/marina/test/IsolatedInDock.java @@ -17,7 +17,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, insIn, shipOut; + public final ProperStopper datIn, tokOut, instrIn, shipOut; public IsolatedInDock(ChainControl cc, ChipModel model, Indenter indenter) { this.cc = cc; @@ -32,7 +32,7 @@ public class IsolatedInDock implements Design { DATA_CHAIN, REPORT_CHAIN, cc, model, indenter); - insIn = new InstructionStopper("insIn", + instrIn = new InstructionStopper("instrIn", CONTROL_CHAIN, DATA_CHAIN, REPORT_CHAIN, @@ -61,17 +61,17 @@ public class IsolatedInDock implements Design { // For reset, I want to clear all the stoppers simultaneously datIn.clear(); tokOut.clear(); - insIn.clear(); + instrIn.clear(); shipOut.clear(); datIn.stop(); tokOut.stop(); - insIn.stop(); + instrIn.stop(); shipOut.stop(); datIn.resetAfterMasterClear(); tokOut.resetAfterMasterClear(); - insIn.resetAfterMasterClear(); + instrIn.resetAfterMasterClear(); shipOut.resetAfterMasterClear(); } // /** Shift the data scan chain. */ diff --git a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java index 48af389..932ddca 100644 --- a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java +++ b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java @@ -346,7 +346,7 @@ public class MarinaTest { count = count.add(one); } - inDock.insIn.fillMany(din); + inDock.instrIn.fillMany(din); adjustIndent(-2); prln("End sendInstructions"); @@ -373,8 +373,11 @@ public class MarinaTest { BitVector bitVector = new BitVector(INSTR_SZ, "instr"); for(int i=0; i - - - - - + + + + + '> @@ -193,60 +193,60 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + '> @@ -289,7 +289,7 @@ - + @@ -301,10 +301,10 @@ - - - - + + + + '> &dockPartOD_skipCount_sin; @@ -543,20 +543,20 @@ &stageGroupsJ_properStopper_sic_1_; &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_sid_1_; &stageGroupsJ_properStopper_sir_1_; &marina_inputDock_sin; &stageGroupsJ_properStopper_sir_1_; &stageGroupsJ_properStopper_sir_1_; - &stageGroupsJ_properStopper_sir_1_; + &stageGroupsJ_properStopper_sir_1_;