Cheri-research/Toooba
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Updated so SoC addrs are taken from SoC_Map.bsv

Browse Source
This commit is contained in:
rsnikhil
2019-04-01 14:34:49 -04:00
parent 113f888d37
commit 4e305ac98d
36 changed files with 14145 additions and 13788 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src_Testbench/SoC/SoC_Map.bsv
View File

@@ -22,9 +22,9 @@ package SoC_Map;
// ================================================================
// Exports
export SoC_Map_IFC (..), mkSoC_Map;
export SoC_Map_Struct (..), soc_map_struct;
// export fn_addr_in_range;
export SoC_Map_IFC (..), mkSoC_Map;
export Num_Masters;
export imem_master_num;
@@ -49,6 +49,36 @@ export irq_num_uart0;
import Fabric_Defs :: *; // Only for type Fabric_Addr
// ================================================================
// Top-level-struct version of the SoC Map for RISCY-OOO
typedef struct {
Bit #(64) near_mem_io_addr_base;
Bit #(64) near_mem_io_addr_size;
Bit #(64) boot_rom_addr_base;
Bit #(64) boot_rom_addr_size;
Bit #(64) mem0_controller_addr_base;
Bit #(64) mem0_controller_addr_size;
Bit #(64) pc_reset_value;
} SoC_Map_Struct
deriving (FShow);
SoC_Map_Struct soc_map_struct =
SoC_Map_Struct {
near_mem_io_addr_base: 'h_0200_0000,
boot_rom_addr_base: 'h_0000_1000,
boot_rom_addr_size: 'h_0000_1000,
mem0_controller_addr_base: 'h_8000_0000,
mem0_controller_addr_size: 'h_1000_0000,
pc_reset_value: 'h_0000_1000
};
// ================================================================
// Interface and module for the address map

4
src_Testbench/SoC/SoC_Top.bsv
View File

@@ -349,6 +349,10 @@ module mkSoC_Top (SoC_Top_IFC);
// For ISA tests: watch memory writes to <tohost> addr
method Action set_watch_tohost (Bool watch_tohost, Fabric_Addr tohost_addr);
mem0_controller.set_watch_tohost (watch_tohost, tohost_addr);
if (watch_tohost) begin
let fromhost_addr = 0;
corew.set_htif_addrs (tohost_addr, fromhost_addr);
end
endmethod
endmodule: mkSoC_Top