From: adam Date: Mon, 20 Aug 2007 07:32:20 +0000 (+0100) Subject: more renaming slipway=>fpga X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=77754cc649177dca0de202cfa2d802dc37948209;p=fleet.git more renaming slipway=>fpga --- diff --git a/src/edu/berkeley/fleet/fpga/Fpga.java b/src/edu/berkeley/fleet/fpga/Fpga.java index 78bf2cc..928ca64 100644 --- a/src/edu/berkeley/fleet/fpga/Fpga.java +++ b/src/edu/berkeley/fleet/fpga/Fpga.java @@ -426,13 +426,13 @@ public class Fpga extends Fleet { public int computeOffset(int origin, int target) { return (target - origin)/6; } public int computeTarget(int origin, int offset) { return origin + (offset*6); } - private SlipwayInstructionEncoder iie = new SlipwayInstructionEncoder(); + private FpgaInstructionEncoder iie = new FpgaInstructionEncoder(); public Instruction readInstruction(DataInputStream is) throws IOException { return iie.readInstruction(is); } public Instruction readInstruction(long instr) { return iie.readInstruction(instr); } public long writeInstruction(Instruction d) { return writeInstruction(d); } public void writeInstruction(DataOutputStream os, Instruction d) throws IOException { iie.writeInstruction(os, d); } - private class SlipwayInstructionEncoder extends InstructionEncoder { + private class FpgaInstructionEncoder extends InstructionEncoder { public long getDestAddr(Destination box) { return ((FpgaBenkoBox.VirtualPort)box).addr; } public long getBoxInstAddr(BenkoBox box) { return ((FpgaBenkoBox)box).instr_addr; } public Destination getDestByAddr(long dest) {