Changeset e0cdb7b6 in mainline

Timestamp:

2005-10-10T11:15:50Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a016b63

Parents:

ac5665a

Message:

Add ALIGN() macro.

Fix usage of early_mapping() in main.c.
The previous version would not map part of the heap.
Please, review.

Files:

• arch/ia64/include/context.h (modified) (2 diffs)
• include/align.h (added)
• src/main/main.c (modified) (3 diffs)

arch/ia64/include/context.h

@@ -31 +31 @@
 
 #include <arch/types.h>
+#include <align.h>
 
 #define STACK_ITEM_SIZE 16
+#define STACK_ALIGNMENT 16
 
 /*
@@ -46 +48 @@
 #endif
 
-#define context_set(c, _pc, stack, size)                        \
-        (c)->pc = (__address) _pc;                              \
-        (c)->bsp = ((__address) stack) + (sizeof(the_t));       \
+#define context_set(c, _pc, stack, size)                                                \
+        (c)->pc = (__address) _pc;                                                      \
+        (c)->bsp = ((__address) stack) + (ALIGN(sizeof(the_t), STACK_ALIGNMENT));       \
         (c)->sp = ((__address) stack) + (size) - SP_DELTA;
 

src/main/main.c

@@ -38 +38 @@
 #include <main/kinit.h>
 #include <cpu.h>
+#include <align.h>
 
 #ifdef __SMP__
@@ -86 +87 @@
 static size_t heap_size;
 
-/*
- * Extra space on heap to make the stack start on page boundary.
+
+/*
+ * Extra space between heap and stack
+ * enforced by alignment requirements.
  */
 static size_t heap_delta;
@@ -118 +121 @@
 
         heap_size = CONFIG_HEAP_SIZE + (config.memory_size/FRAME_SIZE)*sizeof(frame_t);
-        
-        kernel_size = hardcoded_ktext_size + hardcoded_kdata_size + heap_size;
-        heap_delta = PAGE_SIZE - ((hardcoded_load_address + kernel_size) % PAGE_SIZE);
-        heap_delta = (heap_delta == PAGE_SIZE) ? 0 : heap_delta;
-        kernel_size += heap_delta;
+        kernel_size = ALIGN(hardcoded_ktext_size + hardcoded_kdata_size + heap_size, PAGE_SIZE);
+        heap_delta = kernel_size - (hardcoded_ktext_size + hardcoded_kdata_size + heap_size);
         
         config.kernel_size = kernel_size + CONFIG_STACK_SIZE;
         
         context_save(&ctx);
-        early_mapping(config.base + hardcoded_ktext_size + hardcoded_kdata_size + heap_delta, CONFIG_STACK_SIZE + heap_size);
+        early_mapping(config.base + hardcoded_ktext_size + hardcoded_kdata_size, CONFIG_STACK_SIZE + heap_size + heap_delta);
         context_set(&ctx, FADDR(main_bsp_separated_stack), config.base + kernel_size, CONFIG_STACK_SIZE);
         context_restore(&ctx);