projects
/
shakti-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SDRAM uses SDR0MemBase now
[shakti-core.git]
/
src
/
lib
/
MemoryMap.bsv
diff --git
a/src/lib/MemoryMap.bsv
b/src/lib/MemoryMap.bsv
index 16d97695c89682aa9736637a9a77046a19db962c..9281366440bcc2d40cb3997be85864561fe8bc5a 100644
(file)
--- a/
src/lib/MemoryMap.bsv
+++ b/
src/lib/MemoryMap.bsv
@@
-33,6
+33,8
@@
package MemoryMap;
import defined_types::*;
import fast_memory_map::*;
import slow_memory_map::*;
import defined_types::*;
import fast_memory_map::*;
import slow_memory_map::*;
+ `include "slow_instance_defines.bsv"
+ `include "fast_instance_defines.bsv"
`include "instance_defines.bsv"
`include "core_parameters.bsv"
/*========================= */
`include "instance_defines.bsv"
`include "core_parameters.bsv"
/*========================= */
@@
-41,11
+43,11
@@
package MemoryMap;
function Tuple2 #(Bool, Bit#(TLog#(Num_Fast_Slaves)))
fn_addr_to_slave_num (Bit#(`PADDR) addr);
function Tuple2 #(Bool, Bit#(TLog#(Num_Fast_Slaves)))
fn_addr_to_slave_num (Bit#(`PADDR) addr);
- let ft =
FastTuple2
(addr);
+ let ft =
fn_addr_to_fastslave_num
(addr);
Bool isfast = tpl_1(ft);
Bit#(TLog#(Num_Fast_Slaves)) x = tpl_2(ft);
Bool isfast = tpl_1(ft);
Bit#(TLog#(Num_Fast_Slaves)) x = tpl_2(ft);
- let st =
SlowTuple2
(addr);
+ let st =
fn_slow_address_mapping
(addr);
Bool isslow = tpl_1(st);
Bit#(TLog#(Num_Slow_Slaves)) y = tpl_2(st);
if (isfast)
Bool isslow = tpl_1(st);
Bit#(TLog#(Num_Slow_Slaves)) y = tpl_2(st);
if (isfast)
@@
-60,11
+62,13
@@
endfunction
function Bool is_IO_Addr(Bit#(`PADDR) addr); // TODO Shuold be PADDR
if(addr>=`DebugBase && addr<=`DebugEnd)
return (True);
function Bool is_IO_Addr(Bit#(`PADDR) addr); // TODO Shuold be PADDR
if(addr>=`DebugBase && addr<=`DebugEnd)
return (True);
- else if(addr>=`SDRAMMemBase && addr<=`SDRAMMemEnd)
- `ifdef FlexBus
+ `ifdef SDR0MemBase
+ else if(addr>=`SDR0MemBase && addr<=`SDR0MemEnd)
+ `ifdef FlexBus
return (True);
return (True);
- `else
- return (False);
+ `else
+ return (False);
+ `endif
`endif
`ifdef BOOTROM
else if(addr>=`BootRomBase && addr<=`BootRomEnd)
`endif
`ifdef BOOTROM
else if(addr>=`BootRomBase && addr<=`BootRomEnd)