Changeset 378 for trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster

Timestamp:

Apr 18, 2013, 3:33:14 PM (12 years ago)

Author:

joannou

Message:

Introducing tsar_generic_xbar platform

Location:

trunk/platforms/tsar_generic_xbar

Files:

• . (copied) (copied from branches/v5/platforms/tsarv5_generic_mmu)
• tsar_xbar_cluster (copied) (copied from branches/v5/platforms/tsarv5_generic_mmu/tsarv5_cluster_mmu)
• tsar_xbar_cluster/caba/metadata/tsar_xbar_cluster.sd (copied) (copied from branches/v5/platforms/tsarv5_generic_mmu/tsarv5_cluster_mmu/caba/metadata/tsarv5_cluster_mmu.sd) (3 diffs)
• tsar_xbar_cluster/caba/metadata/tsarv5_cluster_mmu.sd (deleted)
• tsar_xbar_cluster/caba/source/include/tsar_xbar_cluster.h (copied) (copied from branches/v5/platforms/tsarv5_generic_mmu/tsarv5_cluster_mmu/caba/source/include/tsarv5_cluster_mmu.h) (7 diffs)
• tsar_xbar_cluster/caba/source/include/tsarv5_cluster_mmu.h (deleted)
• tsar_xbar_cluster/caba/source/src/tsar_xbar_cluster.cpp (copied) (copied from branches/v5/platforms/tsarv5_generic_mmu/tsarv5_cluster_mmu/caba/source/src/tsarv5_cluster_mmu.cpp) (5 diffs)
• tsar_xbar_cluster/caba/source/src/tsarv5_cluster_mmu.cpp (deleted)

trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/metadata/tsar_xbar_cluster.sd

@@ -2 +2 @@
 # -*- python -*-
 
-Module('caba:tsarv5_cluster_mmu',
-        classname = 'soclib::caba::TsarV5ClusterMmu',
+Module('caba:tsar_xbar_cluster',
+        classname = 'soclib::caba::TsarXbarCluster',
         tmpl_parameters = [
                 parameter.Module('vci_param', default = 'caba:vci_param'),
@@ -10 +10 @@
                 parameter.Int('rsp_width'),
                 ],
-        header_files = [ '../source/include/tsarv5_cluster_mmu.h', ],
-        implementation_files = [ '../source/src/tsarv5_cluster_mmu.cpp', ],
+        header_files = [ '../source/include/tsar_xbar_cluster.h', ],
+        implementation_files = [ '../source/src/tsar_xbar_cluster.cpp', ],
         uses = [
                 Uses('caba:base_module'),
@@ -36 +36 @@
         Uses('caba:virtual_dspin_router', 
                      flit_width = parameter.Reference('rsp_width')),
-        Uses('caba:vci_vdspin_target_wrapper', 
-                     dspin_cmd_width = parameter.Reference('cmd_width'), 
-                     dspin_rsp_width = parameter.Reference('rsp_width')),
-        Uses('caba:vci_vdspin_initiator_wrapper', 
-                     dspin_cmd_width = parameter.Reference('cmd_width'), 
-                     dspin_rsp_width = parameter.Reference('rsp_width')),
                 Uses('caba:vci_multi_tty'),
                 Uses('caba:vci_framebuffer'),
                 Uses('caba:vci_multi_nic'),
-                Uses('caba:vci_block_device_tsar_v4'),
+                Uses('caba:vci_block_device_tsar'),
                 Uses('caba:vci_multi_dma'),
                 Uses('common:elf_file_loader'),

trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/source/include/tsar_xbar_cluster.h

@@ -1 +1 @@
 //////////////////////////////////////////////////////////////////////////////
-// File: tsarv5_cluster_mmu.h
+// File: tsar_xbar_cluster_mmu.h
 // Author: Alain Greiner 
 // Copyright: UPMC/LIP6
@@ -7 +7 @@
 //////////////////////////////////////////////////////////////////////////////
 
-#ifndef SOCLIB_CABA_TSAR_CLUSTER_V5_MMU_H
-#define SOCLIB_CABA_TSAR_CLUSTER_V5_MMU_H
+#ifndef SOCLIB_CABA_TSAR_XBAR_CLUSTER_H
+#define SOCLIB_CABA_TSAR_XBAR_CLUSTER_H
 
 #include <systemc>
@@ -28 +28 @@
 #include "vci_multi_tty.h"
 #include "vci_multi_nic.h"
-#include "vci_block_device_tsar_v4.h"
+#include "vci_block_device_tsar.h"
 #include "vci_framebuffer.h"
 #include "vci_multi_dma.h"
@@ -38 +38 @@
 ///////////////////////////////////////////////////////////////////////////
 template<typename vci_param, typename iss_t, int cmd_width, int rsp_width>
-class TsarV5ClusterMmu 
+class TsarXbarCluster 
 ///////////////////////////////////////////////////////////////////////////
     : public soclib::caba::BaseModule
@@ -150 +150 @@
     VciDspinTargetWrapper<vci_param,cmd_width,rsp_width>*       wt_mnic;
 
-    VciBlockDeviceTsarV4<vci_param>*                            bdev;
+    VciBlockDeviceTsar<vci_param>*                              bdev;
     VciDspinInitiatorWrapper<vci_param,cmd_width,rsp_width>*    wi_bdev;
     VciDspinTargetWrapper<vci_param,cmd_width,rsp_width>*       wt_bdev;
@@ -162 +162 @@
     VirtualDspinRouter<rsp_width>*                              router_rsp;
 
-        TsarV5ClusterMmu(sc_module_name                     insname,
+        TsarXbarCluster( sc_module_name                     insname,
                      size_t                             nb_procs,      // number of processors 
                      size_t                             nb_ttys,       // number of TTY terminals 
@@ -204 +204 @@
                      bool                               proc_debug_ok); 
 
-        ~TsarV5ClusterMmu();
+        ~TsarXbarCluster();
 };
 }}

trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/source/src/tsar_xbar_cluster.cpp

@@ -1 +1 @@
 //////////////////////////////////////////////////////////////////////////////
-// File: tsarv5_cluster_mmu.c
+// File: tsar_xbar_cluster.cpp
 // Author: Alain Greiner 
 // Copyright: UPMC/LIP6
@@ -24 +24 @@
 ////////////////////////////////////////////////////////////////////////////////// 
 
-#include "../include/tsarv5_cluster_mmu.h"
+#include "../include/tsar_xbar_cluster.h"
 
 namespace soclib {
@@ -33 +33 @@
 //////////////////////////////////////////////////////////////////////////
 template<typename vci_param, typename iss_t, int cmd_width, int rsp_width>
-TsarV5ClusterMmu<vci_param, iss_t, cmd_width, rsp_width>::TsarV5ClusterMmu(
+TsarXbarCluster<vci_param, iss_t, cmd_width, rsp_width>::TsarXbarCluster(
          sc_module_name                     insname,
          size_t                             nb_procs,
@@ -343 +343 @@
         std::cout << "  - building bdev" << std::endl;
 
-        bdev = new VciBlockDeviceTsarV4<vci_param>(
+        bdev = new VciBlockDeviceTsar<vci_param>(
                         "bdev",
                         mtd,
@@ -712 +712 @@
 ///////////////////////////////////////////////////////////////////////////
 template<typename vci_param, typename iss_t, int cmd_width, int rsp_width>
-TsarV5ClusterMmu<vci_param, iss_t, cmd_width, rsp_width>::~TsarV5ClusterMmu() {}
+TsarXbarCluster<vci_param, iss_t, cmd_width, rsp_width>::~TsarXbarCluster() {}
 
 }