Changeset 493 for trunk


Ignore:
Timestamp:
Aug 14, 2013, 11:21:11 PM (11 years ago)
Author:
alain
Message:

cosmetic

Location:
trunk/platforms
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/platforms/tsar_generic_iob/top.cpp

    r490 r493  
    13331333   {
    13341334      // Monitor a specific address for L1 & L2 caches
    1335       // clusters[1][0]->proc[0]->cache_monitor(0x4000ULL);
     1335      // clusters[1][1]->proc[0]->cache_monitor(0x8ba4ULL);
    13361336      // clusters[0][0]->memc->cache_monitor(   0x25000ULL);
    13371337
  • trunk/platforms/tsar_generic_xbar/top.cpp

    r485 r493  
    2323//
    2424// All clusters are identical, but the cluster 0 (called io_cluster),
    25 // contains 5 extra components:
     25// contains 6 extra components:
    2626// - the boot rom (BROM)
    2727// - the disk controller (BDEV)
    2828// - the multi-channel network controller (MNIC)
    29 // - the multi-channel chained buffer dma controller (CHBUF)
     29// - the multi-channel chained buffer dma controller (CDMA)
    3030// - the multi-channel tty controller (MTTY)
    3131// - the frame buffer controller (FBUF)
     
    148148#define vci_trdid_width       4
    149149#define vci_wrplen_width      1
     150
    150151////////////////////////////////////////////////////////////
    151152//    Main Hardware Parameters values         
     
    250251#define MNIC_SIZE       0x0000080000   // 512 Kbytes (for 8 channels)
    251252
    252 #define CHBUF_BASE       0x00B6000000     
    253 #define CHBUF_SIZE       0x0000004000 * NB_CMA_CHANNELS
     253#define CDMA_BASE       0x00B6000000     
     254#define CDMA_SIZE       0x0000004000 * NB_CMA_CHANNELS
    254255
    255256// replicated segments : address is incremented by a cluster offset
     
    278279#define MNIC_TGTID      6
    279280#define BROM_TGTID      7
    280 #define CHBUF_TGTID      8
     281#define CDMA_TGTID      8
    281282
    282283/////////////////////////////////
     
    290291   char     soft_name[256]   = soft_pathname;      // pathname to binary code
    291292#endif
    292    uint64_t ncycles          = 100000000000;       // simulated cycles
     293   uint64_t ncycles          = 1000000000       // simulated cycles
    293294   char     disk_name[256]   = BDEV_IMAGE_NAME;    // pathname to the disk image
    294295   char     nic_rx_name[256] = NIC_RX_NAME;        // pathname to the rx packets file
     
    504505            maptabd.add(Segment("seg_mnic", MNIC_BASE, MNIC_SIZE,
    505506                        IntTab(cluster(x,y),MNIC_TGTID), false));
    506             maptabd.add(Segment("seg_chbuf", CHBUF_BASE, CHBUF_SIZE,
    507                         IntTab(cluster(x,y),CHBUF_TGTID), false));
     507            maptabd.add(Segment("seg_cdma", CDMA_BASE, CDMA_SIZE,
     508                        IntTab(cluster(x,y),CDMA_TGTID), false));
    508509            maptabd.add(Segment("seg_brom", BROM_BASE, BROM_SIZE,
    509510                        IntTab(cluster(x,y),BROM_TGTID), true));
     
    637638                BROM_TGTID,
    638639                MNIC_TGTID,
    639                 CHBUF_TGTID,
     640                CDMA_TGTID,
    640641                BDEV_TGTID,
    641642                MEMC_WAYS,
Note: See TracChangeset for help on using the changeset viewer.