Changeset 61e6c39 in mainline

Timestamp:

2005-12-05T17:56:23Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

eef75f6

Parents:

4457455

Message:

Buddy allocator cleanup and fixes II.

• Rewrite IS_BUDDY_LEFT_BLOCK so that it does not need floating point on some architectures (e.g. IA-64).
• Get rid of IS_BUDDY_RIGHT_BLOCK.
• Make sparc64 use zone_create_in_region.

Files:

• arch/sparc64/src/mm/frame.c (modified) (1 diff)
• generic/include/mm/frame.h (modified) (1 diff)
• generic/src/mm/frame.c (modified) (1 diff)

arch/sparc64/src/mm/frame.c

@@ -30 +30 @@
 #include <mm/frame.h>
 #include <config.h>
-#include <panic.h>
 
 void frame_arch_init(void)
 {
-        zone_t *z;
-        
-        z = zone_create(0, config.memory_size, 0);
-        if (!z) {
-                panic("Can't allocate zone (%dB).\n", config.memory_size);
-        }
-        zone_attach(z);
+        zone_create_in_region(0, config.memory_size & ~(FRAME_SIZE - 1));
 }

generic/include/mm/frame.h

@@ -42 +42 @@
 #define FRAME2ADDR(zone, frame)                 ((zone)->base + ((frame) - (zone)->frames) * FRAME_SIZE)
 #define ADDR2FRAME(zone, addr)                  (&((zone)->frames[((addr) - (zone)->base) / FRAME_SIZE]))
-#define FRAME_INDEX(zone, frame)                ((count_t)((frame) - (zone)->frames))
+#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)) % (1 << ((frame)->buddy_order + 1))) == 0)
-#define IS_BUDDY_RIGHT_BLOCK(zone, frame)       ((FRAME_INDEX((zone), (frame)) % (1 << ((frame)->buddy_order + 1))) == (1 << (frame)->buddy_order))
+#define IS_BUDDY_LEFT_BLOCK(zone, frame)        ((FRAME_INDEX((zone), (frame)) & ~(((__native) -1)<<((frame)->buddy_order + 1))) == 0)
 
 #define ZONE_BLACKLIST_SIZE     3

generic/src/mm/frame.c

@@ -389 +389 @@
 
         is_left = IS_BUDDY_LEFT_BLOCK(zone, frame);
-        is_right = IS_BUDDY_RIGHT_BLOCK(zone, frame);
-        
-        ASSERT((is_left || is_right) && (!is_left || !is_right));
+        is_right = !is_left;
         
         /*