Index: uspace/lib/libc/include/as.h =================================================================== --- uspace/lib/libc/include/as.h (revision 1c03c17200abbb4be0af6280a56da5df849938f2) +++ uspace/lib/libc/include/as.h (revision 46d8eb9b258c351fc7a0ec7a45162776b8adc3a2) @@ -43,4 +43,5 @@ extern void *as_area_create(void *address, size_t size, int flags); extern int as_area_resize(void *address, size_t size, int flags); +extern int as_area_change_flags(void *address, int flags); extern int as_area_destroy(void *address); extern void *set_maxheapsize(size_t mhs); Index: uspace/lib/libc/include/io/stream.h =================================================================== --- uspace/lib/libc/include/io/stream.h (revision 1c03c17200abbb4be0af6280a56da5df849938f2) +++ uspace/lib/libc/include/io/stream.h (revision 46d8eb9b258c351fc7a0ec7a45162776b8adc3a2) @@ -41,4 +41,5 @@ extern void open_console(void); +extern void close_console(void); extern void klog_update(void); Index: uspace/lib/libc/include/ipc/loader.h =================================================================== --- uspace/lib/libc/include/ipc/loader.h (revision 46d8eb9b258c351fc7a0ec7a45162776b8adc3a2) +++ uspace/lib/libc/include/ipc/loader.h (revision 46d8eb9b258c351fc7a0ec7a45162776b8adc3a2) @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2008 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcipc + * @{ + */ +/** @file + */ + +#ifndef LIBC_LOADER_H_ +#define LIBC_LOADER_H_ + +#include + +typedef enum { + LOADER_HELLO = IPC_FIRST_USER_METHOD, + LOADER_SET_PATHNAME, + LOADER_SET_ARGS, + LOADER_RUN +} fb_request_t; + +#endif + +/** @} + */ Index: uspace/lib/libc/include/libc.h =================================================================== --- uspace/lib/libc/include/libc.h (revision 1c03c17200abbb4be0af6280a56da5df849938f2) +++ uspace/lib/libc/include/libc.h (revision 46d8eb9b258c351fc7a0ec7a45162776b8adc3a2) @@ -49,5 +49,5 @@ __syscall(p1, p2, p3, p4, p5, p6,id) -extern void __main(void); +extern void __main(void *pcb_ptr); extern void __exit(void); Index: uspace/lib/libc/include/loader/pcb.h =================================================================== --- uspace/lib/libc/include/loader/pcb.h (revision 46d8eb9b258c351fc7a0ec7a45162776b8adc3a2) +++ uspace/lib/libc/include/loader/pcb.h (revision 46d8eb9b258c351fc7a0ec7a45162776b8adc3a2) @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2008 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup fs + * @{ + */ +/** @file + * @brief Program Control Block interface. + */ + +#ifndef LIBC_PCB_H_ +#define LIBC_PCB_H_ + +#include + +typedef void (*entry_point_t)(void); + +/** + * Holds pointers to data passed from the program loader to the program + * and/or to the dynamic linker. This includes the program entry point, + * arguments, environment variables etc. + */ +typedef struct { + /** Program entry point */ + entry_point_t entry; + + /** Number of command-line arguments */ + int argc; + /** Command-line arguments */ + char **argv; + + /* + * ELF-specific data + */ + /** Pointer to ELF dynamic section of the program */ + void *dynamic; + /** Pointer to dynamic section of the runtime linker */ + void *rtld_dynamic; + /** Runtime-linker load bias */ + uintptr_t rtld_bias; +} pcb_t; + +extern pcb_t *__pcb; + +#endif + +/** + * @} + */ Index: uspace/lib/libc/include/smc.h =================================================================== --- uspace/lib/libc/include/smc.h (revision 46d8eb9b258c351fc7a0ec7a45162776b8adc3a2) +++ uspace/lib/libc/include/smc.h (revision 46d8eb9b258c351fc7a0ec7a45162776b8adc3a2) @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2008 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_SMC_H_ +#define LIBC_SMC_H_ + +#include + +extern int smc_coherence(void *address, size_t size); + +#endif + +/** @} + */ Index: uspace/lib/libc/include/task.h =================================================================== --- uspace/lib/libc/include/task.h (revision 1c03c17200abbb4be0af6280a56da5df849938f2) +++ uspace/lib/libc/include/task.h (revision 46d8eb9b258c351fc7a0ec7a45162776b8adc3a2) @@ -41,5 +41,5 @@ extern task_id_t task_get_id(void); -extern int task_spawn(void *image, size_t size); +extern task_id_t task_spawn(const char *path, const char *argv[]); #endif