Prevent instruction fetch to unexpected devices

This commit is contained in:
Peter Rugg
2020-07-10 17:34:58 +01:00
parent 5e9b478371
commit 6a317d1a00
4 changed files with 37 additions and 30 deletions

View File

@@ -106,7 +106,7 @@ interface SoC_Map_IFC;
method Bool m_is_mem_addr (Fabric_Addr addr);
(* always_ready *)
method Bool m_is_IO_addr (Fabric_Addr addr);
method Bool m_is_IO_addr (Fabric_Addr addr, Bool imem_not_dmem);
(* always_ready *)
method Bool m_is_near_mem_IO_addr (Fabric_Addr addr);
@@ -196,11 +196,15 @@ module mkSoC_Map (SoC_Map_IFC);
// Identifies I/O addresses in the Fabric.
// (Caches need this information to avoid cacheing these addresses.)
function Bool fn_is_IO_addr (Fabric_Addr addr);
return ( inRange(boot_rom_addr_range, addr)
|| inRange(near_mem_io_addr_range, addr)
|| inRange(plic_addr_range, addr)
|| inRange(uart0_addr_range, addr));
function Bool fn_is_IO_addr (Fabric_Addr addr, Bool imem_not_dmem);
return ( inRange(boot_rom_addr_range, addr)
|| ( (! imem_not_dmem)
&& ( inRange(near_mem_io_addr_range, addr)
|| inRange(plic_addr_range, addr)
|| inRange(uart0_addr_range, addr)
)
)
);
endfunction
// ----------------------------------------------------------------
@@ -224,7 +228,7 @@ module mkSoC_Map (SoC_Map_IFC);
method Bool m_is_mem_addr (Fabric_Addr addr) = fn_is_mem_addr (addr);
method Bool m_is_IO_addr (Fabric_Addr addr) = fn_is_IO_addr (addr);
method Bool m_is_IO_addr (Fabric_Addr addr, Bool imem_not_dmem) = fn_is_IO_addr (addr, imem_not_dmem);
method Bool m_is_near_mem_IO_addr (Fabric_Addr addr) = inRange (near_mem_io_addr_range, addr);