From aa5e9191c76ec2cf9cd44a6a2a609cc400ec2199 Mon Sep 17 00:00:00 2001 From: Joshua Wise Date: Thu, 11 Mar 2010 06:04:39 -0500 Subject: [PATCH] system: Correct routing regressions from renames. --- system.v | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system.v b/system.v index 99680aa..8205a15 100644 --- a/system.v +++ b/system.v @@ -382,7 +382,7 @@ module System(input clk, input rst .carry_2a (carry_2a)); assign execute_out_backflush = jmp; - assign cp_insn = insn_out_execute; + assign cp_insn = insn_3a; /* stall? */ /* Memory AUTO_TEMPLATE ( .flush(writeback_out_backflush), @@ -477,7 +477,7 @@ module System(input clk, input rst $display("%3d: FETCH: Bubble: %d, Instruction: %08x, PC: %08x", clockno, bubble_1a, insn_1a, pc_1a); $display("%3d: ISSUE: Stall: %d, Bubble: %d, Instruction: %08x, PC: %08x", clockno, stall_0a, bubble_2a, insn_2a, pc_2a); $display("%3d: DECODE: op0 %08x, op1 %08x, op2 %08x, carry %d", clockno, op0_2a, op1_2a, op2_2a, carry_2a); - $display("%3d: EXEC: Stall: %d, Bubble: %d, Instruction: %08x, PC: %08x, Reg: %d, [%08x -> %d], Jmp: %d [%08x]", clockno, stall_cause_execute, bubble_out_execute, insn_out_execute, pc_out_execute, execute_out_write_reg, execute_out_write_data, execute_out_write_num, jmp_out_execute, jmppc_out_execute); + $display("%3d: EXEC: Stall: %d, Bubble: %d, Instruction: %08x, PC: %08x, Reg: %d, [%08x -> %d], Jmp: %d [%08x]", clockno, stall_cause_execute, bubble_3a, insn_3a, pc_3a, write_reg_3a, write_data_3a, write_num_3a, jmp_out_execute, jmppc_out_execute); $display("%3d: MEMORY: Stall: %d, Bubble: %d, Instruction: %08x, PC: %08x, Reg: %d, [%08x -> %d]", clockno, stall_cause_memory, bubble_out_memory, insn_out_memory, pc_out_memory, memory_out_write_reg, memory_out_write_data, memory_out_write_num); $display("%3d: WRITEB: CPSR %08x, SPSR %08x, Reg: %d [%08x -> %d], Jmp: %d [%08x]", clockno, writeback_out_cpsr, writeback_out_spsr, regfile_write, regfile_write_data, regfile_write_reg, jmp_out_writeback, jmppc_out_writeback); end -- 2.39.2