Index: soft/giet_vm/memo/include/pseg.h
===================================================================
--- soft/giet_vm/memo/include/pseg.h	(revision 210)
+++ soft/giet_vm/memo/include/pseg.h	(revision 238)
@@ -1,13 +1,13 @@
 /* -*- c++ -*-
  *
- * SOCLIB_LGPL_HEADER_BEGIN
+ * GIET-VM_LGPL_HEADER_BEGIN
  * 
- * This file is part of SoCLib, GNU LGPLv2.1.
+ * This file is part of the GIET-VMS, GNU LGPLv2.1.
  * 
- * SoCLib is free software; you can redistribute it and/or modify it
+ * The GIET-VM is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
  * by the Free Software Foundation; version 2.1 of the License.
  * 
- * SoCLib is distributed in the hope that it will be useful, but
+ * THe GIET-VM is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -19,5 +19,5 @@
  * 02110-1301 USA
  * 
- * SOCLIB_LGPL_HEADER_END
+ * GIET-VM_LGPL_HEADER_END
  *
  * Copyright (c) UPMC, Lip6, SoC
@@ -25,6 +25,6 @@
  *          
  */
-#ifndef SOCLIB_PSEG_H_
-#define SOCLIB_PSEG_H_
+#ifndef GIET_MEMO_PSEG_H
+#define GIET_MEMO_PSEG_H
 
 #include <string>
@@ -39,4 +39,5 @@
 class MeMo;
 
+//////////
 class VSeg
 {
@@ -45,19 +46,22 @@
     friend class MeMo;
 
-    std::string m_name;
-    std::string m_file;
-    uintptr_t m_vma;   //The address of the section to load in the binary file.
-    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...)
+    typedef unsigned long long paddr_t;
+
+    std::string m_name;     // vseg name
+    std::string m_file;     // file name
+    uintptr_t   m_vma;      // Virtual address of the section to load in the binary file.
+    paddr_t     m_lma;      // Physical address  
+    size_t      m_length;
+    size_t      m_type;
+    bool        m_loadable; // loadable vseg ( code, data...)
 
 public:
-    bool m_ident;//Indicate if the idententy mapping is activited. used by PSegHandler::makeIdent()
+
+    bool        m_ident;    // identity mapping required if true
 
     const std::string& name() const;
     const std::string& file() const;
     uintptr_t vma() const;
-    uintptr_t lma() const;
+    paddr_t lma() const;
     size_t length() const;
     size_t type() const;
@@ -75,50 +79,58 @@
     VSeg();
     VSeg( const VSeg &ref );
-    VSeg(std::string& binaryName, std::string& name, uintptr_t vma, size_t length, bool loadable, bool ident);
+    VSeg(std::string&   binaryName, 
+         std::string&   name, 
+         uintptr_t      vma, 
+         size_t         length, 
+         bool           loadable, 
+         bool           ident);
 
     ~VSeg();
 };
 
-
+//////////
 class PSeg
 {
-    std::string m_name;
-    uintptr_t m_lma;
-    size_t m_length;
-    size_t m_type;
+    std::string   m_name;
+    paddr_t       m_lma;
+    paddr_t       m_length;
+    size_t        m_type;
 
-    uintptr_t m_pageLimit;  //The end (m_lma + m_length)  address of the segment pageSize aligned 
-    uintptr_t m_nextLma;    //next free base 
+    paddr_t       m_pageLimit;  // m_lma + m_length aligned on page size 
+    paddr_t       m_nextLma;    // next free base 
     
-    void confNextLma();     //check that m_nextLma has a correct value: whithin the seg limits
+    void confNextLma();         // check m_nextLma is whithin the seg limits
 
 public:
+
     std::vector<VSeg> m_vsegs;
-    uintptr_t m_limit;// m_lma + m_length
 
+    paddr_t     m_limit;        // m_lma + m_length
 
     const std::string& name() const;
-    uintptr_t lma() const;
-    size_t length() const;
+    paddr_t lma() const;
+    paddr_t length() const;
     size_t type() const;
-    uintptr_t limit() const;
-    uintptr_t nextLma() const;
+    paddr_t limit() const;
+    paddr_t nextLma() const;
 
     void check() const;
 
     void setName(std::string& name);
-    void setLma( uintptr_t lma);
-    void setLength(size_t length);
+    void setLma( paddr_t lma);
+    void setLength(paddr_t length);
 
-    static size_t align( unsigned toAlign, unsigned alignPow2);
-    static size_t pageAlign( size_t toAlign );
+    static paddr_t align( paddr_t toAlign, unsigned alignPow2);
+    static paddr_t pageAlign( paddr_t toAlign );
+
     static void setPageSize(size_t pg);
+
     static size_t& pageSize();
 
-    void add( VSeg& vseg );//add a VSeg
+    void add( VSeg& vseg );    //add a VSeg
     void addIdent( VSeg& vseg );
 
-    void setNextLma( uintptr_t nextLma);
-    void incNextLma( size_t inc_next);
+    void setNextLma( paddr_t nextLma);
+    void incNextLma( size_t inc);
 
     void print( std::ostream &o ) const;
@@ -134,12 +146,12 @@
     PSeg( const PSeg &ref );
     PSeg( const std::string &name);
-    PSeg( const uintptr_t lma);
+    PSeg( const paddr_t lma);
     PSeg( const std::string &name,
-		     uintptr_t lma,
-             size_t length,
-             size_t type);
+          paddr_t lma,
+          paddr_t length,
+          size_t type);
     ~PSeg();
 };
 
 
-#endif /* SOCLIB_PSEG_H_ */
+#endif /* GIET_MEMO_PSEG_H */
