Changeset 493 for trunk

Timestamp:

Aug 14, 2013, 11:21:11 PM (11 years ago)

Author:

alain

Message:

cosmetic

Location:

trunk/platforms

Files:

• tsar_generic_iob/top.cpp (modified) (1 diff)
• tsar_generic_xbar/top.cpp (modified) (7 diffs)

trunk/platforms/tsar_generic_iob/top.cpp

@@ -1333 +1333 @@
    {
       // Monitor a specific address for L1 & L2 caches
-      // clusters[1][0]->proc[0]->cache_monitor(0x4000ULL);
+      // clusters[1][1]->proc[0]->cache_monitor(0x8ba4ULL);
       // clusters[0][0]->memc->cache_monitor(   0x25000ULL);
 

trunk/platforms/tsar_generic_xbar/top.cpp

@@ -23 +23 @@
 //
 // All clusters are identical, but the cluster 0 (called io_cluster), 
-// contains 5 extra components:
+// contains 6 extra components:
 // - the boot rom (BROM)
 // - the disk controller (BDEV)
 // - the multi-channel network controller (MNIC)
-// - the multi-channel chained buffer dma controller (CHBUF)
+// - the multi-channel chained buffer dma controller (CDMA)
 // - the multi-channel tty controller (MTTY)
 // - the frame buffer controller (FBUF)
@@ -148 +148 @@
 #define vci_trdid_width       4
 #define vci_wrplen_width      1
+
 ////////////////////////////////////////////////////////////
 //    Main Hardware Parameters values         
@@ -250 +251 @@
 #define MNIC_SIZE       0x0000080000   // 512 Kbytes (for 8 channels)
 
-#define CHBUF_BASE       0x00B6000000      
-#define CHBUF_SIZE       0x0000004000 * NB_CMA_CHANNELS 
+#define CDMA_BASE       0x00B6000000      
+#define CDMA_SIZE       0x0000004000 * NB_CMA_CHANNELS 
 
 // replicated segments : address is incremented by a cluster offset 
@@ -278 +279 @@
 #define MNIC_TGTID      6
 #define BROM_TGTID      7
-#define CHBUF_TGTID      8
+#define CDMA_TGTID      8
 
 /////////////////////////////////
@@ -290 +291 @@
    char     soft_name[256]   = soft_pathname;      // pathname to binary code
 #endif
-   uint64_t ncycles          = 100000000000;       // simulated cycles
+   uint64_t ncycles          = 1000000000;         // simulated cycles
    char     disk_name[256]   = BDEV_IMAGE_NAME;    // pathname to the disk image
    char     nic_rx_name[256] = NIC_RX_NAME;        // pathname to the rx packets file
@@ -504 +505 @@
             maptabd.add(Segment("seg_mnic", MNIC_BASE, MNIC_SIZE, 
                         IntTab(cluster(x,y),MNIC_TGTID), false));
-            maptabd.add(Segment("seg_chbuf", CHBUF_BASE, CHBUF_SIZE, 
-                        IntTab(cluster(x,y),CHBUF_TGTID), false));
+            maptabd.add(Segment("seg_cdma", CDMA_BASE, CDMA_SIZE, 
+                        IntTab(cluster(x,y),CDMA_TGTID), false));
             maptabd.add(Segment("seg_brom", BROM_BASE, BROM_SIZE, 
                         IntTab(cluster(x,y),BROM_TGTID), true));
@@ -637 +638 @@
                 BROM_TGTID,
                 MNIC_TGTID,
-                CHBUF_TGTID,
+                CDMA_TGTID,
                 BDEV_TGTID,
                 MEMC_WAYS,