Changeset 295


Ignore:
Timestamp:
Feb 14, 2013, 4:05:05 PM (12 years ago)
Author:
cfuguet
Message:

Introducing branches/v5/ components directory. This branch
will be used to version control of new TSAR V5 which implements the
DHCCP new modifications. All components version suffixes is not used
anymore

Location:
branches/v5
Files:
1 added
6 deleted
6 copied
1 moved

Legend:

Unmodified
Added
Removed

  • branches/v5/vci_mem_cache/caba/metadata/vci_mem_cache.sd

    r294 r295  
    55__version__ = "$Revision$"
    66
    7 Module('caba:vci_mem_cache_v4',
    8         classname = 'soclib::caba::VciMemCacheV4',
     7Module('caba:vci_mem_cache',
     8        classname = 'soclib::caba::VciMemCache',
    99
    1010        tmpl_parameters = [ parameter.Module('vci_param', default = 'caba:vci_param') ],
    1111
    1212        header_files = [
    13             '../source/include/vci_mem_cache_v4.h',
    14             '../source/include/xram_transaction_v4.h',
    15             '../source/include/mem_cache_directory_v4.h',
    16             '../source/include/update_tab_v4.h'
     13            '../source/include/vci_mem_cache.h',
     14            '../source/include/xram_transaction.h',
     15            '../source/include/mem_cache_directory.h',
     16            '../source/include/update_tab.h'
    1717        ],
    1818
    19         implementation_files = [ '../source/src/vci_mem_cache_v4.cpp' ],
     19        implementation_files = [ '../source/src/vci_mem_cache.cpp' ],
    2020
    2121        uses = [

  • branches/v5/vci_mem_cache/caba/source/include/mem_cache_directory.h

    r294 r295  
    1 #ifndef SOCLIB_CABA_MEM_CACHE_DIRECTORY_V4_H
    2 #define SOCLIB_CABA_MEM_CACHE_DIRECTORY_V4_H
     1#ifndef SOCLIB_CABA_MEM_CACHE_DIRECTORY_H
     2#define SOCLIB_CABA_MEM_CACHE_DIRECTORY_H
    33
    44#include <inttypes.h>

  • branches/v5/vci_mem_cache/caba/source/include/update_tab.h

    r294 r295  
    1 #ifndef UPDATE_TAB_V4_H_
    2 #define UPDATE_TAB_V4_H_
     1#ifndef UPDATE_TAB_H_
     2#define UPDATE_TAB_H_
    33
    44#include <inttypes.h>

  • branches/v5/vci_mem_cache/caba/source/include/vci_mem_cache.h

    r294 r295  
    11/* -*- c++ -*-
    2  * File         : vci_mem_cache_v4.h
     2 * File         : vci_mem_cache.h
    33 * Date         : 26/10/2008
    44 * Copyright    : UPMC / LIP6
    … …  
    3939 */
    4040
    41 #ifndef SOCLIB_CABA_MEM_CACHE_V4_H
    42 #define SOCLIB_CABA_MEM_CACHE_V4_H
     41#ifndef SOCLIB_CABA_MEM_CACHE_H
     42#define SOCLIB_CABA_MEM_CACHE_H
    4343
    4444#include <inttypes.h>
    … …  
    5555#include "int_tab.h"
    5656#include "generic_llsc_global_table.h"
    57 #include "mem_cache_directory_v4.h"
    58 #include "xram_transaction_v4.h"
    59 #include "update_tab_v4.h"
     57#include "mem_cache_directory.h"
     58#include "xram_transaction.h"
     59#include "update_tab.h"
    6060
    6161#define TRANSACTION_TAB_LINES 4 // Number of lines in the transaction tab
    … …  
    6666
    6767  template<typename vci_param>
    68     class VciMemCacheV4
     68    class VciMemCache
    6969    : public soclib::caba::BaseModule
    7070    {
    … …  
    362362      protected:
    363363
    364       SC_HAS_PROCESS(VciMemCacheV4);
     364      SC_HAS_PROCESS(VciMemCache);
    365365
    366366      public:
    … …  
    372372      soclib::caba::VciInitiator<vci_param> p_vci_ixr;
    373373
    374       VciMemCacheV4(
     374      VciMemCache(
    375375          sc_module_name name,                                // Instance Name
    376376          const soclib::common::MappingTable &mtp,            // Mapping table for primary requets
    … …  
    390390          bool   debug_ok=false);
    391391
    392       ~VciMemCacheV4();
     392      ~VciMemCache();
    393393
    394394      void print_stats();
    … …  
    804804      sc_signal<int>      r_alloc_heap_fsm;
    805805      sc_signal<unsigned> r_alloc_heap_reset_cpt;
    806     }; // end class VciMemCacheV4
     806    }; // end class VciMemCache
    807807
    808808}}

  • branches/v5/vci_mem_cache/caba/source/include/xram_transaction.h

    r294 r295  
    1 #ifndef XRAM_TRANSACTION_V4_H_
    2 #define XRAM_TRANSACTION_V4_H_
     1#ifndef XRAM_TRANSACTION_H_
     2#define XRAM_TRANSACTION_H_
    33
    44#include <inttypes.h>

  • branches/v5/vci_mem_cache/caba/source/src/vci_mem_cache.cpp

    r294 r295  
    11 /* -*- c++ -*-
    2  * File       : vci_mem_cache_v4.cpp
     2 * File       : vci_mem_cache.cpp
    33 * Date       : 30/10/2008
    44 * Copyright  : UPMC / LIP6
    … …  
    3030 */
    3131
    32 #include "../include/vci_mem_cache_v4.h"
     32#include "../include/vci_mem_cache.h"
    3333
    3434//////   debug services   ///////////////////////////////////////////////////////
    … …  
    238238  };
    239239
    240 #define tmpl(x) template<typename vci_param> x VciMemCacheV4<vci_param>
     240#define tmpl(x) template<typename vci_param> x VciMemCache<vci_param>
    241241
    242242  using soclib::common::uint32_log2;
    … …  
    246246  ////////////////////////////////
    247247
    248   tmpl(/**/)::VciMemCacheV4(
     248  tmpl(/**/)::VciMemCache(
    249249      sc_module_name name,
    250250      const soclib::common::MappingTable &mtp,
    … …  
    547547
    548548  /////////////////////////////////
    549   tmpl(/**/)::~VciMemCacheV4()
     549  tmpl(/**/)::~VciMemCache()
    550550    /////////////////////////////////
    551551  {
Note: See TracChangeset for help on using the changeset viewer.