import slow memory map insteaad of entire peripherals

[shakti-core.git] / src / lib / MemoryMap.bsv

diff --git a/src/lib/MemoryMap.bsv b/src/lib/MemoryMap.bsv
index f664200114186d3b093893acfcf589470b703790..693a667962d7fdcba15dee18e1707f76ebe8b8dd 100644 (file)
--- a/src/lib/MemoryMap.bsv
+++ b/src/lib/MemoryMap.bsv
@@ -31,51 +31,51 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 package MemoryMap;
        /*=== Project imports ==== */
        import defined_types::*;
-       import SoC::*;
-       import slow_peripherals::*;
+       import socgen::*;
+       import slow_memory_map::*;
        `include "instance_defines.bsv"
-       `include "core_defines.bsv"
+       `include "core_parameters.bsv"
        /*========================= */
 
 
 function Tuple2 #(Bool, Bit#(TLog#(Num_Slaves)))
                     fn_addr_to_slave_num  (Bit#(`PADDR) addr);
 
-    Bool isfast;
-    Bit#(TLog#(Num_Slaves) y;
-    FastTuple2(isfast, y);
-    if (isfast)
-        return tuple2(isfast, y);
+    let ft = FastTuple2(addr);
+    Bool isfast = tpl_1(ft);
+    Bit#(TLog#(Num_Slaves)) x = tpl_2(ft);
 
-    Bool isslow;
-    Bit#(TLog#(Num_Slow_Slaves) y;
-    SlowTuple2(isslow, y);
-    if (isslow)
+    let st = SlowTuple2(addr);
+    Bool isslow = tpl_1(st);
+    Bit#(TLog#(Num_Slow_Slaves)) y = tpl_2(st);
+    if (isfast)
+        return tuple2(isfast, x);
+    else if (isslow)
         return tuple2(True,fromInteger(valueOf(SlowPeripheral_slave_num)));
-
-    return tuple2(False,?);
+    else
+        return tuple2(False,?);
 
 endfunction
 
 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)
+        if(addr>=`DebugBase && addr<=`DebugEnd)
+            return (True);
+        else if(addr>=`SDRAMMemBase && addr<=`SDRAMMemEnd)
         `ifdef FlexBus
-                       return (True);
+                return (True);
         `else
-               return (False);
-               `endif
-               `ifdef BOOTROM
-                       else if(addr>=`BootRomBase && addr<=`BootRomEnd)
-                               return (False);
-               `endif
-               `ifdef TCMemory
-                       else if(addr>=`TCMBase && addr<=`TCMEnd)
-                               return (False);
-               `endif
-               else
-                       return True;
+            return (False);
+        `endif
+        `ifdef BOOTROM
+            else if(addr>=`BootRomBase && addr<=`BootRomEnd)
+                return (False);
+        `endif
+        `ifdef TCMemory
+            else if(addr>=`TCMBase && addr<=`TCMEnd)
+                return (False);
+        `endif
+        else
+            return True;
 endfunction
 
 endpackage