Changeset b87f418 in mainline for generic

Timestamp:

2005-12-07T23:00:30Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f62355a

Parents:

4acac843

Message:

Send in some improvements.

Location:

generic

Files:

• include/align.h (modified) (1 diff)
• include/mm/frame.h (modified) (1 diff)
• src/main/main.c (modified) (1 diff)
• src/mm/frame.c (modified) (7 diffs)

generic/include/align.h

@@ -30 +30 @@
 #define __ALIGN_H__
 
-#define ALIGN(s, a)     ((s) % (a) ? (((s) / (a)) + 1) * (a) : (s))
+/** Align to the nearest higher address.
+ *
+ * @param s Address or size to be aligned.
+ * @param a Size of alignment.
+ */
+#define ALIGN_UP(s, a)          ((s) % (a) ? (((s) / (a)) + 1) * (a) : (s))
+
+/** Align to the nearest lower address.
+ *
+ * @param s Address or size to be aligned.
+ * @param a Size of alignment.
+ */
+#define ALIGN_DOWN(s, a)        ((s) & ~((a)-1))
 
 #endif

generic/include/mm/frame.h

@@ -46 +46 @@
 #define FRAME_INDEX(zone, frame)                ((index_t)((frame) - (zone)->frames))
 #define FRAME_INDEX_VALID(zone, index)          (((index) >= 0) && ((index) < ((zone)->free_count + (zone)->busy_count)))
-#define IS_BUDDY_LEFT_BLOCK(zone, frame)        ((FRAME_INDEX((zone), (frame)) & ~(((__native) -1)<<((frame)->buddy_order + 1))) == 0)
+#define IS_BUDDY_ORDER_OK(index, order)         ((~(((__native) -1) << (order)) & (index)) == 0)
+#define IS_BUDDY_LEFT_BLOCK(zone, frame)        (((FRAME_INDEX((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 0)
+#define IS_BUDDY_RIGHT_BLOCK(zone, frame)       (((FRAME_INDEX((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 1)
 
 #define ZONE_BLACKLIST_SIZE     3

generic/src/main/main.c

@@ -142 +142 @@
 
         heap_size = CONFIG_HEAP_SIZE + (config.memory_size/FRAME_SIZE)*sizeof(frame_t);
-        kernel_size = ALIGN(hardcoded_ktext_size + hardcoded_kdata_size + heap_size, PAGE_SIZE);
+        kernel_size = ALIGN_UP(hardcoded_ktext_size + hardcoded_kdata_size + heap_size, PAGE_SIZE);
         heap_delta = kernel_size - (hardcoded_ktext_size + hardcoded_kdata_size + heap_size);
         

generic/src/mm/frame.c

@@ -1 +1 @@
 /*
- * Copyright (C) 2001-2004 Jakub Jermar
+ * Copyright (C) 2001-2005 Jakub Jermar
+ * Copyright (C) 2005 Sergey Bondari
  * All rights reserved.
  *
@@ -226 +227 @@
 
         /* Force base to the nearest lower address frame boundary. */
-        base &= ~(FRAME_SIZE - 1);
+        base = ALIGN_DOWN(base, FRAME_SIZE);
         /* Align size to frame boundary. */
-        size = ALIGN(size, FRAME_SIZE);
-
-        ASSERT(zone_blacklist_count <= ZONE_BLACKLIST_SIZE);
+        size = ALIGN_UP(size, FRAME_SIZE);
+
+        ASSERT(index < ZONE_BLACKLIST_SIZE);
         zone_blacklist[index].base = base;
         zone_blacklist[index].size = size;
@@ -285 +286 @@
 
         if (!z) {
-                panic("Cannot allocate zone (%dB).\n", size);
+                panic("Cannot allocate zone (base=%P, size=%d).\n", base, size);
         }
         
@@ -394 +395 @@
         frame_t * frame;
         zone_t * zone;
-        count_t index;
+        index_t index;
         bool is_left, is_right;
 
@@ -400 +401 @@
         zone = (zone_t *) b->data;
         
+        ASSERT(IS_BUDDY_ORDER_OK(FRAME_INDEX(zone, frame), frame->buddy_order));
+        
         is_left = IS_BUDDY_LEFT_BLOCK(zone, frame);
-        is_right = !is_left;
-        
-        /*
-         * test left buddy
-         */
+        is_right = IS_BUDDY_RIGHT_BLOCK(zone, frame);
+        
+        ASSERT(is_left ^ is_right);
+        
         if (is_left) {
                 index = (FRAME_INDEX(zone, frame)) + (1 << frame->buddy_order);
@@ -431 +433 @@
 link_t * zone_buddy_bisect(buddy_system_t *b, link_t * block) {
         frame_t * frame_l, * frame_r;
+
         frame_l = list_get_instance(block, frame_t, buddy_link);
         frame_r = (frame_l + (1 << (frame_l->buddy_order - 1)));
+        
         return &frame_r->buddy_link;
 }
@@ -446 +450 @@
 link_t * zone_buddy_coalesce(buddy_system_t *b, link_t * block_1, link_t * block_2) {
         frame_t * frame1, * frame2;
+        
         frame1 = list_get_instance(block_1, frame_t, buddy_link);
         frame2 = list_get_instance(block_2, frame_t, buddy_link);
+        
         return frame1 < frame2 ? block_1 : block_2;
 }