Changeset 210 for soft/giet_vm/memo/src/memo.cpp

Timestamp:

Aug 21, 2012, 9:30:46 AM (12 years ago)

Author:

karaoui

Message:

Avoid incremmentinting Pseg of "PERI" type, to permit multiple mapping.

File:

• soft/giet_vm/memo/src/memo.cpp (modified) (3 diffs)

soft/giet_vm/memo/src/memo.cpp

@@ -507 +507 @@
     vSO->m_ident = vseg->ident;
 
-    //set the lma
-    if ( vseg->ident != 0 )            // identity mapping required
-        ps->addIdent( *vSO );
-    else
-        ps->add( *vSO );
-
+    //should we check that we have the same type for the pseg and vobj?
+    if(ps->type() != VOBJ_TYPE_PERI)//take into acount only vseg who are not of the peri type
+    {
+        //set the lma
+        if ( vseg->ident != 0 )            // identity mapping required
+            ps->addIdent( *vSO );
+        else
+            ps->add( *vSO );
+    }
     if(!sect)
         return;
@@ -559 +562 @@
             //build pseg
             std::string name(pseg[pseg_id].name);
-            PSeg *ps = new PSeg(name, pseg[pseg_id].base, pseg[pseg_id].length);
+            PSeg *ps = new PSeg(name, pseg[pseg_id].base, pseg[pseg_id].length, pseg[pseg_id].type);
 
 #ifdef DISTRIBUTED_SCHEDULERS 
@@ -567 +570 @@
                 found  = 1;
             }
+            if(!found){/* we could imagine a cluster without proc, let the giet choose*/ }
 #endif
             m_psegh.m_pSegs.push_back(*ps);