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

Fix bad IRQ_IMPL_MASK indexing in meipra write

This commit is contained in:
Luke Wren 2022-08-08 17:38:41 +01:00
parent 457b5e5f1a
commit 65e3d1c48b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hdl/hazard3_csr.v
View File

@ -340,11 +340,11 @@ always @ (posedge clk or negedge rst_n) begin
meifa[16 * wdata[4:0] +: 16] <= IRQ_IMPL_MASK[16 * wdata[4:0] +: 16] & wdata_update[31:16]; meifa[16 * wdata[4:0] +: 16] <= IRQ_IMPL_MASK[16 * wdata[4:0] +: 16] & wdata_update[31:16];
end else if (wen_m_mode && addr == MEIPRA) begin end else if (wen_m_mode && addr == MEIPRA) begin
meipra[16 * wdata[6:0] +: 16] <= { meipra[16 * wdata[6:0] +: 16] <= {
{4{IRQ_IMPL_MASK[4 * wdata[6:0] + 0]}}, {4{IRQ_IMPL_MASK[4 * wdata[6:0] + 3]}},
{4{IRQ_IMPL_MASK[4 * wdata[6:0] + 1]}},
{4{IRQ_IMPL_MASK[4 * wdata[6:0] + 2]}}, {4{IRQ_IMPL_MASK[4 * wdata[6:0] + 2]}},
{4{IRQ_IMPL_MASK[4 * wdata[6:0] + 3]}} {4{IRQ_IMPL_MASK[4 * wdata[6:0] + 1]}},
} & {4{~(4'hf >> IRQ_PRIORITY_BITS)}} & wdata_update[31:16]; {4{IRQ_IMPL_MASK[4 * wdata[6:0] + 0]}}
} & {4{IRQ_PRIORITY_MASK}} & wdata_update[31:16];
end end
// Clear IRQ force when the corresponding IRQ is sample from meinext // Clear IRQ force when the corresponding IRQ is sample from meinext
// (so that an IRQ can be posted *once* without modifying the ISR source) // (so that an IRQ can be posted *once* without modifying the ISR source)