Changeset 296 for soft/giet_vm/giet_xml/xml_parser.c

Timestamp:

Mar 27, 2014, 6:39:27 PM (11 years ago)

Author:

alain

Message:

Bug fix in log messages.

File:

• soft/giet_vm/giet_xml/xml_parser.c (modified) (6 diffs)

soft/giet_vm/giet_xml/xml_parser.c

@@ -321 +321 @@
 
 #if XML_PARSER_DEBUG
-printf(" - found vseg %s with psegid = %d", vseg[vseg_id]->name, pseg_id );
+printf(" - found vseg %s associated to pseg %d", vseg[vseg_id]->name, pseg_id );
 #endif
 
@@ -1285 +1285 @@
         else if (strcmp(str, "ISR_NIC_RX" ) == 0)  irq[irq_index]->isr = ISR_NIC_RX;
         else if (strcmp(str, "ISR_NIC_TX" ) == 0)  irq[irq_index]->isr = ISR_NIC_TX;
+        else if (strcmp(str, "ISR_MMC"    ) == 0)  irq[irq_index]->isr = ISR_MMC;
         else if (strcmp(str, "ISR_DEFAULT") == 0)  irq[irq_index]->isr = ISR_DEFAULT;
         else 
         {
             printf("[XML ERROR] illegal IRQ <isr> for periph %d in cluster %d\n",
-                    cluster_index, periph_loc_index);
+                    periph_loc_index, cluster_index );
             exit(1);
         }
@@ -1749 +1750 @@
     periph[periph_index]->irq_offset = irq_index;
 
-#if XML_PARSER_DEBUG
-printf("      irq_offset  = %d\n", irq_index );
-#endif
-
     ///////////// get IRQs
     int status = xmlTextReaderRead(reader);
@@ -2322 +2319 @@
     }
 
+    /////////// get signature attribute
+    value = getIntValue(reader, "signature", &ok);
+    if ( ok && (value == IN_MAPPING_SIGNATURE) )
+    {
+#if XML_PARSER_DEBUG
+        printf("  signature = %x\n", value);
+#endif
+        header->signature = IN_MAPPING_SIGNATURE;
+    }
+    else
+    {
+        printf("[XML ERROR] illegal or missing <signature> for mapping %s\n",
+        header->name );
+        exit(1);
+    }
+
     /////////// get x_width attribute
     value = getIntValue(reader, "x_width", &ok);
@@ -2390 +2403 @@
     unsigned int y_io = getIntValue(reader, "y_io", &ok);
 #if XML_PARSER_DEBUG
-        printf("  y_io      = %d\n", y_size);
+        printf("  y_io      = %d\n", y_io);
 #endif
     if ( ok &&(y_io < y_size) ) 
@@ -2440 +2453 @@
     ///////// set other header fields 
     header->increment = 0x10000;
-    header->signature = IN_MAPPING_SIGNATURE;
     header->globals   = 0;
     header->vspaces   = 0;