Changeset 522 for soft/giet_vm/giet_xml/xml_driver.c

Timestamp:

Mar 10, 2015, 3:17:57 PM (9 years ago)

Author:

alain

Message:

Simplification in the mapping_info.h file:
The coproc and cp_port objects have been removed,
because the coprocessors are now described as peripherals.

The xml parser and driver have been modified accordingly.

File:

• soft/giet_vm/giet_xml/xml_driver.c (modified) (10 diffs)

soft/giet_vm/giet_xml/xml_driver.c

@@ -24 +24 @@
     { 
         "ELF",        // binary code generated by GCC
-        "BLOB",       // binary code generated by GCC
+        "BLOB",       // binary 
         "PTAB",       // page table 
         "PERI",       // hardware component
@@ -52 +52 @@
     };
 
-    // mnemonics defined in irq_handler.h
+    // These mnemonics must be consistent with values in
+    // irq_handler.h / irq_handler.c / mapping.py
     const char * isr_type[] =
     {
@@ -68 +69 @@
         "ISR_DMA",
         "ISR_SPI",
-    };
-
-    // mnemonics defined in mapping_info.h
+        "ISR_MWR",
+    };
+
+    const char * mwr_subtype[] =
+    {
+        "GCD",
+        "DCT",
+    };
+
     const char * periph_type[] =
     {
@@ -96 +103 @@
         "SPI",
         "NONE",
-    };
-
-    const char * port_direction[] =
-    {
-        "TO_COPROC",
-        "FROM_COPROC",
     };
 
@@ -131 +132 @@
     unsigned int proc_id;
     unsigned int irq_id;
-    unsigned int coproc_id;
-    unsigned int port_id;
     unsigned int periph_id;
 
@@ -142 +141 @@
     mapping_proc_t * proc;
     mapping_irq_t * irq;    
-    mapping_coproc_t * coproc;
-    mapping_cp_port_t * cp_port;
     mapping_periph_t * periph;
 
@@ -195 +192 @@
             MAPPING_PROC_SIZE * header->procs);
 
-    // computes the base address for coprocs array 
-    coproc = (mapping_coproc_t *) ((char *) header +
+    // computes the base address for periphs array 
+    periph = (mapping_periph_t *) ((char *) header +
             MAPPING_HEADER_SIZE +
             MAPPING_CLUSTER_SIZE * header->x_size * header->y_size +
@@ -205 +202 @@
             MAPPING_PROC_SIZE * header->procs +
             MAPPING_IRQ_SIZE * header->irqs);
-
-    // computes the base address for cp_ports array 
-    cp_port = (mapping_cp_port_t *) ((char *) header +
-            MAPPING_HEADER_SIZE +
-            MAPPING_CLUSTER_SIZE * header->x_size * header->y_size +
-            MAPPING_PSEG_SIZE * header->psegs +
-            MAPPING_VSPACE_SIZE * header->vspaces +
-            MAPPING_VSEG_SIZE * header->vsegs +
-            MAPPING_TASK_SIZE * header->tasks +
-            MAPPING_PROC_SIZE * header->procs +
-            MAPPING_IRQ_SIZE * header->irqs +
-            MAPPING_COPROC_SIZE * header->coprocs);
-
-    // computes the base address for periphs array 
-    periph = (mapping_periph_t *) ((char *) header +
-            MAPPING_HEADER_SIZE +
-            MAPPING_CLUSTER_SIZE * header->x_size * header->y_size +
-            MAPPING_PSEG_SIZE * header->psegs +
-            MAPPING_VSPACE_SIZE * header->vspaces +
-            MAPPING_VSEG_SIZE * header->vsegs +
-            MAPPING_TASK_SIZE * header->tasks +
-            MAPPING_PROC_SIZE * header->procs +
-            MAPPING_IRQ_SIZE * header->irqs +
-            MAPPING_COPROC_SIZE * header->coprocs +
-            MAPPING_CP_PORT_SIZE * header->cp_ports);
 
     ///////////////////////// header /////////////////////////////////////////////
@@ -276 +248 @@
         }
 
-        ///////////////////// coprocessors ///////////////////////////////////////////
-
-        for (coproc_id = cluster[cluster_id].coproc_offset;
-             coproc_id < cluster[cluster_id].coproc_offset + cluster[cluster_id].coprocs;
-             coproc_id++) 
-        {
-            fprintf(fpout, "            <coproc name=\"%s\"", coproc[coproc_id].name);
-            fprintf(fpout, " psegname=\"%s\" >\n", pseg[coproc[coproc_id].psegid].name);
-            for (port_id = coproc[coproc_id].port_offset;
-                 port_id < coproc[coproc_id].port_offset + coproc[coproc_id].ports;
-                 port_id++) 
-            {
-                unsigned int vseg_id = cp_port[port_id].mwmr_vseg_id; 
-                fprintf(fpout, "             <port direction=\"%s\"", port_direction[cp_port[port_id].direction]);
-                fprintf(fpout, " vspacename=\"%s\"", vspace[cp_port[port_id].vspaceid].name);
-                fprintf(fpout, " vsegname=\"%s\" />\n",  vseg[vseg_id].name);
-            }
-            fprintf(fpout, "            </coproc>\n" );
-        }
-
         ///////////////////// periphs  ///////////////////////////////////////////////
 
@@ -307 +259 @@
                 fprintf(fpout, " subtype=\"%s\"", ioc_subtype[periph[periph_id].subtype]);
 
+            if (periph[periph_id].type == PERIPH_TYPE_MWR) 
+                fprintf(fpout, " subtype=\"%s\"", mwr_subtype[periph[periph_id].subtype]);
+
             fprintf(fpout, " psegname=\"%s\"", pseg[periph[periph_id].psegid].name);
             fprintf(fpout, " channels=\"%d\"",  periph[periph_id].channels);
-            fprintf(fpout, " arg=\"%d\" >\n",  periph[periph_id].arg);
+            fprintf(fpout, " arg0=\"%d\" >\n",  periph[periph_id].arg0);
+            fprintf(fpout, " arg1=\"%d\" >\n",  periph[periph_id].arg1);
+            fprintf(fpout, " arg2=\"%d\" >\n",  periph[periph_id].arg2);
+            fprintf(fpout, " arg3=\"%d\" >\n",  periph[periph_id].arg3);
             if ( (periph[periph_id].type == PERIPH_TYPE_PIC) ||
                  (periph[periph_id].type == PERIPH_TYPE_XCU) )