Subversion Repositories HelenOS-historic

Compare Revisions

Ignore whitespace Rev 755 → Rev 756

/kernel/trunk/generic/src/main/kinit.c
147,7 → 147,7
if (KA2PA(config.init_addr) % FRAME_SIZE)
panic("config.init_addr is not frame aligned");
as = as_create(NULL, 0);
as = as_create(0);
if (!as)
panic("as_create\n");
u = task_create(as);
158,7 → 158,7
panic("thread_create\n");
/*
* Create the text as_area and copy the userspace code there.
* Create the text as_area and initialize its mapping.
*/
frame = KA2PA(config.init_addr);
169,7 → 169,10
a = as_area_create(as, AS_AREA_TEXT, frames, UTEXT_ADDRESS);
if (!a)
panic("as_area_create: text\n");
 
for (i = 0; i < frames; i++)
as_set_mapping(as, UTEXT_ADDRESS + i * PAGE_SIZE, frame + i * FRAME_SIZE);
 
/*
* Create the data as_area.
*/
177,13 → 180,6
if (!a)
panic("as_area_create: stack\n");
 
/*
* Initialize text area mapping.
*/
for (i = 0; i < frames; i++)
as_set_mapping(as, UTEXT_ADDRESS + i * PAGE_SIZE, frame + i * FRAME_SIZE);
 
thread_ready(t);
}
 
/kernel/trunk/generic/src/main/main.c
138,7 → 138,6
*/
void main_bsp_separated_stack(void)
{
as_t *as;
task_t *k;
thread_t *t;
151,7 → 150,8
*/
kconsole_init();
 
/* Exception handler initialization, before architecture
/*
* Exception handler initialization, before architecture
* starts adding its own handlers
*/
exc_init();
162,6 → 162,7
arch_pre_mm_init();
early_heap_init(config.heap_addr, config.heap_size + config.heap_delta);
frame_init();
as_init();
page_init();
tlb_init();
arch_post_mm_init();
189,16 → 190,9
printf("config.init_addr=%X, config.init_size=%d\n", config.init_addr, config.init_size);
 
/*
* Create kernel address space.
*/
as = as_create(GET_PTL0_ADDRESS(), FLAG_AS_KERNEL);
if (!as)
panic("can't create kernel address space\n");
 
/*
* Create kernel task.
*/
k = task_create(as);
k = task_create(AS_KERNEL);
if (!k)
panic("can't create kernel task\n");