Changeset 6f4495f5 in mainline for kernel/generic/src/main/main.c
- Timestamp:
- 2007-01-27T17:32:13Z (18 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 1ba41c5
- Parents:
- 51baa8a
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/generic/src/main/main.c
r51baa8a r6f4495f5 147 147 148 148 config.kernel_size = ALIGN_UP(hardcoded_ktext_size + 149 149 hardcoded_kdata_size, PAGE_SIZE); 150 150 config.stack_size = CONFIG_STACK_SIZE; 151 151 … … 157 157 for (i = 0; i < init.cnt; i++) { 158 158 if (PA_overlaps(config.stack_base, config.stack_size, 159 159 init.tasks[i].addr, init.tasks[i].size)) 160 160 config.stack_base = ALIGN_UP(init.tasks[i].addr + 161 161 init.tasks[i].size, config.stack_size); 162 162 } 163 163 … … 165 165 if (ballocs.size) { 166 166 if (PA_overlaps(config.stack_base, config.stack_size, 167 167 ballocs.base, ballocs.size)) 168 168 config.stack_base = ALIGN_UP(ballocs.base + 169 169 ballocs.size, PAGE_SIZE); 170 170 } 171 171 … … 175 175 context_save(&ctx); 176 176 context_set(&ctx, FADDR(main_bsp_separated_stack), config.stack_base, 177 177 THREAD_STACK_SIZE); 178 178 context_restore(&ctx); 179 179 /* not reached */ … … 223 223 version_print(); 224 224 printf("kernel: %.*p hardcoded_ktext_size=%zdK, " 225 226 config.base, hardcoded_ktext_size >> 10, hardcoded_kdata_size >>227 225 "hardcoded_kdata_size=%zdK\n", sizeof(uintptr_t) * 2, 226 config.base, hardcoded_ktext_size >> 10, 227 hardcoded_kdata_size >> 10); 228 228 printf("stack: %.*p size=%zdK\n", sizeof(uintptr_t) * 2, 229 229 config.stack_base, config.stack_size >> 10); 230 230 231 231 arch_pre_smp_init(); … … 250 250 for (i = 0; i < init.cnt; i++) 251 251 printf("init[%zd].addr=%.*p, init[%zd].size=%zd\n", i, 252 253 252 sizeof(uintptr_t) * 2, init.tasks[i].addr, i, 253 init.tasks[i].size); 254 254 } else 255 255 printf("No init binaries found\n"); … … 324 324 */ 325 325 context_set(&CPU->saved_context, FADDR(main_ap_separated_stack), 326 326 (uintptr_t) CPU->stack, CPU_STACK_SIZE); 327 327 context_restore(&CPU->saved_context); 328 328 /* not reached */
Note:
See TracChangeset
for help on using the changeset viewer.