Changeset 491 for soft

Timestamp:

Jan 20, 2015, 5:20:39 PM (10 years ago)

Author:

cfuguet

Message:

genmap: add distributed ROM support

• Generate the DROM address space segment that is used for the TSAR reconfiguration distributed ROM.

Location:

soft/giet_vm

Files:

• giet_python/mapping.py (modified) (4 diffs)
• giet_xml/mapping_info.h (modified) (1 diff)
• giet_xml/xml_driver.c (modified) (1 diff)
• giet_xml/xml_parser.c (modified) (3 diffs)

soft/giet_vm/giet_python/mapping.py

@@ -65 +65 @@
                   'XCU',
                   'PIC',
+                  'DROM',
                  ]
 
@@ -904 +905 @@
         seg_xcu_size = 0
 
+        nb_drom       = 0
+        drom_channels = 0
+        seg_drom_base = 0xFFFFFFFF
+        seg_drom_size = 0
+
         use_bdv = False
         use_spi = False
@@ -965 +971 @@
                     rom_channels = periph.channels
                     nb_rom +=1
+
+                elif ( periph.ptype == 'DROM' ):
+                    seg_drom_base = periph.pseg.base & 0xFFFFFFFF
+                    seg_drom_size = periph.pseg.size
+                    drom_channels = periph.channels
+                    nb_drom +=1
 
                 elif ( periph.ptype == 'SIM' ):
@@ -1184 +1196 @@
         s += '#define SEG_RDK_BASE           0x%x\n'  % seg_rdk_base
         s += '#define SEG_RDK_SIZE           0x%x\n'  % seg_rdk_size
+        s += '\n'
+        s += '#define SEG_DROM_BASE          0x%x\n'  % seg_drom_base
+        s += '#define SEG_DROM_SIZE          0x%x\n'  % seg_drom_size
         s += '\n'
         s += '#define PERI_CLUSTER_INCREMENT 0x%x\n'  % self.peri_increment

soft/giet_vm/giet_xml/mapping_info.h

@@ -115 +115 @@
     PERIPH_TYPE_XCU       = 12,
     PERIPH_TYPE_PIC       = 13,
-
-    PERIPH_TYPE_MAX_VALUE = 14,
+    PERIPH_TYPE_DROM      = 14,
+
+    PERIPH_TYPE_MAX_VALUE = 15,
 };
 

soft/giet_vm/giet_xml/xml_driver.c

@@ -88 +88 @@
         "XCU",
         "PIC",
+        "DROM",
     };
 

soft/giet_vm/giet_xml/xml_parser.c

@@ -1484 +1484 @@
         periph[periph_index]->subtype = 0xFFFFFFFF;
 
-        // The CMA, FBF, HBA, IOB, IOC, NIC, ROM, SIM, TTY, peripherals are not 
+        // The CMA, FBF, HBA, IOB, IOC, NIC, ROM, SIM, TTY, PIC, DROM peripherals are not
         // replicated in all clusters but can be instanciated twice. 
 
@@ -1626 +1626 @@
             }
         }
-        else 
+        /////////////////////////////////
+        else if (strcmp(str, "DROM") == 0)
+        {
+            periph[periph_index]->type = PERIPH_TYPE_DROM;
+        }
+        else
         {
             printf("[XML ERROR] illegal peripheral type: %s in cluster %d\n",
@@ -1879 +1884 @@
     if      (ok && (strcmp(str, "RAM" ) == 0)) { pseg[pseg_index]->type = PSEG_TYPE_RAM; }
     else if (ok && (strcmp(str, "ROM" ) == 0)) { pseg[pseg_index]->type = PSEG_TYPE_ROM; }
+    else if (ok && (strcmp(str, "DROM" ) == 0)) { pseg[pseg_index]->type = PSEG_TYPE_ROM; }
     else if (ok && (strcmp(str, "PERI") == 0)) { pseg[pseg_index]->type = PSEG_TYPE_PERI; }
     else