From 65104c49858b075c41ac2e42171baacb4f23cf6f Mon Sep 17 00:00:00 2001 From: adam Date: Sun, 26 Aug 2007 05:51:17 +0100 Subject: [PATCH] make room for Ig bit --- ships/Memory.ship | 5 ++--- src/edu/berkeley/fleet/ies44/InstructionEncoder.java | 11 ++++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ships/Memory.ship b/ships/Memory.ship index 7eb60c3..4e7a803 100644 --- a/ships/Memory.ship +++ b/ships/Memory.ship @@ -249,9 +249,8 @@ module memory (clk, command_valid <= 0; command = ramread; ihorn_full <= 1; - `packet_data(ihorn_d) <= `instruction_data(command); - `packet_dest(ihorn_d) <= `instruction_dest(command); - end + `packet_data(ihorn_d) <= `instruction_data(command); + `packet_dest(ihorn_d) <= `instruction_dest(command); end else if (cbd_pos < cbd_size) begin current_instruction_read_from <= cbd_base+cbd_pos; diff --git a/src/edu/berkeley/fleet/ies44/InstructionEncoder.java b/src/edu/berkeley/fleet/ies44/InstructionEncoder.java index 2758df7..e4de394 100644 --- a/src/edu/berkeley/fleet/ies44/InstructionEncoder.java +++ b/src/edu/berkeley/fleet/ies44/InstructionEncoder.java @@ -16,12 +16,13 @@ public abstract class InstructionEncoder { public static final int OFFSET_DEST = OFFSET_COUNT+WIDTH_COUNT; public static final int OFFSET_CONTROL = OFFSET_DEST+WIDTH_DEST_ADDR; public static final int OFFSET_RQ = OFFSET_CONTROL+0; + //public static final int OFFSET_IG = public static final int OFFSET_TO = OFFSET_CONTROL+1; public static final int OFFSET_DO = OFFSET_CONTROL+2; public static final int OFFSET_DL = OFFSET_CONTROL+3; public static final int OFFSET_DI = OFFSET_CONTROL+4; public static final int OFFSET_TI = OFFSET_CONTROL+5; - public static final int OFFSET_PUMP_ADDR = OFFSET_TI+1; + public static final int OFFSET_PUMP_ADDR = OFFSET_TI+2; public static final int OFFSET_LITERAL = OFFSET_COUNT; public static final int WIDTH_LITERAL = WIDTH_COUNT+WIDTH_DEST_ADDR; @@ -116,10 +117,10 @@ public abstract class InstructionEncoder { if (d instanceof Instruction.LocalLiteral) { Instruction.LocalLiteral inst = (Instruction.LocalLiteral)d; if (inst.pump != null) { - instr |= putField(OFFSET_PUMP_ADDR+WIDTH_PUMP_ADDR-1, OFFSET_PUMP_ADDR, getBoxInstAddr(inst.pump)); - instr |= putField(OFFSET_TI, OFFSET_TI, 1); - instr |= putField(OFFSET_TO, OFFSET_TO, 1); - instr |= putField(OFFSET_LITERAL+WIDTH_LITERAL-1, OFFSET_LITERAL, inst.literal); + instr |= putField(OFFSET_PUMP_ADDR+WIDTH_PUMP_ADDR-1, OFFSET_PUMP_ADDR, getBoxInstAddr(inst.pump)); + instr |= putField(OFFSET_TI, OFFSET_TI, 1); + instr |= putField(OFFSET_TO, OFFSET_TO, 1); + instr |= putField(OFFSET_LITERAL+WIDTH_LITERAL-1, OFFSET_LITERAL, inst.literal); } else { instr = inst.literal; } -- 1.7.10.4