Changeset 577 for trunk/kernel/mm

Timestamp:

Oct 5, 2018, 10:54:14 AM (6 years ago)

Author:

alain

Message:

Fix small bugs.

Location:

trunk/kernel/mm

Files:

• kmem.c (modified) (1 diff)
• vmm.c (modified) (4 diffs)

trunk/kernel/mm/kmem.c

@@ -190 +190 @@
         uint32_t    size;    // ln( pages ) if PPM / bytes if KHM / unused if KCM
         void      * ptr;     // memory buffer if KHM or KCM / page descriptor if PPM
-        uint32_t    irq_state;
-
 
         type  = req->type;

trunk/kernel/mm/vmm.c

@@ -29 +29 @@
 #include <hal_gpt.h>
 #include <hal_vmm.h>
+#include <hal_macros.h>
 #include <printk.h>
 #include <memcpy.h>
@@ -46 +47 @@
 #include <kmem.h>
 #include <vmm.h>
-#include <cluster_info.h>
 
 //////////////////////////////////////////////////////////////////////////////////
@@ -1408 +1408 @@
     cxy_t        page_cxy;
     kmem_req_t   req;
-
-    uint32_t     type  = vseg->type;
-    uint32_t     flags = vseg->flags;
+    uint32_t     index;
+
+    uint32_t     type   = vseg->type;
+    uint32_t     flags  = vseg->flags;
+    uint32_t     x_size = LOCAL_CLUSTER->x_size;
+    uint32_t     y_size = LOCAL_CLUSTER->y_size;
 
 // check vseg type
@@ -1417 +1420 @@
     if( flags & VSEG_DISTRIB )    // distributed => cxy depends on vpn LSB
     {
-        uint32_t x_size  = LOCAL_CLUSTER->x_size;
-        uint32_t y_size  = LOCAL_CLUSTER->y_size;
-        uint32_t y_width = LOCAL_CLUSTER->y_width;
-        uint32_t index   = vpn & ((x_size * y_size) - 1);
-        uint32_t x       = index / y_size;
-        uint32_t y       = index % y_size;
-
-        // If the cluster selected from VPN's LSBs is empty, then we select one randomly
-        // cluster_random_select() ensures that its randomly selected cluster is not empty
-        if ( cluster_info_is_active( LOCAL_CLUSTER->cluster_info[x][y] ) == 0 ) {
-            cxy_t cxy = cluster_random_select();
-            x = ( ( cxy >> y_width ) & 0xF);
-            y = ( cxy & 0xF );
+        index    = vpn & ((x_size * y_size) - 1);
+        page_cxy = HAL_CXY_FROM_XY( (index / y_size) , (index % y_size) );
+
+        // If the cluster selected from VPN's LSBs is empty, we select one randomly
+        if ( cluster_is_active( page_cxy ) == false )
+        {
+            page_cxy = cluster_random_select();
         }
-        page_cxy = ( x << y_width ) + y;
-
-//      if ( LOCAL_CLUSTER->valid[x][y] == false ) page_cxy = cluster_random_select();
-
     }
     else                          // other cases => cxy specified in vseg