Changeset 210

Timestamp:

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

Author:

karaoui

Message:

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

Location:

soft/giet_vm

Files:

• boot/boot_init.c (modified) (2 diffs)
• memo/Makefile (modified) (1 diff)
• memo/include/memo.h (modified) (3 diffs)
• memo/include/pseg.h (modified) (6 diffs)
• memo/src/memo.cpp (modified) (3 diffs)
• memo/src/pseg.cpp (modified) (5 diffs)

soft/giet_vm/boot/boot_init.c

@@ -795 +795 @@
     }
 
-    // set the next_base field in vseg
-    if ( vseg->ident == 0 )
-        pseg->next_base = vseg->pbase + vseg->length;
 
 #if BOOT_DEBUG_PT
@@ -809 +806 @@
 boot_puts("\n");
 #endif  
+
+    // set the next_base field in vseg
+    if ( vseg->ident == 0 && pseg->type != PSEG_TYPE_PERI )
+        pseg->next_base = vseg->pbase + vseg->length;
 
 } // end boot_vseg_map()

soft/giet_vm/memo/Makefile

@@ -9 +9 @@
 INCLUDES = -Iinclude/libelfpp -Iinclude/libelfpp/elfpp -Iinclude/ -I../xml
 memo.x: $(SRCS) $(HDRS)
-        #g++ -Wall -g  $(SRCS) $(INCLUDES) -o memo.x
         g++ -Wall -g -DDISTRIBUTED_SCHEDULERS   $(SRCS) $(INCLUDES) -o memo.x
 

soft/giet_vm/memo/include/memo.h

@@ -25 +25 @@
  *
  */
-#ifndef SOCLIB_VLOADER_H_
-#define SOCLIB_VLOADER_H_
+#ifndef _MEMO_H_
+#define _MEMO_H_
 
 #include  <stdlib.h>
@@ -50 +50 @@
 
 #include "stdint.h"
+#include "mapping_info.h"
 #include "pseg_handler.h"
 #include "path_handler.h"
-
 
 
@@ -109 +109 @@
 
 
-#endif /* SOCLIB_VLOADER_H_ */
+#endif /* _MEMO_H_ */
 
 // Local Variables:

soft/giet_vm/memo/include/pseg.h

@@ -34 +34 @@
 
 #include "stdint.h"
+#include "mapping_info.h"
 
 
@@ -49 +50 @@
     uintptr_t m_lma;   //Physical address to which we load the seg (getted from the associated PSeg), setted by PSeg::add/addIdent.
     size_t m_length;
+    size_t m_type;
     bool m_loadable;     // wether this is a loadable vseg ( code, data...)
 
@@ -59 +61 @@
     uintptr_t lma() const;
     size_t length() const;
+    size_t type() const;
     //void add( VObj& vobj );//add a VObj
 
@@ -83 +86 @@
     uintptr_t m_lma;
     size_t m_length;
+    size_t m_type;
 
     uintptr_t m_pageLimit;  //The end (m_lma + m_length)  address of the segment pageSize aligned 
@@ -97 +101 @@
     uintptr_t lma() const;
     size_t length() const;
+    size_t type() const;
     uintptr_t limit() const;
     uintptr_t nextLma() const;
@@ -132 +137 @@
     PSeg( const std::string &name,
                      uintptr_t lma,
-             size_t length);
+             size_t length,
+             size_t type);
     ~PSeg();
 };

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);

soft/giet_vm/memo/src/pseg.cpp

@@ -63 +63 @@
 }
 
-uintptr_t VSeg::length() const
+size_t VSeg::length() const
 {
         return m_length;
+}
+
+size_t VSeg::type() const
+{
+        return m_type;
 }
 
@@ -152 +157 @@
 }
 
-uintptr_t PSeg::length() const
+size_t PSeg::length() const
 {
         return m_length;
 }
 
+size_t PSeg::type() const
+{
+        return m_type;
+}
+
 uintptr_t PSeg::nextLma() const
 {
@@ -169 +179 @@
 void PSeg::check() const
 {
+
+    if(this->m_type == PSEG_TYPE_PERI)
+        return;
+
+    std::vector<VSeg>::const_iterator it;
     size_t size = m_vsegs.size();
     size_t used[size][2];//lma, lma+length
     size_t i,j,error=0;
     
-    std::vector<VSeg>::const_iterator it;
     for(it = m_vsegs.begin(), i= 0; it < m_vsegs.end(); it++, i++)
     {
@@ -179 +193 @@
         for(j=0; j< i; j++)
         {
-           if(  
-                (used[j][0] == (*it).lma() /*and (*it).length()?*/) ) //not the same lma ,
+           if(  (used[j][0] == (*it).lma() /*and (*it).length()?*/) ) //not the same lma ,
             {
                 error = 1;
                 std::cout << "ok \n";
             }
-           if(  
-                (used[j][1] == it_limit /*and (*it).legth()?*/))  // and not the same limit
+           if(  (used[j][1] == it_limit /*and (*it).legth()?*/))  // and not the same limit
             {
                 error = 2;
             }
-           if(  
-                ((used[j][0] < (*it).lma()) and ((*it).lma() < used[j][1] )) ) //lma  within the used slice
+           if(  ((used[j][0] < (*it).lma()) and ((*it).lma() < used[j][1] )) ) //lma  within the used slice
             {
                 error = 3;
             }
-           if(  
-                ((used[j][0] < it_limit) and (it_limit < used[j][1] )) )//limit not within the used slice
+           if(  ((used[j][0] < it_limit) and (it_limit < used[j][1] )) )//limit not within the used slice
             {
                 error = 4;
+                std::cout << "base: " << std::hex << (*it).lma() << std::endl;
                 std::cout << "limit: " << std::hex << it_limit << std::endl;
                 std::cout << "used[j][0]: " << std::hex << used[j][0] << std::endl;
@@ -362 +373 @@
 
 PSeg::PSeg( const std::string &name,
-               uintptr_t lma,
-                size_t length)
+                uintptr_t lma,
+                size_t length,
+                size_t type)
 {
     m_name = name;
     m_length = length;
+    m_type = type;
 
     setLma(lma);