From 4e8e5d2d9695b381ef7f7967c02fe8d4bcca8316 Mon Sep 17 00:00:00 2001 From: Adam Megacz Date: Thu, 19 Nov 2009 18:42:44 -0800 Subject: [PATCH] remove chain name arguments from proper stopper constructors --- .../sun/vlsi/chips/marina/test/InstructionStopper.java | 4 +--- src/com/sun/vlsi/chips/marina/test/Marina.java | 11 +++++------ src/com/sun/vlsi/chips/marina/test/ProperStopper.java | 15 +++++++-------- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/com/sun/vlsi/chips/marina/test/InstructionStopper.java b/src/com/sun/vlsi/chips/marina/test/InstructionStopper.java index bb200e2..60d51cf 100644 --- a/src/com/sun/vlsi/chips/marina/test/InstructionStopper.java +++ b/src/com/sun/vlsi/chips/marina/test/InstructionStopper.java @@ -19,12 +19,10 @@ public class InstructionStopper extends ProperStopper { public InstructionStopper(String name, String propInst, - String controlChain, String dataChain, - String reportChain, ChainControls cc, ChipModel model, boolean clockHack, Indenter indenter, String counterPath) { - super(name, propInst, controlChain, dataChain, reportChain, cc, model, clockHack, indenter, counterPath); + super(name, propInst, cc, model, clockHack, indenter, counterPath); } /** put one Instruction into InstructionStopper */ diff --git a/src/com/sun/vlsi/chips/marina/test/Marina.java b/src/com/sun/vlsi/chips/marina/test/Marina.java index e0ace7d..134e4a0 100644 --- a/src/com/sun/vlsi/chips/marina/test/Marina.java +++ b/src/com/sun/vlsi/chips/marina/test/Marina.java @@ -127,22 +127,21 @@ public class Marina { cc.shift(DATA_CHAIN, readEnable, writeEnable); } + /** Shift the data scan chain */ + public void shiftDuke(boolean readEnable, boolean writeEnable) { + cc.shift(DUKE_CHAIN, readEnable, writeEnable); + } + public Marina(ChainControls cc, ChipModel model, boolean clockHack, Indenter indenter) { this.cc = cc; this.model = model; this.indenter = indenter; data = new ProperStopper("north fifo", prefix+"northFif@1.fillDrai@1.properSt@1", - CONTROL_CHAIN, - DATA_CHAIN, - REPORT_CHAIN, cc, model, clockHack, indenter, prefix+"northFif@1.fillDrai@1.instruct@0.cntScnTh@1.cntScnOn@1"); instrIn = new InstructionStopper("south fifo", prefix+"southFif@1.tapPropS@1.properSt@1", - CONTROL_CHAIN, - DATA_CHAIN, - REPORT_CHAIN, cc, model, clockHack, indenter, prefix+"southFif@1.tapPropS@1.instruct@0.cntScnTh@1.cntScnOn@1"); } diff --git a/src/com/sun/vlsi/chips/marina/test/ProperStopper.java b/src/com/sun/vlsi/chips/marina/test/ProperStopper.java index d349aa0..7b089a9 100644 --- a/src/com/sun/vlsi/chips/marina/test/ProperStopper.java +++ b/src/com/sun/vlsi/chips/marina/test/ProperStopper.java @@ -34,9 +34,13 @@ public class ProperStopper { private boolean traceFill = false; private boolean traceDrain = false; - private final String controlChain, controlPath, - dataChain, dataPath, - reportChain, reportPath; + private final String + controlChain = Marina.CONTROL_CHAIN, + controlPath, + dataChain = Marina.DATA_CHAIN, + dataPath, + reportChain = Marina.REPORT_CHAIN, + reportPath; private final String captureClock; private final ChainControls cc; private final ChipModel model; @@ -239,18 +243,13 @@ public class ProperStopper { /** construct a ProperStopper */ public ProperStopper(String name, String propInst, - String controlChain, String dataChain, - String reportChain, ChainControls cc, ChipModel model, boolean clockHack, Indenter indenter, String pathToCounter) { this.name = name; - this.controlChain = controlChain; this.controlPath = controlChain+'.'+propInst; - this.dataChain = dataChain; this.dataPath = dataChain+'.'+propInst; - this.reportChain = reportChain; this.reportPath = reportChain+'.'+propInst; this.model = model; this.captureClock = -- 1.7.10.4