Changeset 2d43f3e in mainline for generic

Timestamp:

2006-02-02T15:04:41Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

bc504ef2

Parents:

a294ad0

Message:

Modify frame.h to use shifting instead of multiplication and division.
Define FRAME_WIDTH for all architectures.

Location:

generic

Files:

• include/mm/frame.h (modified) (1 diff)
• src/mm/slab.c (modified) (3 diffs)

generic/include/mm/frame.h

@@ -49 +49 @@
 #define FRAME_ERROR             2       /* frame_alloc return status */
 
-#define FRAME2ADDR(zone, frame)                 ((zone)->base + ((frame) - (zone)->frames) * FRAME_SIZE)
-#define ADDR2FRAME(zone, addr)                  (&((zone)->frames[((addr) - (zone)->base) / FRAME_SIZE]))
+#define FRAME2ADDR(zone, frame)                 ((zone)->base + (((frame) - (zone)->frames) << FRAME_WIDTH))
+#define ADDR2FRAME(zone, addr)                  (&((zone)->frames[(((addr) - (zone)->base) >> FRAME_WIDTH)]))
 #define FRAME_INDEX(zone, frame)                ((index_t)((frame) - (zone)->frames))
 #define FRAME_INDEX_ABS(zone, frame)            (((index_t)((frame) - (zone)->frames)) + (zone)->base_index)

generic/src/mm/slab.c

@@ -87 +87 @@
 
         /* Fill in slab structures */
-        /* TODO: some better way of accessing the frame, although 
-         * the optimizer might optimize the division out :-/ */
+        /* TODO: some better way of accessing the frame */
         for (i=0; i< (1<<cache->order); i++) {
                 ADDR2FRAME(zone, (__address)(data+i*PAGE_SIZE))->parent = slab;
@@ -145 +144 @@
                 slab = obj2slab(obj);
 
-        spinlock_lock(cache->lock);
+        spinlock_lock(&cache->lock);
 
         *((int *)obj) = slab->nextavail;
@@ -166 +165 @@
         }
 
-        spinlock_unlock(cache->lock);
+        spinlock_unlock(&cache->lock);
 
         return frames;