Changeset b87f418 in mainline for arch

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:

arch

Files:

• ia32/src/mm/frame.c (modified) (1 diff)
• ia64/include/context.h (modified) (2 diffs)
• sparc64/include/context.h (modified) (2 diffs)

arch/ia32/src/mm/frame.c

@@ -58 +58 @@
                         if (e820table[i].type == MEMMAP_MEMORY_AVAILABLE) {
                                 zone_create_in_region(e820table[i].base_address, e820table[i].size & ~(FRAME_SIZE-1));
-                                if (last_frame < ALIGN(e820table[i].base_address + e820table[i].size, FRAME_SIZE))
-                                        last_frame = ALIGN(e820table[i].base_address + e820table[i].size, FRAME_SIZE);
+                                if (last_frame < ALIGN_UP(e820table[i].base_address + e820table[i].size, FRAME_SIZE))
+                                        last_frame = ALIGN_UP(e820table[i].base_address + e820table[i].size, FRAME_SIZE);
                         }                       
                 }

arch/ia64/include/context.h

@@ -41 +41 @@
  * One item is put onto the stack to support get_stack_base().
  */
-#define SP_DELTA        (0+ALIGN(STACK_ITEM_SIZE, STACK_ALIGNMENT))
+#define SP_DELTA        (0+ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT))
 
 #define PFM_MASK        (~0x3fffffffff)
@@ -51 +51 @@
 #define context_set(c, _pc, stack, size)                                                                \
         (c)->pc = (__address) _pc;                                                                      \
-        (c)->bsp = ((__address) stack) + ALIGN(sizeof(the_t), REGISTER_STACK_ALIGNMENT);                \
+        (c)->bsp = ((__address) stack) + ALIGN_UP(sizeof(the_t), REGISTER_STACK_ALIGNMENT);             \
         (c)->ar_pfs &= PFM_MASK;                                                                        \
-        (c)->sp = ((__address) stack) + ALIGN((size), STACK_ALIGNMENT) - SP_DELTA;
+        (c)->sp = ((__address) stack) + ALIGN_UP((size), STACK_ALIGNMENT) - SP_DELTA;
 
 /*

arch/sparc64/include/context.h

@@ -31 +31 @@
 
 #ifndef __sparc64_STACK_H__
-#include <arch/stack.h>
+# include <arch/stack.h>
 #endif
 
@@ -50 +50 @@
 #define context_set(c, _pc, stack, size)                                                                \
         (c)->pc = ((__address) _pc) - 8;                                                                \
-        (c)->sp = ((__address) stack) + ALIGN((size), STACK_ALIGNMENT) - (STACK_BIAS + SP_DELTA);       \
+        (c)->sp = ((__address) stack) + ALIGN_UP((size), STACK_ALIGNMENT) - (STACK_BIAS + SP_DELTA);    \
         (c)->fp = -STACK_BIAS