colin
/
Hazard3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix readback of tdata2 and tinfo CSRs 

(Found due to latest riscv-openocd failing to enumerate triggers,
as it now scans tinfo before going for tdata1/mcontrol)
This commit is contained in:
Luke Wren 2023-03-23 23:33:29 +00:00
parent 532e27dbc9
commit 43130a16e4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hdl/hazard3_triggers.v
View File

@ -133,13 +133,13 @@ always @ (*) begin
1'b0 // load = 0, this is not a watchpoint 1'b0 // load = 0, this is not a watchpoint
}; };
end end
end else if (cfg_rdata == TDATA2) begin end else if (cfg_addr == TDATA2) begin
if (tselect >= BREAKPOINT_TRIGGERS) begin if (tselect >= BREAKPOINT_TRIGGERS) begin
cfg_rdata = {W_DATA{1'b0}}; cfg_rdata = {W_DATA{1'b0}};
end else begin end else begin
cfg_rdata = tdata2[tselect]; cfg_rdata = tdata2[tselect];
end end
end else if (cfg_rdata == TINFO) begin end else if (cfg_addr == TINFO) begin
if (tselect >= BREAKPOINT_TRIGGERS) begin if (tselect >= BREAKPOINT_TRIGGERS) begin
cfg_rdata = 32'h00000001; // type = 0, no trigger cfg_rdata = 32'h00000001; // type = 0, no trigger
end else begin end else begin