Rev 4581 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 4581 | Rev 4718 | ||
---|---|---|---|
Line 50... | Line 50... | ||
50 | #include <ipc/ipc.h> |
50 | #include <ipc/ipc.h> |
51 | #include <async.h> |
51 | #include <async.h> |
52 | #include <as.h> |
52 | #include <as.h> |
53 | #include <loader/pcb.h> |
53 | #include <loader/pcb.h> |
54 | 54 | ||
55 | extern char _heap; |
- | |
56 | extern int main(int argc, char *argv[]); |
55 | extern int main(int argc, char *argv[]); |
57 | 56 | ||
58 | int _errno; |
- | |
59 | - | ||
60 | void _exit(int status) |
57 | void _exit(int status) |
61 | { |
58 | { |
62 | thread_exit(status); |
59 | thread_exit(status); |
63 | } |
60 | } |
64 | 61 | ||
65 | void __main(void *pcb_ptr) |
62 | void __main(void *pcb_ptr) |
66 | { |
63 | { |
67 | (void) as_area_create(&_heap, 1, AS_AREA_WRITE | AS_AREA_READ); |
64 | int retval; |
68 | 65 | ||
- | 66 | __heap_init(); |
|
69 | _async_init(); |
67 | __async_init(); |
70 | fibril_t *fibril = fibril_setup(); |
68 | fibril_t *fibril = fibril_setup(); |
71 | __tcb_set(fibril->tcb); |
69 | __tcb_set(fibril->tcb); |
72 | 70 | ||
73 | /* Save the PCB pointer */ |
71 | /* Save the PCB pointer */ |
74 | __pcb = (pcb_t *) pcb_ptr; |
72 | __pcb = (pcb_t *) pcb_ptr; |
Line 77... | Line 75... | ||
77 | char **argv; |
75 | char **argv; |
78 | 76 | ||
79 | if (__pcb == NULL) { |
77 | if (__pcb == NULL) { |
80 | argc = 0; |
78 | argc = 0; |
81 | argv = NULL; |
79 | argv = NULL; |
82 | stdio_init(0, NULL); |
80 | __stdio_init(0, NULL); |
83 | } else { |
81 | } else { |
84 | argc = __pcb->argc; |
82 | argc = __pcb->argc; |
85 | argv = __pcb->argv; |
83 | argv = __pcb->argv; |
86 | stdio_init(__pcb->filc, __pcb->filv); |
84 | __stdio_init(__pcb->filc, __pcb->filv); |
87 | } |
85 | } |
88 | 86 | ||
89 | main(argc, argv); |
87 | retval = main(argc, argv); |
- | 88 | ||
90 | stdio_done(); |
89 | __stdio_done(); |
- | 90 | (void) task_retval(retval); |
|
91 | } |
91 | } |
92 | 92 | ||
93 | void __exit(void) |
93 | void __exit(void) |
94 | { |
94 | { |
95 | fibril_teardown(__tcb_get()->fibril_data); |
95 | fibril_teardown(__tcb_get()->fibril_data); |