commit 488af6f13131fc69092f8d7e68c7250036e79be8 parent 78a3d8d38fa715ba37f979a077382e8caea23b8f Author: Brian Swetland <swetland@frotz.net> Date: Wed, 30 Dec 2015 00:33:22 -0800 cpu: fix parameterization for 32bit regs configuration Diffstat:
| M | hdl/cpu/cpu.v | | | 9 | +++++---- |
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/hdl/cpu/cpu.v b/hdl/cpu/cpu.v @@ -81,8 +81,9 @@ localparam BR_REL_S8 = 2'b00; // PC + S8 a short branch localparam BR_REL_S12 = 2'b01; // PC + S12 a long branch localparam BR_ABS_RB = 2'b10; // RB an indirect branch -wire [AWIDTH-1:0]branch_imm = do_sel_branch[0] ? ir_imm_s12 : ir_imm_s8; -wire [AWIDTH-1:0]branch_target_next = do_sel_branch[1] ? regs_bdata : (pc + branch_imm); +wire [RWIDTH-1:0]branch_imm = do_sel_branch[0] ? ir_imm_s12 : ir_imm_s8; +wire [RWIDTH-1:0]branch_tgt = do_sel_branch[1] ? regs_bdata : (pc + branch_imm); +wire [AWIDTH-1:0]branch_target_next = branch_tgt[AWIDTH-1:0]; // memory interface assign mem_wr_o = do_store; @@ -320,8 +321,8 @@ always @(posedge clk) begin end -wire [DWIDTH-1:0]raw_regs_adata; -wire [DWIDTH-1:0]raw_regs_bdata; +wire [RWIDTH-1:0]raw_regs_adata; +wire [RWIDTH-1:0]raw_regs_bdata; regfile #( .DWIDTH(RWIDTH)