Changeset b52da8d7 in mainline for src/main/main.c

Timestamp:

2005-08-29T11:57:26Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c245372b

Parents:

229d5fc1

Message:

Add some comments to IA-32 src/boot/boot.S and src/smp.S.

Make the boot stack start on page boundary.
This is required by get_stack_base().

Define 'THE' macro.

Implement preemption_disable() and preemption_enable().

Add memory barrier macros.
IA-32 macros need support for older processors.
Non IA-32 macros are dummy.

Reduction of many #include paths.

File:

• src/main/main.c (modified) (1 diff)

src/main/main.c

@@ -98 +98 @@
         config.cpu_count = 1;
         config.cpu_active = 1;
+        size_t size, delta;
+
+        /*
+         * Calculate 'size' that kernel and heap occupies in memory.
+         */
+        size = hardcoded_ktext_size + hardcoded_kdata_size + CONFIG_HEAP_SIZE;   
+         
+        /*
+         * We need the boot stack to start on page boundary.
+         * That is why 'delta' is calculated.
+         */
+        delta = PAGE_SIZE - ((hardcoded_load_address + size) % PAGE_SIZE);
+        delta = (delta == PAGE_SIZE) ? 0 : delta;
+        
+        size += delta;
 
         config.base = hardcoded_load_address;
         config.memory_size = get_memory_size();
-        config.kernel_size = hardcoded_ktext_size + hardcoded_kdata_size + CONFIG_HEAP_SIZE + CONFIG_STACK_SIZE;
+        config.kernel_size = size + CONFIG_STACK_SIZE;
 
         context_save(&ctx);
-        context_set(&ctx, FADDR(main_bsp_separated_stack), config.base + hardcoded_ktext_size + hardcoded_kdata_size + CONFIG_HEAP_SIZE, CONFIG_STACK_SIZE);
+        context_set(&ctx, FADDR(main_bsp_separated_stack), config.base + size, CONFIG_STACK_SIZE);
         context_restore(&ctx);
         /* not reached */