Changeset 389 for trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/source/src/tsar_xbar_cluster.cpp
- Timestamp:
- May 16, 2013, 3:32:38 PM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/source/src/tsar_xbar_cluster.cpp
r379 r389 26 26 #include "../include/tsar_xbar_cluster.h" 27 27 28 #define tmpl(x) template<\ 29 typename iss_t,int cmd_width, int rsp_width> \ 30 x TsarXbarCluster<\ 31 iss_t, cmd_width, rsp_width\ 32 > 33 28 34 namespace soclib { 29 35 namespace caba { … … 32 38 // Constructor 33 39 ////////////////////////////////////////////////////////////////////////// 34 template<typename vci_param, typename iss_t, int cmd_width, int rsp_width> 35 TsarXbarCluster<vci_param, iss_t, cmd_width, rsp_width>::TsarXbarCluster( 40 tmpl(/**/)::TsarXbarCluster( 36 41 sc_module_name insname, 37 42 size_t nb_procs, … … 103 108 std::ostringstream sproc; 104 109 sproc << "proc_" << p; 105 proc[p] = new VciCcVCacheWrapper<vci_param , iss_t>(110 proc[p] = new VciCcVCacheWrapper<vci_param_d, cmd_width, rsp_width, iss_t>( 106 111 sproc.str().c_str(), 107 112 cluster_id*nb_procs + p, // GLOBAL PROC_ID … … 125 130 std::ostringstream swip; 126 131 swip << "wi_proc_" << x_id << "_" << y_id << p; 127 wi_proc[p] = new VciDspinInitiatorWrapper<vci_param ,cmd_width,rsp_width>(132 wi_proc[p] = new VciDspinInitiatorWrapper<vci_param_d,cmd_width,rsp_width>( 128 133 swip.str().c_str(), 129 134 x_width + y_width + l_width); … … 133 138 std::cout << " - building memc_" << x_id << "_" << y_id << std::endl; 134 139 135 memc = new VciMemCache<vci_param >(140 memc = new VciMemCache<vci_param_d, vci_param_x, rsp_width, cmd_width>( 136 141 "memc", 137 142 mtd, // Mapping Table direct space … … 148 153 memc_debug_ok ); 149 154 150 wt_memc = new VciDspinTargetWrapper<vci_param ,cmd_width,rsp_width>(155 wt_memc = new VciDspinTargetWrapper<vci_param_d,cmd_width,rsp_width>( 151 156 "wt_memc", 152 157 x_width + y_width + l_width); … … 155 160 std::cout << " - building xram_" << x_id << "_" << y_id << std::endl; 156 161 157 xram = new VciSimpleRam<vci_param >(162 xram = new VciSimpleRam<vci_param_x>( 158 163 "xram", 159 164 IntTab(cluster_id), … … 165 170 std::cout << " - building xicu_" << x_id << "_" << y_id << std::endl; 166 171 167 xicu = new VciXicu<vci_param >(172 xicu = new VciXicu<vci_param_d>( 168 173 "xicu", 169 174 mtd, // mapping table … … 171 176 nb_procs, // number of timer IRQs 172 177 32, // number of hard IRQs 173 0,// number of soft IRQs178 32, // number of soft IRQs 174 179 nb_procs); // number of output IRQs 175 180 176 wt_xicu = new VciDspinTargetWrapper<vci_param ,cmd_width,rsp_width>(181 wt_xicu = new VciDspinTargetWrapper<vci_param_d,cmd_width,rsp_width>( 177 182 "wt_xicu", 178 183 x_width + y_width + l_width); … … 181 186 std::cout << " - building mdma_" << x_id << "_" << y_id << std::endl; 182 187 183 mdma = new VciMultiDma<vci_param >(188 mdma = new VciMultiDma<vci_param_d>( 184 189 "mdma", 185 190 mtd, … … 189 194 nb_dmas); // number of IRQs 190 195 191 wt_mdma = new VciDspinTargetWrapper<vci_param ,cmd_width,rsp_width>(196 wt_mdma = new VciDspinTargetWrapper<vci_param_d,cmd_width,rsp_width>( 192 197 "wt_mdma", 193 198 x_width + y_width + l_width); 194 199 195 wi_mdma = new VciDspinInitiatorWrapper<vci_param ,cmd_width,rsp_width>(200 wi_mdma = new VciDspinInitiatorWrapper<vci_param_d,cmd_width,rsp_width>( 196 201 "wi_mdma", 197 202 x_width + y_width + l_width); … … 285 290 std::cout << " - building brom" << std::endl; 286 291 287 brom = new VciSimpleRam<vci_param >(292 brom = new VciSimpleRam<vci_param_d>( 288 293 "brom", 289 294 IntTab(cluster_id, tgtid_brom), … … 291 296 loader); 292 297 293 wt_brom = new VciDspinTargetWrapper<vci_param ,cmd_width,rsp_width>("wt_brom",298 wt_brom = new VciDspinTargetWrapper<vci_param_d,cmd_width,rsp_width>("wt_brom", 294 299 x_width + y_width + l_width); 295 300 … … 297 302 std::cout << " - building fbuf" << std::endl; 298 303 299 fbuf = new VciFrameBuffer<vci_param >(304 fbuf = new VciFrameBuffer<vci_param_d>( 300 305 "fbuf", 301 306 IntTab(cluster_id, tgtid_fbuf), … … 303 308 xfb, yfb); 304 309 305 wt_fbuf = new VciDspinTargetWrapper<vci_param ,cmd_width,rsp_width>("wt_fbuf",310 wt_fbuf = new VciDspinTargetWrapper<vci_param_d,cmd_width,rsp_width>("wt_fbuf", 306 311 x_width + y_width + l_width); 307 312 … … 309 314 std::cout << " - building bdev" << std::endl; 310 315 311 bdev = new VciBlockDeviceTsar<vci_param >(316 bdev = new VciBlockDeviceTsar<vci_param_d>( 312 317 "bdev", 313 318 mtd, … … 318 323 64); // burst size 319 324 320 wt_bdev = new VciDspinTargetWrapper<vci_param ,cmd_width,rsp_width>("wt_bdev",321 x_width + y_width + l_width); 322 wi_bdev = new VciDspinInitiatorWrapper<vci_param ,cmd_width,rsp_width>("wi_bdev",325 wt_bdev = new VciDspinTargetWrapper<vci_param_d,cmd_width,rsp_width>("wt_bdev", 326 x_width + y_width + l_width); 327 wi_bdev = new VciDspinInitiatorWrapper<vci_param_d,cmd_width,rsp_width>("wi_bdev", 323 328 x_width + y_width + l_width); 324 329 … … 326 331 std::cout << " - building mnic" << std::endl; 327 332 328 mnic = new VciMultiNic<vci_param >(333 mnic = new VciMultiNic<vci_param_d>( 329 334 "mnic", 330 335 IntTab(cluster_id, tgtid_mnic), … … 336 341 0 ); // mac_2 address 337 342 338 wt_mnic = new VciDspinTargetWrapper<vci_param ,cmd_width,rsp_width>("wt_mnic",343 wt_mnic = new VciDspinTargetWrapper<vci_param_d,cmd_width,rsp_width>("wt_mnic", 339 344 x_width + y_width + l_width); 340 345 … … 349 354 vect_names.push_back(term_name.str().c_str()); 350 355 } 351 mtty = new VciMultiTty<vci_param >(356 mtty = new VciMultiTty<vci_param_d>( 352 357 "mtty", 353 358 IntTab(cluster_id, tgtid_mtty), … … 355 360 vect_names); 356 361 357 wt_mtty = new VciDspinTargetWrapper<vci_param ,cmd_width,rsp_width>("wt_mtty",362 wt_mtty = new VciDspinTargetWrapper<vci_param_d,cmd_width,rsp_width>("wt_mtty", 358 363 x_width + y_width + l_width); 359 364 … … 677 682 // destructor 678 683 /////////////////////////////////////////////////////////////////////////// 679 template<typename vci_param, typename iss_t, int cmd_width, int rsp_width> 680 TsarXbarCluster<vci_param, iss_t, cmd_width, rsp_width>::~TsarXbarCluster() {} 681 684 tmpl(/**/)::~TsarXbarCluster() {} 682 685 } 683 686 }
Note: See TracChangeset
for help on using the changeset viewer.