Changeset 238 for soft/giet_vm/memo/include/memo.h

Timestamp:

May 29, 2013, 1:24:09 AM (11 years ago)

Author:

alain

Message:

Major evolution to support physical addresses larger than 32 bits.
The map.xml format has been modified: the vsegs associated to schedulers
are now explicitely defined and mapped in the page tables.

File:

• soft/giet_vm/memo/include/memo.h (modified) (7 diffs)

soft/giet_vm/memo/include/memo.h

@@ -1 +1 @@
 /* -*- c++ -*-
  *
- * SOCLIB_LGPL_HEADER_BEGIN
+ * GIET_VM_LGPL_HEADER_BEGIN
  * 
- * This file is part of SoCLib, GNU LGPLv2.1.
+ * This file is part of GIET_VM, GNU LGPLv2.1.
  * 
- * SoCLib is free software; you can redistribute it and/or modify it
+ * 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
+ * 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
@@ -15 +15 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
- * License along with SoCLib; if not, write to the Free Software
+ * License along with GIET_VM; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  * 
- * SOCLIB_LGPL_HEADER_END
+ * GIET_VM_LGPL_HEADER_END
  *
  * Copyright (c) UPMC, Lip6, SoC
@@ -25 +25 @@
  *
  */
-#ifndef _MEMO_H_
-#define _MEMO_H_
+
+#ifndef GIET_VM_MEMO_H
+#define GIET_VM_MEMO_H
 
 #include  <stdlib.h>
@@ -57 +58 @@
 class MeMo
 {
+// TODO: make the name defined in the map_info relative to this wd.
 
-    std::string m_path;         //map_info path name
-    std::string m_wd;           //map_info path to directory TODO: make the name defined in the map_info relative to this wd.
-    std::string m_simpleName;   //map_info filename TODO
-    void* m_data;               //map_info structure 
-    uintptr_t m_addr;           //map_info address (virtual)
-    size_t m_size;              //size of the structure
+    std::string                                   m_path;       // map_info path name
+    std::string                                   m_wd;         // map_info directory TODO
+    std::string                                   m_simpleName; // map_info filename TODO
+    void*                                         m_data;       // map_info structure 
+    uintptr_t                                     m_addr;       // map_info address (virtual)
+    size_t                                        m_size;       // size of the structure
     mutable std::map<std::string, elfpp::object*> m_loaders;
-    PSegHandler m_psegh;
-    PathHandler m_pathHandler;
-    
-    bool m_ginit;
-    elfpp::object* m_generator;
+    PSegHandler                                   m_psegh;
+    PathHandler                                   m_pathHandler;
+    bool                                          m_ginit;
+    elfpp::object*                                m_generator;
 
     size_t load_bin(std::string filename, void* buffer);    
@@ -78 +79 @@
 public:
 
-    MeMo( const std::string &name, const size_t pageSize = 4096);
+    MeMo( const std::string   &name, 
+          const size_t        pageSize = 4096);
+
     ~MeMo();
 
@@ -93 +96 @@
     }
 
+    // The following functions handle the map.bin structure
+    // They must keep synchronised with functions defined in boot_init.c.
 
-    //The following functions handle the map.bin structure
-    //inspired from the boot_init.c of the GIET
     mapping_cluster_t* get_cluster_base( mapping_header_t* header );
     mapping_pseg_t* get_pseg_base( mapping_header_t* header );
@@ -108 +111 @@
 
 
-#endif /* _MEMO_H_ */
+#endif /* GIET_VM_MEMO_H */
 
 // Local Variables: