Hardware
/
picorv32
mirror of https://github.com/YosysHQ/picorv32.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update dbg_ signals synchronous to the actual launch of the new insn

This commit is contained in:
Clifford Wolf 2016-04-13 23:48:50 +02:00
parent 323d77ba5d
commit 63c28e4389
1 changed files with 72 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
picorv32.v
View File

@ -115,6 +115,14 @@ module picorv32 #(
reg [31:0] dbg_insn_opcode; reg [31:0] dbg_insn_opcode;
reg [31:0] dbg_insn_addr; reg [31:0] dbg_insn_addr;
wire dbg_mem_valid = mem_valid;
wire dbg_mem_instr = mem_instr;
wire dbg_mem_ready = mem_ready;
wire [31:0] dbg_mem_addr = mem_addr;
wire [31:0] dbg_mem_wdata = mem_wdata;
wire [ 3:0] dbg_mem_wstrb = mem_wstrb;
wire [31:0] dbg_mem_rdata = mem_rdata;
assign pcpi_rs1 = reg_op1; assign pcpi_rs1 = reg_op1;
assign pcpi_rs2 = reg_op2; assign pcpi_rs2 = reg_op2;
@ -597,50 +605,81 @@ module picorv32 #(
if (instr_timer) new_ascii_instr = "timer"; if (instr_timer) new_ascii_instr = "timer";
end end
reg [63:0] q_dbg_ascii_instr; reg [63:0] q_ascii_instr;
reg [31:0] q_dbg_insn_imm; reg [31:0] q_insn_imm;
reg [31:0] q_dbg_insn_opcode; reg [31:0] q_insn_opcode;
reg [4:0] q_dbg_insn_rs1; reg [4:0] q_insn_rs1;
reg [4:0] q_dbg_insn_rs2; reg [4:0] q_insn_rs2;
reg [4:0] q_dbg_insn_rd; reg [4:0] q_insn_rd;
reg dbg_next;
wire launch_next_insn;
reg [63:0] cached_ascii_instr;
reg [31:0] cached_insn_imm;
reg [31:0] cached_insn_opcode;
reg [4:0] cached_insn_rs1;
reg [4:0] cached_insn_rs2;
reg [4:0] cached_insn_rd;
always @(posedge clk) begin always @(posedge clk) begin
q_dbg_ascii_instr <= dbg_ascii_instr; q_ascii_instr <= dbg_ascii_instr;
q_dbg_insn_imm <= dbg_insn_imm; q_insn_imm <= dbg_insn_imm;
q_dbg_insn_opcode <= dbg_insn_opcode; q_insn_opcode <= dbg_insn_opcode;
q_dbg_insn_rs1 <= dbg_insn_rs1; q_insn_rs1 <= dbg_insn_rs1;
q_dbg_insn_rs2 <= dbg_insn_rs2; q_insn_rs2 <= dbg_insn_rs2;
q_dbg_insn_rd <= dbg_insn_rd; q_insn_rd <= dbg_insn_rd;
dbg_next <= launch_next_insn;
if (decoder_trigger && !decoder_pseudo_trigger) begin if (decoder_trigger_q) begin
cached_ascii_instr <= new_ascii_instr;
cached_insn_imm <= decoded_imm;
if (&next_insn_opcode[1:0])
cached_insn_opcode <= next_insn_opcode;
else
cached_insn_opcode <= {16'b0, next_insn_opcode[15:0]};
cached_insn_rs1 <= decoded_rs1;
cached_insn_rs2 <= decoded_rs2;
cached_insn_rd <= decoded_rd;
end
if (launch_next_insn) begin
dbg_insn_addr <= next_pc; dbg_insn_addr <= next_pc;
end end
end end
always @* begin always @* begin
dbg_ascii_instr = q_dbg_ascii_instr; dbg_ascii_instr = q_ascii_instr;
dbg_insn_imm = q_dbg_insn_imm; dbg_insn_imm = q_insn_imm;
dbg_insn_opcode = q_dbg_insn_opcode; dbg_insn_opcode = q_insn_opcode;
dbg_insn_rs1 = q_dbg_insn_rs1; dbg_insn_rs1 = q_insn_rs1;
dbg_insn_rs2 = q_dbg_insn_rs2; dbg_insn_rs2 = q_insn_rs2;
dbg_insn_rd = q_dbg_insn_rd; dbg_insn_rd = q_insn_rd;
if (decoder_trigger_q && !decoder_pseudo_trigger_q) begin if (dbg_next) begin
dbg_ascii_instr = new_ascii_instr; if (decoder_pseudo_trigger_q) begin
if (&mem_rdata_q[1:0]) dbg_ascii_instr = cached_ascii_instr;
dbg_insn_opcode = next_insn_opcode; dbg_insn_imm = cached_insn_imm;
else dbg_insn_opcode = cached_insn_opcode;
dbg_insn_opcode = {16'b0, next_insn_opcode[15:0]}; dbg_insn_rs1 = cached_insn_rs1;
dbg_insn_imm = decoded_imm; dbg_insn_rs2 = cached_insn_rs2;
dbg_insn_rs1 = decoded_rs1; dbg_insn_rd = cached_insn_rd;
dbg_insn_rs2 = decoded_rs2; end else begin
dbg_insn_rd = decoded_rd; dbg_ascii_instr = new_ascii_instr;
if (&next_insn_opcode[1:0])
dbg_insn_opcode = next_insn_opcode;
else
dbg_insn_opcode = {16'b0, next_insn_opcode[15:0]};
dbg_insn_imm = decoded_imm;
dbg_insn_rs1 = decoded_rs1;
dbg_insn_rs2 = decoded_rs2;
dbg_insn_rd = decoded_rd;
end
end end
end end
`ifdef DEBUGASM `ifdef DEBUGASM
always @(posedge clk) begin always @(posedge clk) begin
if (decoder_trigger_q && !decoder_pseudo_trigger_q) begin if (dbg_next) begin
$display("debugasm %x %x %s", dbg_insn_addr, dbg_insn_opcode, dbg_ascii_instr ? dbg_ascii_instr : "*"); $display("debugasm %x %x %s", dbg_insn_addr, dbg_insn_opcode, dbg_ascii_instr ? dbg_ascii_instr : "*");
end end
end end
@ -648,7 +687,7 @@ module picorv32 #(
`ifdef DEBUG `ifdef DEBUG
always @(posedge clk) begin always @(posedge clk) begin
if (decoder_trigger_q && !decoder_pseudo_trigger_q) begin if (dbg_next) begin
if (&dbg_insn_opcode[1:0]) if (&dbg_insn_opcode[1:0])
$display("DECODE: 0x%08x 0x%08x %-0s", dbg_insn_addr, dbg_insn_opcode, dbg_ascii_instr ? dbg_ascii_instr : "UNKNOWN"); $display("DECODE: 0x%08x 0x%08x %-0s", dbg_insn_addr, dbg_insn_opcode, dbg_ascii_instr ? dbg_ascii_instr : "UNKNOWN");
else else
@ -1054,6 +1093,8 @@ module picorv32 #(
clear_prefetched_high_word = COMPRESSED_ISA; clear_prefetched_high_word = COMPRESSED_ISA;
end end
assign launch_next_insn = cpu_state == cpu_state_fetch && decoder_trigger && (!ENABLE_IRQ || irq_active || !(irq_pending & ~irq_mask));
always @(posedge clk) begin always @(posedge clk) begin
trap <= 0; trap <= 0;
reg_sh <= 'bx; reg_sh <= 'bx;