HelenOS-historicHelenOSHelenOS-doc

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /SPARTAN/trunk/src/ @ 179

  → /SPARTAN/trunk/src/ @ 180

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 179 → Rev 180

/SPARTAN/trunk/src/main/main.c
73,6 → 73,16
size_t hardcoded_ktext_size = 0;
size_t hardcoded_kdata_size = 0;
/*
* Size of memory in bytes taken by kernel and heap.
*/
static size_t kernel_size;
/*
* Extra space on heap to make the stack start on page boundary.
*/
static size_t heap_delta;
void main_bsp(void);
void main_ap(void);
85,7 → 95,6
static void main_bsp_separated_stack(void);
static void main_ap_separated_stack(void);
/** Bootstrap CPU main kernel routine
*
* Initializes the kernel by bootstrap CPU.
97,28 → 106,18
{
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;
kernel_size = hardcoded_ktext_size + hardcoded_kdata_size + CONFIG_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;
config.base = hardcoded_load_address;
config.memory_size = get_memory_size();
config.kernel_size = size + CONFIG_STACK_SIZE;
config.kernel_size = kernel_size + CONFIG_STACK_SIZE;
context_save(&ctx);
context_set(&ctx, FADDR(main_bsp_separated_stack), config.base + size, CONFIG_STACK_SIZE);
context_set(&ctx, FADDR(main_bsp_separated_stack), config.base + kernel_size, CONFIG_STACK_SIZE);
context_restore(&ctx);
/* not reached */
}
135,9 → 134,13
task_t *k;
thread_t *t;
THE->preemption_disabled = 0;
THE->cpu = NULL;
THE->thread = NULL;
THE->task = NULL;
arch_pre_mm_init();
heap_init(config.base + hardcoded_ktext_size + hardcoded_kdata_size, CONFIG_HEAP_SIZE);
heap_init(config.base + hardcoded_ktext_size + hardcoded_kdata_size, CONFIG_HEAP_SIZE + heap_delta);
frame_init();
page_init();
tlb_init();