Changeset 185 for soft

Timestamp:

Jul 29, 2012, 10:26:17 AM (12 years ago)

Author:

karaoui

Message:

removing some bugs

Location:

soft/giet_vm

Files:

• map.xml (modified) (1 diff)
• sys/kernel_init.c (modified) (10 diffs)

soft/giet_vm/map.xml

@@ -4 +4 @@
                 name     = "c1_v2_G12"
                 clusters = "1"
-                psegs    = "9"
                 ttys     = "8"
                 fbs      = "1"

soft/giet_vm/sys/kernel_init.c

@@ -184 +184 @@
 
 #if INIT_DEBUG_CTX
-_puts("[INIT] --- vobjs initialisation in vspace "); 
+_puts("[INIT] --- ptabs initialisation in vspace "); 
 _puts(vspace[vspace_id].name);
 _puts("\n");
@@ -223 +223 @@
     }
         
-    _puts("\n[INIT] Ptabss initialisation completed at cycle : ");
+    _puts("\n[INIT] Ptabs initialisation completed at cycle : ");
     _putw( _proctime() );
     _puts("\n");
@@ -246 +246 @@
     for ( vspace_id = 0 ; vspace_id < header->vspaces ; vspace_id++ )
     {
-        char ptab_found = 0;
 
 #if INIT_DEBUG_CTX
@@ -253 +252 @@
 _puts("\n");
 #endif
-        // loop on the vobjs and get the ptpr
-            for(vobj_id= vspace[vspace_id].vobj_offset; 
-                        vobj_id < (vspace[vspace_id].vobj_offset+ vspace[vspace_id].vobjs);
-                        vobj_id++)
-            {
-            if(vobj[vobj_id].type == VOBJ_TYPE_PTAB)
-            {
-                if( ptab_found )
-                {
-                    _puts("\n[INIT ERROR] Only one PTAB for by vspace ");
-                    _putw( vspace_id );
-                    _exit();
-                }
-
-                ptab_found = 1;
-                _kernel_ptabs_paddr[vspace_id] = vobj[vobj_id].paddr;
-                _kernel_ptabs_vaddr[vspace_id] = vobj[vobj_id].vaddr;
-
-#if INIT_DEBUG_CTX
-_puts("[INIT]   PTAB address = "); 
-_putw(_kernel_ptabs_paddr[vspace_id]); 
-_puts("\n");
-#endif
-            }
-
-        }
-
-        if( !ptab_found )
-        {
-            _puts("\n[INIT ERROR] Missing PTAB for vspace ");
-            _putw( vspace_id );
-            _exit();
-        }
-        
         /** Set the current vspace ptpr to initialise the vobjs */
                 _set_ptpr(vspace_id);
@@ -312 +277 @@
 #if INIT_DEBUG_CTX
 _puts("[INIT]   MWMR channel ");
-_puts( vobj->name);
+_puts( vobj[vobj_id].name);
 _puts(" / depth = ");
 _putw( mwmr->depth );
@@ -324 +289 @@
 #if INIT_DEBUG_CTX
 _puts("[INIT]   ELF section "); 
-_puts( vobj->name);
+_puts( vobj[vobj_id].name);
 _puts(" / length = ");
-_putw( vobj->length ); 
+_putw( vobj[vobj_id].length ); 
 _puts("\n");
 #endif
@@ -338 +303 @@
 #if INIT_DEBUG_CTX
 _puts("   BARRIER "); 
-_puts( vobj->name);
+_puts( vobj[vobj_id].name);
 _puts(" / init_value = ");
 _putw( barrier->init );
@@ -351 +316 @@
 #if INIT_DEBUG_CTX
 _puts("   LOCK "); 
-_puts( vobj->name);
+_puts( vobj[vobj_id].name);
 _puts("\n");
 #endif
@@ -361 +326 @@
 #if INIT_DEBUG_CTX
 _puts("   BUFFER "); 
-_puts( vobj->name);
+_puts( vobj[vobj_id].name);
 _puts(" / length = ");
-_putw( vobj->length ); 
+_putw( vobj[vobj_id].length ); 
 _puts("\n");
 #endif
@@ -371 +336 @@
                 {
                     _puts("\n[INIT ERROR] illegal vobj of name ");
-                    _puts(vobj->name);
+                    _puts(vobj[vobj_id].name);
                     _puts(" / in vspace = ");
-                    _puts(vobj->name);
+                    _puts(vobj[vobj_id].name);
                     _puts("\n ");
                     _exit();