Changeset b87f418 in mainline for generic/include

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/include

Files:

• align.h (modified) (1 diff)
• mm/frame.h (modified) (1 diff)

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