Changeset 281 for soft/giet_vm/giet_xml

Timestamp:

Jan 30, 2014, 5:32:13 PM (11 years ago)

Author:

cfuguet

Message:

Modifications in GIET_VM:

• Supporting platforms with more than one IRQ per processor from the XICU.

When this is the case, the IRQ per processor can be signalled
by the XCU peripheric number of channels on the XML file.

The xml_parser will generate a constant on the hard_config.h
file, called IRQ_PER_PROCESSOR and this constant will be use
by the GIET_VM to create accordingly the irq masks on the
ICU

File:

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

soft/giet_vm/giet_xml/xml_parser.c

@@ -115 +115 @@
 unsigned int dma_channels     = 0; // max number of DMA channels (per cluster)
 
+unsigned int icu_channels     = 0; // total number of IRQ per processor
 unsigned int tty_channels     = 0; // total number of terminals in TTY 
 unsigned int hba_channels     = 0; // total number of channels  in HBA
@@ -122 +123 @@
 unsigned int use_iob          = 0; // using IOB component
 unsigned int use_xcu          = 0; // using XCU (not ICU)
-unsigned int use_hba          = 0; // using XCU (not IOC)
+unsigned int use_hba          = 0; // using HBA
 
 
@@ -1442 +1443 @@
             if (found_icu || use_xcu)  error = 1; 
             found_icu = 1;
+
+            if (icu_channels > 0) 
+            {
+                assert( (periph[periph_index]->channels == icu_channels) &&
+                        "[XML ERROR] the number of interruptions per processor "
+                        "from the ICU (icu channels) must be the same on all "
+                        "clusters");
+            }
+            else
+            {
+                icu_channels = periph[periph_index]->channels;
+            }
         }
         //////////////////////////////////
@@ -1466 +1479 @@
         {
             periph[periph_index]->type = PERIPH_TYPE_XCU;
-            if (found_icu || found_timer)  error = 1; 
+            if (found_xcu || found_icu || found_timer)  error = 1; 
             found_xcu    = 1;
             found_timer  = 1;
             tim_channels = 32; 
             use_xcu      = 1;
+
+            if (icu_channels > 0) 
+            {
+                assert( (periph[periph_index]->channels == icu_channels) &&
+                        "[XML ERROR] the number of interruptions per processor "
+                        "from the ICU (icu channels) must be the same on all "
+                        "clusters");
+            }
+            else
+            {
+                icu_channels = periph[periph_index]->channels;
+            }
         }
         else 
         {
-            printf("[XML ERROR] illegal <type> for peripheral %d in cluster %d\n",
-                    periph_loc_index, cluster_index);
+            printf("[XML ERROR] illegal <type>: %s for peripheral %d in cluster %d\n",
+                    str, periph_loc_index, cluster_index);
             exit(1);
         }
@@ -1481 +1506 @@
         if (error) 
         {
-            printf("[XML ERROR] illegal <type> for peripheral %d in cluster %d\n",
-                    periph_loc_index, cluster_index);
+            printf("[XML ERROR] illegal <type>: %s for peripheral %d in cluster %d\n",
+                    str, periph_loc_index, cluster_index);
             exit(1);
         }
@@ -2509 +2534 @@
     sprintf(prol, "/* Generated from file %s.xml */\n\n",header->name);
 
-    char * ifdef  = "#ifndef _HARD_CONFIG_H\n#define _HARDD_CONFIG_H\n\n";
+    char * ifdef  = "#ifndef _HARD_CONFIG_H\n#define _HARD_CONFIG_H\n\n";
     char * epil   = "\n#endif //_HARD_CONFIG_H";
 
@@ -2542 +2567 @@
     def_int_write(fdout, "USE_IOB           ", use_iob);
     def_int_write(fdout, "USE_HBA           ", use_hba);
+
+    file_write(fdout, "\n");
+
+    def_int_write(fdout, "IRQ_PER_PROCESSOR ", icu_channels);
 
     file_write(fdout, epil);