Changeset 195 for soft

Timestamp:

Aug 7, 2012, 7:14:08 PM (12 years ago)

Author:

alain

Message:

Fixing memo

Location:

soft/giet_vm

Files:

• libs/mwmr_channel.c (modified) (2 diffs)
• memo/src/memo.cpp (modified) (1 diff)
• sys/vm_handler.h (modified) (1 diff)

soft/giet_vm/libs/mwmr_channel.c

@@ -87 +87 @@
     if(nitems == 0) return;
 
-    // address virtuelle 0 is illegal...
-    assert(buffer && "mwmr read: Empty buffer");
-
     while(1)
     {
@@ -164 +161 @@
     if(nitems == 0) return;
 
-    // address virtuelle 0 is illegal...
-    assert(buffer && "mwmr read: Empty buffer");
-
     while(1)
     {

soft/giet_vm/memo/src/memo.cpp

@@ -261 +261 @@
               << " + clusters  = " << header->clusters  << std::endl
               << " + psegs     = " << header->psegs     << std::endl
-              << " + ttys      = " << header->ttys      << std::endl
-              << " + fbs       = " << header->fbs       << std::endl
               << " + vspaces   = " << header->vspaces   << std::endl
               << " + globals   = " << header->globals   << std::endl

soft/giet_vm/sys/vm_handler.h

@@ -53 +53 @@
 typedef struct PageTable 
 {
-        unsigned int    pt1[PT1_SIZE/4];                      // PT1 (index is ix1)
-        unsigned int    pt2[GIET_NB_PT2_MAX][PT2_SIZE/4];     // PT2s (index is 2*ix2)
+        unsigned int    pt1[PT1_SIZE/4];                    // PT1 (index is ix1)
+        unsigned int    pt2[1][PT2_SIZE/4];                 // PT2s (index is 2*ix2)
 } page_table_t;