Changeset 255 for soft/giet_vm/memo/include

Timestamp:

Oct 9, 2013, 9:32:41 AM (11 years ago)

Author:

meunier

Message:

• Added a syscall and some user functions to manipulate the Simulation Helper
• Changed the the way the Vseg -> Pseg mapping is made during the boot to better utilize the address space (+ adaptation of the algorithm in memo)
• Fixed a bug in boot_init (vobj_init): the vobj initialization could only be made for the first application (ptpr was not changed)

File:

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

soft/giet_vm/memo/include/pseg.h

@@ -58 +58 @@
 public:
 
+    int32_t     m_align;    // alignment of the first vobj
     bool        m_ident;    // identity mapping required if true
 
@@ -66 +67 @@
     size_t length() const;
     size_t type() const;
-    //void add( VObj& vobj );//add a VObj
 
-    void print( std::ostream &o ) const;
+    void print(std::ostream &o) const;
     friend std::ostream &operator<<( std::ostream &o, const VSeg &s )
     {
@@ -75 +75 @@
     }
 
-    VSeg& operator=( const VSeg &ref );
+    VSeg& operator=(const VSeg &ref);
 
     VSeg();
-    VSeg( const VSeg &ref );
+    VSeg(const VSeg &ref);
     VSeg(std::string&   binaryName, 
          std::string&   name, 
@@ -97 +97 @@
     size_t        m_type;
 
-    paddr_t       m_pageLimit;  // m_lma + m_length aligned on page size 
-    paddr_t       m_nextLma;    // next free base 
-    
-    void confNextLma();         // check m_nextLma is whithin the seg limits
+    static size_t m_pageSize;
 
 public:
@@ -106 +103 @@
     std::vector<VSeg> m_vsegs;
 
-    paddr_t     m_limit;        // m_lma + m_length
-
     const std::string& name() const;
     paddr_t lma() const;
     paddr_t length() const;
     size_t type() const;
-    paddr_t limit() const;
-    paddr_t nextLma() const;
 
     void check() const;
 
     void setName(std::string& name);
-    void setLma( paddr_t lma);
+    void setLma(paddr_t lma);
     void setLength(paddr_t length);
 
-    static paddr_t align( paddr_t toAlign, unsigned alignPow2);
-    static paddr_t pageAlign( paddr_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 void setPageSize(size_t pg) {
+       m_pageSize = pg;
+    }
+    static size_t pageSize() {
+       return m_pageSize;
+    }
 
-    static size_t& pageSize();
+    void add(VSeg& vseg);    //add a VSeg
+    void addIdent(VSeg& vseg);
 
-    void add( VSeg& vseg );    //add a VSeg
-    void addIdent( VSeg& vseg );
 
-    void setNextLma( paddr_t nextLma);
-    void incNextLma( size_t inc);
+    void print(std::ostream &o) const;
 
-    void print( std::ostream &o ) const;
-
-    friend std::ostream &operator<<( std::ostream &o, const PSeg &s )
+    friend std::ostream &operator<<(std::ostream &o, const PSeg &s )
     {
         s.print(o);
         return o;
     }
-    PSeg & operator=( const PSeg &ref );
+    PSeg & operator=(const PSeg &ref);
 
     PSeg();
-    PSeg( const PSeg &ref );
-    PSeg( const std::string &name);
-    PSeg( const paddr_t lma);
-    PSeg( const std::string &name,
-          paddr_t lma,
-          paddr_t length,
-          size_t type);
+    PSeg(const PSeg &ref );
+    PSeg(const std::string &name);
+    PSeg(const std::string &name,
+         paddr_t lma,
+         paddr_t length,
+         size_t type);
     ~PSeg();
 };