Changeset 394 for trunk

Timestamp:

Aug 17, 2017, 11:06:38 AM (7 years ago)

Author:

max@…

Message:

Make it compile again, and use panic(). Not sure it is what Alain
meant to do.

Location:

trunk/kernel/mm

Files:

• kmem.c (modified) (1 diff)
• vmm.c (modified) (5 diffs)
• vmm.h (modified) (1 diff)
• vseg.c (modified) (1 diff)

trunk/kernel/mm/kmem.c

@@ -268 +268 @@
         if( req->type >= KMEM_TYPES_NR )
         {
-                printk("\n[PANIC] in %s : illegal request type\n", __FUNCTION__ );
-                hal_core_sleep();
+                panic("illegal request type");
         }
 

trunk/kernel/mm/vmm.c

@@ -698 +698 @@
         else if( vseg->min == addr_min )                              // vseg must be resized
     {
-        printk("\n[PANIC] in %s : resize not implemented yet\n", __FUNCTION__ );
-        hal_core_sleep();
+        panic("resize not implemented yet");
                 error = 0;
     }
         else if( vseg->max == addr_max )                              // vseg must be resized
     {
-        printk("\n[PANIC] in %s : resize not implemented yet\n", __FUNCTION__ );
-        hal_core_sleep();
+        panic("resize not implemented yet");
                 error = 0;
     }
     else            // vseg cut in three regions => vseg must be resized & new vseg created
     {
-        printk("\n[PANIC] in %s : resize not implemented yet\n", __FUNCTION__ );
-        hal_core_sleep();
+        panic("resize not implemented yet");
                 error = 0;
     }
@@ -723 +720 @@
 ///////////////////////////////////////////
 error_t  vmm_get_vseg( process_t * process,
-                       intptr_t    vaddr
+                       intptr_t    vaddr,
                        vseg_t   ** found_vseg )
 {
@@ -755 +752 @@
         xptr_t   vseg_xp;
         error_t  error;
-        rpc_vmm_get_vseg_client( ref_cxy , ref_ptr , bad_vaddr , &vseg_xp , &error );
+        rpc_vmm_get_vseg_client( ref_cxy , ref_ptr , vaddr , &vseg_xp , &error );
             
         if( error )   return -1;       // vseg not found => illegal user vaddr 
@@ -775 +772 @@
     // success
     *found_vseg = vseg;
-    return O;
+    return 0;
 
 }  // end vmm_get_vseg()
@@ -972 +969 @@
     {
         // 1. get vseg pointer
-        vseg = vmm_get_vseg( process , vpn<<CONFIG_PPM_PAGE_SHIFT );
-
-        if( vseg == NULL )
+        error = vmm_get_vseg( process , vpn<<CONFIG_PPM_PAGE_SHIFT , &vseg );
+
+        if( error )
         {
             printk("\n[ERROR] in %s : out of segment / process = %x / vpn = %x\n",

trunk/kernel/mm/vmm.h

@@ -277 +277 @@
 error_t vmm_get_vseg( struct process_s  * process,
                       intptr_t            vaddr,
-                      vseg_t            * vseg );            
+                      vseg_t           ** vseg );            
 
 /*********************************************************************************************

trunk/kernel/mm/vseg.c

@@ -164 +164 @@
     else
     {
-            printk("\n[PANIC] in %s : illegal vseg type\n", __FUNCTION__);
-        hal_core_sleep();
+            panic("illegal vseg type");
     }