Changeset 173 for soft/giet_vm/memo/include

Timestamp:

Jul 18, 2012, 4:59:19 PM (12 years ago)

Author:

karaoui

Message:

Adding BLOB type for vobj.
Don't forget to set as BLOB type the mapping_info vobj in the xml.

Location:

soft/giet_vm/memo/include

Files:

• exception.h (modified) (3 diffs)
• libelfpp/elfpp/elfpp_section.hh (modified) (1 diff)
• libelfpp/elfpp/elfpp_section.hxx (modified) (2 diffs)
• memo.h (modified) (1 diff)

soft/giet_vm/memo/include/exception.h

@@ -1 +1 @@
 /* -*- c++ -*-
  *
- * SOCLIB_LGPL_HEADER_BEGIN
- * 
- * This file is part of SoCLib, GNU LGPLv2.1.
- * 
- * SoCLib 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
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with SoCLib; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- * 
- * SOCLIB_LGPL_HEADER_END
+ * Copyright (c) UPMC, Lip6, Asim
+ *      copy of the soclib exception file, original writer:
+ *          Nicolas Pouillon <nipo@ssji.net>, 2007
+ *      modified by:
+ *         Mohamed Lamine Karaoui <Mohamed.Karaoui@lip6.fr>, 2012
  *
- * Copyright (c) UPMC, Lip6, Asim
- *         Nicolas Pouillon <nipo@ssji.net>, 2007
- *
- * Maintainers: nipo
  */
 
-#ifndef SOCLIB_EXCEPTION_H_
-#define SOCLIB_EXCEPTION_H_
+#ifndef _EXCEPTION_H_
+#define _EXCEPTION_H_
 
 #include <exception>
@@ -34 +16 @@
 #include <iostream>
 
-namespace soclib { namespace exception {
+namespace exception {
 
 class Exception
@@ -96 +78 @@
 };
 
-}}
+}
 
 #endif /* SOCLIB_EXCEPTION_H_ */

soft/giet_vm/memo/include/libelfpp/elfpp/elfpp_section.hh

@@ -110 +110 @@
 
     /** @this sets pointer to section content buffer */
-    inline void set_content(void* a);
+    void set_content(void* a);
     /** @this gets pointer to section content buffer */
     inline uint8_t *get_content() const;

soft/giet_vm/memo/include/libelfpp/elfpp/elfpp_section.hxx

@@ -23 +23 @@
 
 #include <stdexcept>
+
 
 namespace elfpp
@@ -130 +131 @@
   }
   
-  void section::set_content(void* a)
-  {
-    content_ = (uint8_t*) a;
-  }
-
   uint8_t * section::get_content() const
   {

soft/giet_vm/memo/include/memo.h

@@ -71 +71 @@
     elfpp::object* m_generator;//TODO:delete
 
-    void* load_bin(std::string name);
+    size_t load_bin(std::string filename, void* buffer);    
+    size_t bin_size(std::string filename);
+
     elfpp::section* get_sect_by_addr(elfpp::object *loader, unsigned int addr);
     elfpp::section* get_sect_by_name(elfpp::object *loader, std::string name);