Changeset 627 for soft/giet_vm/giet_xml

Timestamp:

Jul 18, 2015, 2:48:16 PM (9 years ago)

Author:

alain

Message:

Add the "ltid" field in the mapping_task_t structure,
To support the giet_kill_application() and giet_exec_application() system calls.

Location:

soft/giet_vm/giet_xml

Files:

• Makefile (modified) (1 diff)
• mapping_info.h (modified) (1 diff)
• xml_driver.c (modified) (3 diffs)
• xml_parser.c (modified) (13 diffs)

soft/giet_vm/giet_xml/Makefile

@@ -3 +3 @@
 
 bin2xml: xml_driver.c mapping_info.h
-        gcc -Wall -I. -I../sys xml_driver.c -o bin2xml
+        gcc -Wall -I. -I.. xml_driver.c -o bin2xml
 
-xml2bin: xml_parser.c mapping_info.h
-        gcc -Wall -I. -I../giet_kernel -I/usr/include/libxml2 xml_parser.c -o xml2bin -lxml2
+xml2bin: xml_parser.c mapping_info.h 
+        gcc -Wall -I. -I.. -I../giet_kernel -I/usr/include/libxml2 xml_parser.c -o xml2bin -lxml2
 
 test:

soft/giet_vm/giet_xml/mapping_info.h

@@ -229 +229 @@
     unsigned int    heap_vseg_id;    // global index for vseg containing heap
     unsigned int    startid;         // index in start_vector 
+    unsigned int    ltid;            // task index in scheduler (dynamically defined)
 } mapping_task_t;
 

soft/giet_vm/giet_xml/xml_driver.c

@@ -136 +136 @@
     mapping_vseg_t * vseg;
     mapping_task_t * task;
-    mapping_proc_t * proc;
     mapping_irq_t * irq;    
     mapping_periph_t * periph;
@@ -169 +168 @@
             MAPPING_VSPACE_SIZE * header->vspaces +
             MAPPING_VSEG_SIZE * header->vsegs);
-
-    // computes the base address for procs array 
-    proc = (mapping_proc_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);
 
     // computes the base address for irqs array 
@@ -261 +251 @@
             fprintf(fpout, " psegname=\"%s\"", pseg[periph[periph_id].psegid].name);
             fprintf(fpout, " channels=\"%d\"",  periph[periph_id].channels);
-            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, " arg0=\"%d\"",  periph[periph_id].arg0);
+            fprintf(fpout, " arg1=\"%d\"",  periph[periph_id].arg1);
+            fprintf(fpout, " arg2=\"%d\"",  periph[periph_id].arg2);
             fprintf(fpout, " arg3=\"%d\" >\n",  periph[periph_id].arg3);
             if ( (periph[periph_id].type == PERIPH_TYPE_PIC) ||

soft/giet_vm/giet_xml/xml_parser.c

@@ -26 +26 @@
 #include  <mapping_info.h>
 #include  <irq_handler.h>
+#include  <giet_config.h>
 
 #define MAX_CLUSTERS   1024
@@ -313 +314 @@
 
     ///////// get trdid attribute (optional)
-    task[task_index]->trdid = getIntValue(reader, "trdid", &ok);
-#if XML_PARSER_DEBUG
-printf("      trdid     = %d\n", x);
-#endif
-    if ( !ok ) 
-    {
-        task[task_index]->trdid = task_loc_index;
-    }  
+    value = getIntValue(reader, "trdid", &ok);
+#if XML_PARSER_DEBUG
+printf("      trdid     = %d\n", value );
+#endif
+    if ( ok ) task[task_index]->trdid = value;
+    else      task[task_index]->trdid = task_loc_index;
 
     ///////// get x coordinate 
@@ -996 +995 @@
     if (ok == 0) 
     {
-        printf("[XML ERROR] illegal or missing <psegname> for coproc %d in cluster %d\n", 
-                coproc_index, cluster_index);
+        printf("[XML ERROR] illegal or missing <psegname> for periph %d in cluster %d\n", 
+                periph_index, cluster_index);
         exit(1);
     }
@@ -1232 +1231 @@
 #endif
     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 
@@ -1295 +1292 @@
     cluster[cluster_index]->psegs = 0;
     cluster[cluster_index]->procs = 0;
-    cluster[cluster_index]->coprocs = 0;
     cluster[cluster_index]->periphs = 0;
 
     //initialise global variables
     proc_loc_index = 0;
-    coproc_loc_index = 0;
     periph_loc_index = 0;
 
@@ -1344 +1339 @@
     cluster[cluster_index]->pseg_offset = pseg_index;
     cluster[cluster_index]->proc_offset = proc_index;
-    cluster[cluster_index]->coproc_offset = coproc_index;
     cluster[cluster_index]->periph_offset = periph_index;
 
@@ -1350 +1344 @@
 printf("    pseg_offset   = %d\n", pseg_index);
 printf("    proc_offset   = %d\n", proc_index);
-printf("    coproc_offset = %d\n", coproc_index);
-printf("    periph_offset = %d\n", coproc_index);
-#endif
-
-    ////////// get psegs, procs, coprocs and periphs
+printf("    periph_offset = %d\n", periph_index);
+#endif
+
+    ////////// get psegs, procs, and periphs
     int status = xmlTextReaderRead(reader);
 
@@ -1363 +1356 @@
         if      (strcmp(tag, "pseg")     == 0) psegNode(reader);
         else if (strcmp(tag, "proc")     == 0) procNode(reader);
-        else if (strcmp(tag, "coproc")   == 0) coprocNode(reader);
         else if (strcmp(tag, "periph")   == 0) periphNode(reader);
         else if (strcmp(tag, "#text")    == 0) { }
@@ -1373 +1365 @@
 printf("    psegs   = %d\n", cluster[cluster_index]->psegs);
 printf("    procs   = %d\n", cluster[cluster_index]->procs);
-printf("    coprocs = %d\n", cluster[cluster_index]->coprocs);
 printf("    periphs = %d\n", cluster[cluster_index]->periphs);
 printf("    end cluster %d\n", cluster_index);
@@ -1414 +1405 @@
             printf("  end cluster set\n\n");
 #endif
-            header->psegs = pseg_index;
-            header->procs = proc_index;
-            header->irqs = irq_index;
-            header->coprocs = coproc_index;
+            header->psegs   = pseg_index;
+            header->procs   = proc_index;
+            header->irqs    = irq_index;
             header->periphs = periph_index;
             return;
@@ -1676 +1666 @@
     header->procs     = 0;
     header->irqs      = 0;
-    header->coprocs   = 0;
     header->periphs   = 0;
-
 
     int status = xmlTextReaderRead(reader);
@@ -1775 +1763 @@
 printf("procs     = %d\n", header->procs);
 printf("irqs      = %d\n", header->irqs);
-printf("coprocs   = %d\n", header->coprocs);
 printf("periphs   = %d\n", header->periphs);
 #endif
@@ -1801 +1788 @@
     //building irqs array
     BuildTable(fdout, "irq", irq_index, sizeof(mapping_irq_t), (char **) irq);
-    //building coprocs array
-    BuildTable(fdout, "coproc", coproc_index, sizeof(mapping_coproc_t), (char **) coproc);
     //building periphs array
     BuildTable(fdout, "periph", periph_index, sizeof(mapping_periph_t), (char **) periph);