Changeset 255 for soft/giet_vm/xml

Timestamp:

Oct 9, 2013, 9:32:41 AM (11 years ago)

Author:

meunier

Message:

• Added a syscall and some user functions to manipulate the Simulation Helper
• Changed the the way the Vseg -> Pseg mapping is made during the boot to better utilize the address space (+ adaptation of the algorithm in memo)
• Fixed a bug in boot_init (vobj_init): the vobj initialization could only be made for the first application (ptpr was not changed)

Location:

soft/giet_vm/xml

Files:

• mapping_info.h (modified) (5 diffs)
• xml_parser.c (modified) (6 diffs)

soft/giet_vm/xml/mapping_info.h

@@ -106 +106 @@
     PERIPH_TYPE_GCD       = 10,
     PERIPH_TYPE_XCU       = 11,
-
-    PERIPH_TYPE_MAX_VALUE = 12,
+    PERIPH_TYPE_SIM       = 12,
+
+    PERIPH_TYPE_MAX_VALUE = 13,
 };
 
@@ -142 +143 @@
     unsigned int iob_cluster;        // index of cluster containing IOB controler
     unsigned int iob_cluster_bis;    // index of cluster containing second IOB controler
+    unsigned int sim_cluster;        // index of cluster containing the Simulation Helper
+    unsigned int sim_cluster_bis;    // index of cluster containing the Simulation Helper
 
     unsigned int psegs;              // total number of physical segments (for all clusters)
@@ -182 +185 @@
     unsigned int type;           // RAM / ROM / PERI
     unsigned int cluster;        // index of cluster containing pseg
-    paddr_t      next_base;      // first free page base address
 } mapping_pseg_t;
 
@@ -206 +208 @@
     unsigned int vbase;          // base address in virtual space
     paddr_t      pbase;          // base address in physical space
+    unsigned int pbase_set;
     unsigned int length;         // size (bytes)
     unsigned int psegid;         // physical segment global index
@@ -234 +237 @@
 
 /////////////////////////////
-typedef struct __attribute__((packed))  mapping_vobj_s 
+typedef struct __attribute__((packed))  mapping_vobj_s
 {
     char         name[32];       // vobj name (unique in a vspace)

soft/giet_vm/xml/xml_parser.c

@@ -748 +748 @@
     ////////// set vobj_offset attributes
     vseg[vseg_index]->vobj_offset = vobj_index;
+    // Init pbase_set to false
+    vseg[vseg_index]->pbase_set = 0;
 
 #if XML_PARSER_DEBUG
@@ -1273 +1275 @@
             }
         }
+        else if (strcmp(str, "SIM") == 0) 
+        {
+            periph[periph_index]->type = PERIPH_TYPE_SIM;
+            if (header->sim_cluster == 0xFFFFFFFF)  
+            {
+                header->sim_cluster = cluster_index; 
+            }
+            else if (header->sim_cluster_bis == 0xFFFFFFFF) 
+            {
+                header->sim_cluster_bis = cluster_index; 
+            }
+            else
+            {
+                error = 1;
+            }
+        }
         // The TIM, ICU, XICU, DMA, MEMC peripherals are replicated in all clusters
         // but it must exist only one component of each type per cluster
@@ -2086 +2104 @@
     header->cma_cluster = 0xFFFFFFFF;
     header->iob_cluster = 0xFFFFFFFF;
+    header->sim_cluster = 0xFFFFFFFF;
     header->tty_cluster_bis = 0xFFFFFFFF;
     header->nic_cluster_bis = 0xFFFFFFFF;
@@ -2092 +2111 @@
     header->cma_cluster_bis = 0xFFFFFFFF;
     header->iob_cluster_bis = 0xFFFFFFFF;
+    header->sim_cluster_bis = 0xFFFFFFFF;
 
     ///////// set signature
@@ -2162 +2182 @@
     }
 
-    //#if XML_PARSER_DEBUG
+    #if XML_PARSER_DEBUG
     printf("%s\n", file_path);
-    //#endif
+    #endif
 
     return fdout;
@@ -2424 +2444 @@
     ld_write(fdout, "seg_iob_base            ",   periph_vbase_array[PERIPH_TYPE_IOB]);
     ld_write(fdout, "seg_gcd_base            ",   periph_vbase_array[PERIPH_TYPE_GCD]);
+    ld_write(fdout, "seg_sim_base            ",   periph_vbase_array[PERIPH_TYPE_SIM]);
 
     file_write(fdout, "\n");