WebSVN – HelenOS – Path Comparison – / – /branches/network/uspace/lib/ Rev 4153 and /branches/network/uspace/lib/ Rev 4152

Ignore whitespace Rev 4153 → Rev 4152

 /branches/network/uspace/lib/libc/include/ipc/services.h
 ,8 → 30,8
  * @{
  */
 /**
- * @file  services.h
- * @brief List of all known services and their codes.
+ * @file    services.h
+ * @brief   List of all known services and their codes.
  */
 #ifndef LIBIPC_SERVICES_H_
 ,15 → 38,12
 #define LIBIPC_SERVICES_H_
 typedef enum {
-    SERVICE_LOAD = 1,
-    SERVICE_PCI,
+    SERVICE_PCI = 1,
     SERVICE_KEYBOARD,
     SERVICE_VIDEO,
     SERVICE_CONSOLE,
     SERVICE_VFS,
     SERVICE_DEVMAP,
-    SERVICE_FHC,
-    SERVICE_OBIO,
     SERVICE_NETWORKING,
     SERVICE_LO,
     SERVICE_DP8390_ISA,

 /branches/network/uspace/lib/libc/include/ipc/loader.h
 ,19 → 32,17
 /** @file
  */
-#ifndef LIBC_IPC_LOADER_H_
-#define LIBC_IPC_LOADER_H_
+#ifndef LIBC_LOADER_H_
+#define LIBC_LOADER_H_
 #include <ipc/ipc.h>
 typedef enum {
     LOADER_HELLO = IPC_FIRST_USER_METHOD,
-    LOADER_GET_TASKID,
     LOADER_SET_PATHNAME,
     LOADER_SET_ARGS,
-    LOADER_LOAD,
     LOADER_RUN
-} loader_request_t;
+} fb_request_t;
 #endif

 /branches/network/uspace/lib/libc/include/ipc/ipc.h
 ,7 → 47,8
 } ipc_call_t;
 typedef sysarg_t ipc_callid_t;
-typedef void (* ipc_async_callback_t)(void *, int, ipc_call_t *);
+typedef void (* ipc_async_callback_t)(void *private, int retval,
+    ipc_call_t *data);
 /*
  * User-friendly wrappers for ipc_call_sync_fast() and ipc_call_sync_slow().
 ,20 → 173,22
     ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), \
         (arg4), (arg5), (res1), (res2), (res3), (res4), (res5))
-extern int ipc_call_sync_fast(int, ipcarg_t, ipcarg_t, ipcarg_t, ipcarg_t,
-    ipcarg_t *, ipcarg_t *, ipcarg_t *, ipcarg_t *, ipcarg_t *);
+extern int ipc_call_sync_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
+    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t *result1, ipcarg_t *result2,
+    ipcarg_t *result3, ipcarg_t *result4, ipcarg_t *result5);
-extern int ipc_call_sync_slow(int, ipcarg_t, ipcarg_t, ipcarg_t, ipcarg_t,
-    ipcarg_t, ipcarg_t, ipcarg_t *, ipcarg_t *, ipcarg_t *, ipcarg_t *,
-    ipcarg_t *);
+extern int ipc_call_sync_slow(int phoneid, ipcarg_t method, ipcarg_t arg1,
+    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5,
+    ipcarg_t *result1, ipcarg_t *result2, ipcarg_t *result3, ipcarg_t *result4,
+    ipcarg_t *result5);
-extern ipc_callid_t ipc_wait_cycle(ipc_call_t *, uint32_t, int);
-extern ipc_callid_t ipc_wait_for_call_timeout(ipc_call_t *, uint32_t);
+extern ipc_callid_t ipc_wait_cycle(ipc_call_t *call, uint32_t usec, int flags);
+extern ipc_callid_t ipc_wait_for_call_timeout(ipc_call_t *data, uint32_t usec);
 static inline ipc_callid_t ipc_wait_for_call(ipc_call_t *data)
 {
     return ipc_wait_for_call_timeout(data, SYNCH_NO_TIMEOUT);
 }
-extern ipc_callid_t ipc_trywait_for_call(ipc_call_t *);
+extern ipc_callid_t ipc_trywait_for_call(ipc_call_t *data);
 /*
  * User-friendly wrappers for ipc_answer_fast() and ipc_answer_slow().
 ,10 → 209,10
 #define ipc_answer_5(callid, retval, arg1, arg2, arg3, arg4, arg5) \
     ipc_answer_slow((callid), (retval), (arg1), (arg2), (arg3), (arg4), (arg5))
-extern ipcarg_t ipc_answer_fast(ipc_callid_t, ipcarg_t, ipcarg_t, ipcarg_t,
-    ipcarg_t, ipcarg_t);
-extern ipcarg_t ipc_answer_slow(ipc_callid_t, ipcarg_t, ipcarg_t, ipcarg_t,
-    ipcarg_t, ipcarg_t, ipcarg_t);
+extern ipcarg_t ipc_answer_fast(ipc_callid_t callid, ipcarg_t retval,
+    ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4);
+extern ipcarg_t ipc_answer_slow(ipc_callid_t callid, ipcarg_t retval,
+    ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5);
 /*
  * User-friendly wrappers for ipc_call_async_fast() and ipc_call_async_slow().
 ,7 → 220,8
  * arguments. The macros decide between the fast and the slow version according
  * to m.
  */
-#define ipc_call_async_0(phoneid, method, private, callback, can_preempt) \
+#define ipc_call_async_0(phoneid, method, private, callback, \
+    can_preempt) \
     ipc_call_async_fast((phoneid), (method), 0, 0, 0, 0, (private), \
         (callback), (can_preempt))
 #define ipc_call_async_1(phoneid, method, arg1, private, callback, \
 ,24 → 245,23
     ipc_call_async_slow((phoneid), (method), (arg1), (arg2), (arg3), \
         (arg4), (arg5), (private), (callback), (can_preempt))
-extern void ipc_call_async_fast(int, ipcarg_t, ipcarg_t, ipcarg_t, ipcarg_t,
-    ipcarg_t, void *, ipc_async_callback_t, int);
-extern void ipc_call_async_slow(int, ipcarg_t, ipcarg_t, ipcarg_t, ipcarg_t,
-    ipcarg_t, ipcarg_t, void *, ipc_async_callback_t, int);
+extern void ipc_call_async_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
+    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, void *private,
+    ipc_async_callback_t callback, int can_preempt);
+extern void ipc_call_async_slow(int phoneid, ipcarg_t method, ipcarg_t arg1,
+    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5, void *private,
+    ipc_async_callback_t callback, int can_preempt);
-#define IPC_FLAG_BLOCKING  0x01
+extern int ipc_connect_to_me(int phoneid, int arg1, int arg2, int arg3,
+    ipcarg_t *phone);
+extern int ipc_connect_me_to(int phoneid, int arg1, int arg2, int arg3);
+extern int ipc_hangup(int phoneid);
+extern int ipc_register_irq(int inr, int devno, int method, irq_code_t *code);
+extern int ipc_unregister_irq(int inr, int devno);
+extern int ipc_forward_fast(ipc_callid_t callid, int phoneid, int method,
+    ipcarg_t arg1, ipcarg_t arg2, int mode);
-extern int ipc_connect_to_me(int, int, int, int, ipcarg_t *);
-extern int ipc_connect_me_to(int, int, int, int);
-extern int ipc_connect_me_to_blocking(int, int, int, int);
-extern int ipc_hangup(int);
-extern int ipc_register_irq(int, int, int, irq_code_t *);
-extern int ipc_unregister_irq(int, int);
-extern int ipc_forward_fast(ipc_callid_t, int, int, ipcarg_t, ipcarg_t, int);
-extern int ipc_forward_slow(ipc_callid_t, int, int, ipcarg_t, ipcarg_t,
-    ipcarg_t, ipcarg_t, ipcarg_t, int);
 /*
  * User-friendly wrappers for ipc_share_in_start().
  */
 ,23 → 274,20
 #define ipc_share_in_start_1_1(phoneid, dst, size, arg, flags) \
     ipc_share_in_start((phoneid), (dst), (size), (arg), (flags))
-extern int ipc_share_in_start(int, void *, size_t, ipcarg_t, int *);
-extern int ipc_share_in_receive(ipc_callid_t *, size_t *);
-extern int ipc_share_in_finalize(ipc_callid_t, void *, int );
-extern int ipc_share_out_start(int, void *, int);
-extern int ipc_share_out_receive(ipc_callid_t *, size_t *, int *);
-extern int ipc_share_out_finalize(ipc_callid_t, void *);
-extern int ipc_data_read_start(int, void *, size_t);
-extern int ipc_data_read_receive(ipc_callid_t *, size_t *);
-extern int ipc_data_read_finalize(ipc_callid_t, const void *, size_t);
-extern int ipc_data_write_start(int, const void *, size_t);
-extern int ipc_data_write_receive(ipc_callid_t *, size_t *);
-extern int ipc_data_write_finalize(ipc_callid_t, void *, size_t);
+extern int ipc_share_in_start(int phoneid, void *dst, size_t size, ipcarg_t arg,
+    int *flags);
+extern int ipc_share_in_receive(ipc_callid_t *callid, size_t *size);
+extern int ipc_share_in_finalize(ipc_callid_t callid, void *src, int flags);
+extern int ipc_share_out_start(int phoneid, void *src, int flags);
+extern int ipc_share_out_receive(ipc_callid_t *callid, size_t *size, int *flags);
+extern int ipc_share_out_finalize(ipc_callid_t callid, void *dst);
+extern int ipc_data_read_start(int phoneid, void *dst, size_t size);
+extern int ipc_data_read_receive(ipc_callid_t *callid, size_t *size);
+extern int ipc_data_read_finalize(ipc_callid_t callid, void *src, size_t size);
+extern int ipc_data_write_start(int phoneid, void *src, size_t size);
+extern int ipc_data_write_receive(ipc_callid_t *callid, size_t *size);
+extern int ipc_data_write_finalize(ipc_callid_t callid, void *dst, size_t size);
-#include <task.h>
-extern int ipc_connect_kbox(task_id_t);
 #endif
 /** @}

/branches/network/uspace/lib/libc/include/ipc/fb.h
48,11 → 48,10
FB_VIEWPORT_CREATE,
FB_VIEWPORT_DELETE,
FB_SET_STYLE,
FB_SET_COLOR,
FB_SET_RGB_COLOR,
FB_GET_RESOLUTION,
FB_DRAW_TEXT_DATA,
FB_FLUSH,
FB_VIEWPORT_DB,
FB_DRAW_PPM,
FB_PREPARE_SHM,
FB_DROP_SHM,
60,6 → 59,7
FB_VP_DRAW_PIXMAP,
FB_VP2PIXMAP,
FB_DROP_PIXMAP,
FB_TRANS_PUTCHAR,
FB_ANIM_CREATE,
FB_ANIM_DROP,
FB_ANIM_ADDPIXMAP,
69,6 → 69,7
FB_POINTER_MOVE
} fb_request_t;


#endif

/** @}

 /branches/network/uspace/lib/libc/include/stdio.h
 ,19 → 52,6
         (void) __SYSCALL3(SYS_KLOG, 1, (sysarg_t) buf, strlen(buf)); \
 }
-typedef struct {
-    /** Underlying file descriptor. */
-    int fd;
-    /** Error indicator. */
-    int error;
-    /** End-of-file indicator. */
-    int eof;
-} FILE;
-extern FILE *stdin, *stdout, *stderr;
 extern int getchar(void);
 extern int puts(const char *);
 ,7 → 59,7
 extern int printf(const char *, ...);
 extern int asprintf(char **, const char *, ...);
-extern int sprintf(char *, const char *, ...);
+extern int sprintf(char *, const char *fmt, ...);
 extern int snprintf(char *, size_t , const char *, ...);
 extern int vprintf(const char *, va_list);
 ,35 → 66,11
 extern int vsprintf(char *, const char *, va_list);
 extern int vsnprintf(char *, size_t, const char *, va_list);
+#define fprintf(f, fmt, ...) printf(fmt, ##__VA_ARGS__)
 extern int rename(const char *, const char *);
-extern FILE *fopen(const char *, const char *);
-extern int fclose(FILE *);
-extern size_t fread(void *, size_t, size_t, FILE *);
-extern size_t fwrite(const void *, size_t, size_t, FILE *);
-extern int feof(FILE *);
-extern int ferror(FILE *);
-extern void clearerr(FILE *);
-extern int fgetc(FILE *);
-extern int fputc(int, FILE *);
-extern int fputs(const char *, FILE *);
-extern int fprintf(FILE *, const char *, ...);
-extern int vfprintf(FILE *, const char *, va_list);
-#define getc fgetc
-#define putc fputc
-extern int fseek(FILE *, long, int);
-#ifndef SEEK_SET
-    #define SEEK_SET    0
-    #define SEEK_CUR    1
-    #define SEEK_END    2
 #endif
-#endif
 /** @}
  */

 /branches/network/uspace/lib/libc/include/vfs/vfs.h
 ,8 → 39,7
 extern char *absolutize(const char *, size_t *);
-extern int mount(const char *, const char *, const char *,
-    const unsigned int flags);
+extern int mount(const char *, const char *, const char *);
 #endif

 /branches/network/uspace/lib/libc/include/string.h
 ,9 → 35,16
 #ifndef LIBC_STRING_H_
 #define LIBC_STRING_H_
-#include <mem.h>
 #include <sys/types.h>
+#define bzero(ptr, len) memset((ptr), 0, (len))
+extern void * memset(void *, int, size_t);
+extern void * memcpy(void *, const void *, size_t);
+extern void * memmove(void *, const void *, size_t);
+extern int bcmp(const char *, const char *, size_t);
 extern int strcmp(const char *, const char *);
 extern int strncmp(const char *, const char *, size_t);
 extern int stricmp(const char *, const char *);
 ,9 → 64,6
 extern long int strtol(const char *, char **, int);
 extern unsigned long strtoul(const char *, char **, int);
-extern char * strtok_r(char *, const char *, char **);
-extern char * strtok(char *, const char *);
 #endif
 /** @}

 /branches/network/uspace/lib/libc/include/ctype.h
 ,19 → 79,11
 static inline int tolower(int c)
 {
     if (isupper(c))
-        return (c + ('a' - 'A'));
+        return (c + ('a' - 'A' > 0 ? 'a' - 'A' : 'A' - 'a'));
     else
         return c;
 }
-static inline int toupper(int c)
-{
-    if (islower(c))
-        return (c + ('A' - 'a'));
-    else
-        return c;
-}
 #endif
 /** @}

 /branches/network/uspace/lib/libc/include/task.h
 ,8 → 40,7
 typedef uint64_t task_id_t;
 extern task_id_t task_get_id(void);
-extern int task_set_name(const char *name);
-extern task_id_t task_spawn(const char *path, char *const argv[]);
+extern task_id_t task_spawn(const char *path, const char *argv[]);
 #endif

 /branches/network/uspace/lib/libc/include/libc.h
 ,20 → 39,14
 #include <kernel/syscall/syscall.h>
 #include <libarch/syscall.h>
-#define __SYSCALL0(id) \
-    __syscall0(0, 0, 0, 0, 0, 0, id)
-#define __SYSCALL1(id, p1) \
-    __syscall1(p1, 0, 0, 0, 0, 0, id)
-#define __SYSCALL2(id, p1, p2) \
-    __syscall2(p1, p2, 0, 0, 0, 0, id)
-#define __SYSCALL3(id, p1, p2, p3) \
-    __syscall3(p1, p2, p3, 0, 0, 0, id)
-#define __SYSCALL4(id, p1, p2, p3, p4) \
-    __syscall4(p1, p2, p3, p4, 0, 0, id)
-#define __SYSCALL5(id, p1, p2, p3, p4, p5) \
-    __syscall5(p1, p2, p3, p4, p5, 0, id)
+#define __SYSCALL0(id) __syscall(0, 0, 0, 0, 0, 0, id)
+#define __SYSCALL1(id, p1) __syscall(p1, 0, 0, 0, 0, 0, id)
+#define __SYSCALL2(id, p1, p2) __syscall(p1, p2, 0, 0, 0, 0, id)
+#define __SYSCALL3(id, p1, p2, p3) __syscall(p1, p2, p3, 0, 0, 0, id)
+#define __SYSCALL4(id, p1, p2, p3, p4) __syscall(p1, p2, p3, p4, 0, 0, id)
+#define __SYSCALL5(id, p1, p2, p3, p4, p5) __syscall(p1, p2, p3, p4, p5, 0, id)
 #define __SYSCALL6(id, p1, p2, p3, p4, p5, p6) \
-    __syscall6(p1, p2, p3, p4, p5, p6, id)
+    __syscall(p1, p2, p3, p4, p5, p6,id)
 extern void __main(void *pcb_ptr);
 extern void __exit(void);

 /branches/network/uspace/lib/libc/include/loader/pcb.h
 ,32 → 40,31
 typedef void (*entry_point_t)(void);
-/** Program Control Block.
- *
+/**
  * 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. */
+    /** Program entry point */
     entry_point_t entry;
-    /** Number of command-line arguments. */
+    /** Number of command-line arguments */
     int argc;
-    /** Command-line arguments. */
+    /** Command-line arguments */
     char **argv;
     /*
-     * ELF-specific data.
+     * ELF-specific data
      */
-    /** Pointer to ELF dynamic section of the program. */
+    /** 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;
-/**
- * A pointer to the program control block. Having received the PCB pointer,
- * the C library startup code stores it here for later use.
- */
 extern pcb_t *__pcb;
 #endif

 /branches/network/uspace/lib/libc/include/io/stream.h
 ,8 → 47,7
 extern ssize_t write_stdout(const void *, size_t);
 extern ssize_t write_stderr(const void *, size_t);
-extern int get_console_phone(void);
-extern void console_wait(void);
+extern int get_cons_phone(void);
 #endif

 /branches/network/uspace/lib/libc/include/byteorder.h
 ,14 → 52,6
 #define uint32_t_be2host(n)     (n)
 #define uint64_t_be2host(n)     (n)
-#define host2uint16_t_le(n)     uint16_t_byteorder_swap(n)
-#define host2uint32_t_le(n)     uint32_t_byteorder_swap(n)
-#define host2uint64_t_le(n)     uint64_t_byteorder_swap(n)
-#define host2uint16_t_be(n)     (n)
-#define host2uint32_t_be(n)     (n)
-#define host2uint64_t_be(n)     (n)
 #else
 #define uint16_t_le2host(n)     (n)
 ,14 → 62,6
 #define uint32_t_be2host(n)     uint32_t_byteorder_swap(n)
 #define uint64_t_be2host(n)     uint64_t_byteorder_swap(n)
-#define host2uint16_t_le(n)     (n)
-#define host2uint32_t_le(n)     (n)
-#define host2uint64_t_le(n)     (n)
-#define host2uint16_t_be(n)     uint16_t_byteorder_swap(n)
-#define host2uint32_t_be(n)     uint32_t_byteorder_swap(n)
-#define host2uint64_t_be(n)     uint64_t_byteorder_swap(n)
 #endif
 static inline uint64_t uint64_t_byteorder_swap(uint64_t n)

 /branches/network/uspace/lib/libc/include/unistd.h
 ,11 → 44,9
 #define getpagesize()     (PAGE_SIZE)
-#ifndef SEEK_SET
-    #define SEEK_SET    0
-    #define SEEK_CUR    1
-    #define SEEK_END    2
-#endif
+#define SEEK_SET    0
+#define SEEK_CUR    1
+#define SEEK_END    2
 extern ssize_t write(int, const void *, size_t);
 extern ssize_t read(int, void *, size_t);

 /branches/network/uspace/lib/libc/include/errno.h
 ,10 → 35,6
 #ifndef LIBC_ERRNO_H_
 #define LIBC_ERRNO_H_
-/* TODO: support threads/fibrils */
-extern int _errno;
-#define errno _errno
 #include <kernel/errno.h>
 #define ENAMETOOLONG    (-256)
 ,8 → 46,6
 #define EBADF       (-262)
 #define ERANGE      (-263)
 #define EXDEV       (-264)
-#define EIO     (-265)
-#define EMLINK      (-266)
 #endif

 /branches/network/uspace/lib/libc/include/sys/types.h
 ,10 → 42,6
 typedef long off_t;
 typedef int mode_t;
-typedef volatile uint8_t ioport8_t;
-typedef volatile uint16_t ioport16_t;
-typedef volatile uint32_t ioport32_t;
 #endif
 /** @}

 /branches/network/uspace/lib/libc/include/async.h
 ,7 → 76,7
 #define async_send_5(phoneid, method, arg1, arg2, arg3, arg4, arg5, dataptr) \
     async_send_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \
         (arg5), (dataptr))
 extern aid_t async_send_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
     ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipc_call_t *dataptr);
 extern aid_t async_send_slow(int phoneid, ipcarg_t method, ipcarg_t arg1,
 ,8 → 86,8
 extern int async_wait_timeout(aid_t amsgid, ipcarg_t *retval,
     suseconds_t timeout);
-fid_t async_new_connection(ipcarg_t in_phone_hash, ipc_callid_t callid,
-    ipc_call_t *call, void (*cthread)(ipc_callid_t, ipc_call_t *));
+fid_t async_new_connection(ipcarg_t in_phone_hash,ipc_callid_t callid,
+    ipc_call_t *call, void (*cthread)(ipc_callid_t,ipc_call_t *));
 void async_usleep(suseconds_t timeout);
 void async_create_manager(void);
 void async_destroy_manager(void);
 ,7 → 118,7
 /*
  * User-friendly wrappers for async_req_fast() and async_req_slow(). The macros
  * are in the form async_req_m_n(), where m is the number of payload arguments
- * and n is the number of return arguments. The macros decide between the fast
+ * and n is the number of return arguments. The macros decidce between the fast
  * and slow verion based on m.
  */
 #define async_req_0_0(phoneid, method) \

 /branches/network/uspace/lib/libc/include/syscall.h
 ,28 → 32,15
 /**
  * @file
  * @brief   Syscall function declaration for architectures that don't
- *      inline syscalls or architectures that handle syscalls
- *      according to the number of arguments.
+ *      inline syscalls.
  */
 #ifndef LIBC_SYSCALL_H_
 #define LIBC_SYSCALL_H_
-#ifndef LIBARCH_SYSCALL_GENERIC
-#error "You can't include this file directly."
-#endif
 #include <sys/types.h>
 #include <kernel/syscall/syscall.h>
-#define __syscall0  __syscall
-#define __syscall1  __syscall
-#define __syscall2  __syscall
-#define __syscall3  __syscall
-#define __syscall4  __syscall
-#define __syscall5  __syscall
-#define __syscall6  __syscall
 extern sysarg_t __syscall(const sysarg_t p1, const sysarg_t p2,
     const sysarg_t p3, const sysarg_t p4, const sysarg_t p5, const sysarg_t p6,
     const syscall_t id);

 /branches/network/uspace/lib/libc/include/align.h
 ,28 → 35,21
 #ifndef LIBC_ALIGN_H_
 #define LIBC_ALIGN_H_
-/** Align to the nearest lower address which is a power of two.
+/** Align to the nearest lower address.
  *
- * @param s     Address or size to be aligned.
- * @param a     Size of alignment, must be power of 2.
+ * @param s Address or size to be aligned.
+ * @param a Size of alignment, must be power of 2.
  */
 #define ALIGN_DOWN(s, a)    ((s) & ~((a) - 1))
-/** Align to the nearest higher address which is a power of two.
+/** Align to the nearest higher address.
  *
- * @param s     Address or size to be aligned.
- * @param a     Size of alignment, must be power of 2.
+ * @param s Address or size to be aligned.
+ * @param a Size of alignment, must be power of 2.
  */
 #define ALIGN_UP(s, a)      ((long)((s) + ((a) - 1)) & ~((long) (a) - 1))
-/** Round up to the nearest higher boundary.
- *
- * @param n     Number to be aligned.
- * @param b     Boundary, arbitrary unsigned number.
- */
-#define ROUND_UP(n, b)      (((n) / (b) + ((n) % (b) != 0)) * (b))
 #endif
 /** @}

 /branches/network/uspace/lib/libc/include/ddi.h
 ,11 → 37,9
 #include <task.h>
-extern int device_assign_devno(void);
-extern int physmem_map(void *, void *, unsigned long, int);
-extern int iospace_enable(task_id_t, void *, unsigned long);
-extern int preemption_control(int);
-extern int pio_enable(void *, size_t, void **);
+extern int physmem_map(void *pf, void *vp, unsigned long pages, int flags);
+extern int iospace_enable(task_id_t id, void *ioaddr, unsigned long size);
+extern int preemption_control(int enable);
 #endif

 /branches/network/uspace/lib/libc/arch/ia64/Makefile.inc
 ,6 → 29,10
 ## Toolchain configuration
 #
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
 TARGET = ia64-pc-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/ia64/bin
 CFLAGS += -fno-unwind-tables -DMALLOC_ALIGNMENT_16
 ,10 → 39,9
 LFLAGS += -N $(SOFTINT_PREFIX)/libsoftint.a
 AFLAGS +=
-ARCH_SOURCES += arch/$(UARCH)/src/syscall.S \
-    arch/$(UARCH)/src/fibril.S \
-    arch/$(UARCH)/src/tls.c \
-    arch/$(UARCH)/src/ddi.c
+ARCH_SOURCES += arch/$(ARCH)/src/syscall.S \
+        arch/$(ARCH)/src/fibril.S \
+        arch/$(ARCH)/src/tls.c
 BFD_NAME = elf64-ia64-little
 BFD_ARCH = ia64-elf64

 /branches/network/uspace/lib/libc/arch/ia64/include/syscall.h
 ,8 → 36,6
 #ifndef LIBC_ia64_SYSCALL_H_
 #define LIBC_ia64_SYSCALL_H_
-#define LIBARCH_SYSCALL_GENERIC
 #include <syscall.h>
 #endif

 /branches/network/uspace/lib/libc/arch/ia64/src/entry.s
 ,7 → 38,7
 #
 __entry:
     alloc loc0 = ar.pfs, 0, 1, 2, 0
-    movl r1 = _gp
+    mov r1 = _gp
     # Pass PCB pointer as the first argument to __main
     mov out0 = r2

 /branches/network/uspace/lib/libc/arch/ia64/src/thread_entry.s
 ,7 → 36,7
 __thread_entry:
     alloc loc0 = ar.pfs, 0, 1, 1, 0
-    movl r1 = _gp
+    mov r1 = _gp
     #
     # r8 contains address of uarg structure.

/branches/network/uspace/lib/libc/arch/ia64/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /branches/network/uspace/lib/libc/arch/arm32/Makefile.inc
 ,16 → 30,20
 ## Toolchain configuration
 #
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
 TARGET = arm-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm/bin
 CFLAGS += -ffixed-r9 -mtp=soft
 LFLAGS += -N $(SOFTINT_PREFIX)/libsoftint.a
-AFLAGS +=
+AFLAGS +=
-ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
-    arch/$(UARCH)/src/fibril.S \
-    arch/$(UARCH)/src/tls.c \
-    arch/$(UARCH)/src/eabi.S
+ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
+        arch/$(ARCH)/src/fibril.S \
+        arch/$(ARCH)/src/tls.c \
+        arch/$(ARCH)/src/eabi.S
 BFD_NAME = elf32-littlearm
 BFD_ARCH = arm

 /branches/network/uspace/lib/libc/arch/arm32/include/syscall.h
 ,14 → 30,12
  * @{
  */
 /** @file
- *  @brief
+ *  @brief Empty.
  */
 #ifndef LIBC_arm32_SYSCALL_H_
 #define LIBC_arm32_SYSCALL_H_
-#define LIBARCH_SYSCALL_GENERIC
 #include <syscall.h>
 #endif

/branches/network/uspace/lib/libc/arch/arm32/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /branches/network/uspace/lib/libc/arch/mips32eb/Makefile.inc
 ,15 → 29,19
 ## Toolchain configuration
 #
-TARGET = mips-linux-gnu
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
+TARGET = mips-sgi-irix5
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips/bin
-CFLAGS += -mips3
+CFLAGS += -mips3
-ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
-        arch/$(UARCH)/src/fibril.S \
-        arch/$(UARCH)/src/tls.c
+ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
+        arch/$(ARCH)/src/fibril.S \
+        arch/$(ARCH)/src/tls.c
 LFLAGS += -N
 BFD_ARCH = mips
-BFD_NAME = elf32-tradbigmips
+BFD_NAME = elf32-big

/branches/network/uspace/lib/libc/arch/mips32eb/include/ddi.h
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

 /branches/network/uspace/lib/libc/arch/ppc32/Makefile.inc
 ,12 → 29,16
 ## Toolchain configuration
 #
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
 TARGET = ppc-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/ppc/bin
-ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
-    arch/$(UARCH)/src/fibril.S \
-    arch/$(UARCH)/src/tls.c
+ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
+        arch/$(ARCH)/src/fibril.S \
+        arch/$(ARCH)/src/tls.c
 CFLAGS += -mcpu=powerpc -msoft-float -m32
 AFLAGS += -a32

 /branches/network/uspace/lib/libc/arch/ppc32/include/syscall.h
 ,8 → 36,6
 #ifndef LIBC_ppc32_SYSCALL_H_
 #define LIBC_ppc32_SYSCALL_H_
-#define LIBARCH_SYSCALL_GENERIC
 #include <syscall.h>
 #endif

 /branches/network/uspace/lib/libc/arch/ppc32/src/entry.s
 ,12 → 34,11
 ## User-space task entry point
 #
-# r6 contains the PCB pointer
+# r3 contains the PCB pointer
 #
 __entry:
     # Pass the PCB pointer to __main() as the first argument.
-    # The first argument is passed in r3.
-    mr %r3, %r6
+    # Since the first argument is passed in r3, no operation is needed.
     bl __main
     bl __exit

/branches/network/uspace/lib/libc/arch/ppc32/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /branches/network/uspace/lib/libc/arch/amd64/Makefile.inc
 ,12 → 29,16
 ## Toolchain configuration
 #
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
 TARGET = amd64-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/amd64/bin
-ARCH_SOURCES += arch/$(UARCH)/src/syscall.S \
-    arch/$(UARCH)/src/fibril.S \
-    arch/$(UARCH)/src/tls.c
+ARCH_SOURCES += arch/$(ARCH)/src/syscall.S \
+        arch/$(ARCH)/src/fibril.S \
+        arch/$(ARCH)/src/tls.c
 LFLAGS += -N

 /branches/network/uspace/lib/libc/arch/amd64/include/syscall.h
 ,8 → 36,6
 #ifndef LIBC_amd64_SYSCALL_H_
 #define LIBC_amd64_SYSCALL_H_
-#define LIBARCH_SYSCALL_GENERIC
 #include <syscall.h>
 #endif

/branches/network/uspace/lib/libc/arch/amd64/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /branches/network/uspace/lib/libc/arch/ppc64/Makefile.inc
 ,0 → 1,48
+#
+# Copyright (c) 2006 Martin Decky
+# 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.
+#
+## Toolchain configuration
+#
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
+TARGET = ppc64-linux-gnu
+TOOLCHAIN_DIR = $(CROSS_PREFIX)/ppc64/bin
+ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
+        arch/$(ARCH)/src/fibril.S \
+        arch/$(ARCH)/src/tls.c
+CFLAGS += -mcpu=powerpc64 -msoft-float -m64
+AFLAGS += -a64
+LFLAGS += -N
+BFD_NAME = elf64-powerpc
+BFD_ARCH = powerpc:common64

 /branches/network/uspace/lib/libc/arch/ppc64/include/config.h
 ,0 → 1,44
+/*
+ * Copyright (c) 2006 Jakub Jermar
+ * 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 libppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc64_CONFIG_H_
+#define LIBC_ppc64_CONFIG_H_
+#define PAGE_WIDTH  12
+#define PAGE_SIZE   (1 << PAGE_WIDTH)
+#endif
+/** @}
+ */

 /branches/network/uspace/lib/libc/arch/ppc64/include/byteorder.h
 ,0 → 1,43
+/*
+ * Copyright (c) 2005 Jakub Jermar
+ * 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 libcppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc64_BYTEORDER_H_
+#define LIBC_ppc64_BYTEORDER_H_
+#define ARCH_IS_BIG_ENDIAN
+#endif
+/** @}
+ */

 /branches/network/uspace/lib/libc/arch/ppc64/include/tls.h
 ,0 → 1,73
+/*
+ * Copyright (c) 2006 Martin Decky
+ * 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 libcppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc64_TLS_H_
+#define LIBC_ppc64_TLS_H_
+#define CONFIG_TLS_VARIANT_1
+#define PPC_TP_OFFSET 0x7000
+typedef struct {
+    void *fibril_data;
+} tcb_t;
+static inline void __tcb_set(tcb_t *tcb)
+{
+    void *tp = tcb;
+    tp += PPC_TP_OFFSET + sizeof(tcb_t);
+    asm volatile (
+        "mr %%r2, %0\n"
+        :
+        : "r" (tp)
+    );
+}
+static inline tcb_t * __tcb_get(void)
+{
+    void * retval;
+    asm volatile (
+        "mr %0, %%r2\n"
+        : "=r" (retval)
+    );
+    return (tcb_t *)(retval - PPC_TP_OFFSET - sizeof(tcb_t));
+}
+#endif
+/** @}
+ */

 /branches/network/uspace/lib/libc/arch/ppc64/include/thread.h
 ,0 → 1,41
+/*
+ * Copyright (c) 2006 Martin Decky
+ * 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 libcppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc64_THREAD_H_
+#define LIBC_ppc64_THREAD_H_
+#endif
+/** @}
+ */

 /branches/network/uspace/lib/libc/arch/ppc64/include/types.h
 ,0 → 1,55
+/*
+ * Copyright (c) 2006 Martin Decky
+ * 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 libcppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc64_TYPES_H_
+#define LIBC_ppc64_TYPES_H_
+typedef unsigned long sysarg_t;
+typedef char int8_t;
+typedef short int int16_t;
+typedef int int32_t;
+typedef long int int64_t;
+typedef unsigned char uint8_t;
+typedef unsigned short int uint16_t;
+typedef unsigned int uint32_t;
+typedef unsigned long int uint64_t;
+typedef uint64_t uintptr_t;
+#endif
+/** @}
+ */

 /branches/network/uspace/lib/libc/arch/ppc64/include/fibril.h
 ,0 → 1,83
+/*
+ * Copyright (c) 2006 Martin Decky
+ * 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 libcppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc64_FIBRIL_H_
+#define LIBC_ppc64_FIBRIL_H_
+#include <sys/types.h>
+/* We define our own context_set, because we need to set
+ * the TLS pointer to the tcb+0x7000
+ *
+ * See tls_set in thread.h
+ */
+#define context_set(c, _pc, stack, size, ptls)          \
+    (c)->pc = (sysarg_t) (_pc);             \
+    (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA;     \
+    (c)->tls = ((sysarg_t) (ptls)) + 0x7000 + sizeof(tcb_t);
+#define SP_DELTA    16
+typedef struct {
+    uint64_t sp;
+    uint64_t pc;
+    uint64_t tls;
+    uint64_t r13;
+    uint64_t r14;
+    uint64_t r15;
+    uint64_t r16;
+    uint64_t r17;
+    uint64_t r18;
+    uint64_t r19;
+    uint64_t r20;
+    uint64_t r21;
+    uint64_t r22;
+    uint64_t r23;
+    uint64_t r24;
+    uint64_t r25;
+    uint64_t r26;
+    uint64_t r27;
+    uint64_t r28;
+    uint64_t r29;
+    uint64_t r30;
+    uint64_t r31;
+    uint64_t cr;
+} __attribute__ ((packed)) context_t;
+#endif
+/** @}
+ */

 /branches/network/uspace/lib/libc/arch/ppc64/include/atomic.h
 ,0 → 1,95
+/*
+ * Copyright (c) 2006 Martin Decky
+ * 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 libcppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc64_ATOMIC_H_
+#define LIBC_ppc64_ATOMIC_H_
+static inline void atomic_inc(atomic_t *val)
+{
+    long tmp;
+    asm volatile (
+        "1:\n"
+        "lwarx %0, 0, %2\n"
+        "addic %0, %0, 1\n"
+        "stwcx. %0, 0, %2\n"
+        "bne- 1b"
+        : "=&r" (tmp), "=m" (val->count)
+        : "r" (&val->count), "m" (val->count)
+        : "cc");
+}
+static inline void atomic_dec(atomic_t *val)
+{
+    long tmp;
+    asm volatile (
+        "1:\n"
+        "lwarx %0, 0, %2\n"
+        "addic %0, %0, -1\n"
+        "stwcx. %0, 0, %2\n"
+        "bne- 1b"
+        : "=&r" (tmp), "=m" (val->count)
+        : "r" (&val->count), "m" (val->count)
+        : "cc");
+}
+static inline long atomic_postinc(atomic_t *val)
+{
+    atomic_inc(val);
+    return val->count - 1;
+}
+static inline long atomic_postdec(atomic_t *val)
+{
+    atomic_dec(val);
+    return val->count + 1;
+}
+static inline long atomic_preinc(atomic_t *val)
+{
+    atomic_inc(val);
+    return val->count;
+}
+static inline long atomic_predec(atomic_t *val)
+{
+    atomic_dec(val);
+    return val->count;
+}
+#endif
+/** @}
+ */

 /branches/network/uspace/lib/libc/arch/ppc64/include/syscall.h
 ,0 → 1,44
+/*
+ * Copyright (c) 2005 Martin Decky
+ * 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_ppc64_SYSCALL_H_
+#define LIBC_ppc64_SYSCALL_H_
+#include <syscall.h>
+#endif
+/** @}
+ */

 /branches/network/uspace/lib/libc/arch/ppc64/include/regname.h
 ,0 → 1,188
+/*
+ * Copyright (c) 2006 Martin Decky
+ * 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 libcppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc64_REGNAME_H_
+#define LIBC_ppc64_REGNAME_H_
+/* Condition Register Bit Fields */
+#define cr0 0
+#define cr1 1
+#define cr2 2
+#define cr3 3
+#define cr4 4
+#define cr5 5
+#define cr6 6
+#define cr7 7
+/* General Purpose Registers (GPRs) */
+#define r0  0
+#define r1  1
+#define r2  2
+#define r3  3
+#define r4  4
+#define r5  5
+#define r6  6
+#define r7  7
+#define r8  8
+#define r9  9
+#define r10 10
+#define r11 11
+#define r12 12
+#define r13 13
+#define r14 14
+#define r15 15
+#define r16 16
+#define r17 17
+#define r18 18
+#define r19 19
+#define r20 20
+#define r21 21
+#define r22 22
+#define r23 23
+#define r24 24
+#define r25 25
+#define r26 26
+#define r27 27
+#define r28 28
+#define r29 29
+#define r30 30
+#define r31 31
+/* GPR Aliases */
+#define sp  1
+/* Floating Point Registers (FPRs) */
+#define fr0     0
+#define fr1     1
+#define fr2     2
+#define fr3     3
+#define fr4     4
+#define fr5     5
+#define fr6     6
+#define fr7     7
+#define fr8     8
+#define fr9     9
+#define fr10    10
+#define fr11    11
+#define fr12    12
+#define fr13    13
+#define fr14    14
+#define fr15    15
+#define fr16    16
+#define fr17    17
+#define fr18    18
+#define fr19    19
+#define fr20    20
+#define fr21    21
+#define fr22    22
+#define fr23    23
+#define fr24    24
+#define fr25    25
+#define fr26    26
+#define fr27    27
+#define fr28    28
+#define fr29    29
+#define fr30    30
+#define fr31    31
+#define vr0     0
+#define vr1     1
+#define vr2     2
+#define vr3     3
+#define vr4     4
+#define vr5     5
+#define vr6     6
+#define vr7     7
+#define vr8     8
+#define vr9     9
+#define vr10    10
+#define vr11    11
+#define vr12    12
+#define vr13    13
+#define vr14    14
+#define vr15    15
+#define vr16    16
+#define vr17    17
+#define vr18    18
+#define vr19    19
+#define vr20    20
+#define vr21    21
+#define vr22    22
+#define vr23    23
+#define vr24    24
+#define vr25    25
+#define vr26    26
+#define vr27    27
+#define vr28    28
+#define vr29    29
+#define vr30    30
+#define vr31    31
+#define evr0    0
+#define evr1    1
+#define evr2    2
+#define evr3    3
+#define evr4    4
+#define evr5    5
+#define evr6    6
+#define evr7    7
+#define evr8    8
+#define evr9    9
+#define evr10   10
+#define evr11   11
+#define evr12   12
+#define evr13   13
+#define evr14   14
+#define evr15   15
+#define evr16   16
+#define evr17   17
+#define evr18   18
+#define evr19   19
+#define evr20   20
+#define evr21   21
+#define evr22   22
+#define evr23   23
+#define evr24   24
+#define evr25   25
+#define evr26   26
+#define evr27   27
+#define evr28   28
+#define evr29   29
+#define evr30   30
+#define evr31   31
+#endif
+/** @}
+ */

 /branches/network/uspace/lib/libc/arch/ppc64/include/stackarg.h
 ,0 → 1,41
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * 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 libcppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_STACKARG_H_
+#define LIBC_STACKARG_H_
+#endif
+/** @}
+ */

 /branches/network/uspace/lib/libc/arch/ppc64/include/faddr.h
 ,0 → 1,45
+/*
+ * Copyright (c) 2005 Ondrej Palkovsky
+ * 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 libcppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc64_FADDR_H_
+#define LIBC_ppc64_FADDR_H_
+#include <libarch/types.h>
+#define FADDR(fptr)     ((uintptr_t) (fptr))
+#endif
+/** @}
+ */

 /branches/network/uspace/lib/libc/arch/ppc64/include/limits.h
 ,0 → 1,46
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * 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 libcppc64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ppc64_LIMITS_H_
+#define LIBC_ppc64_LIMITS_H_
+#define LONG_MIN MIN_INT64
+#define LONG_MAX MAX_INT64
+#define ULONG_MIN MIN_UINT64
+#define ULONG_MAX MAX_UINT64
+#endif
+/** @}
+ */

 /branches/network/uspace/lib/libc/arch/ppc64/src/entry.s
 ,0 → 1,40
+#
+# Copyright (c) 2006 Martin Decky
+# 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.
+#
+.section .init, "ax"
+.org 0
+.globl __entry
+## User-space task entry point
+#
+#
+__entry:
+    bl __main
+    bl __exit

 /branches/network/uspace/lib/libc/arch/ppc64/src/fibril.S
 ,0 → 1,62
+#
+# Copyright (c) 2006 Martin Decky
+# 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.
+#
+.text
+.global context_save
+.global context_restore
+#include <libarch/regname.h>
+#include <kernel/arch/context_offset.h>
+context_save:
+    CONTEXT_SAVE_ARCH_CORE r3
+    mflr r4
+    stw r4, OFFSET_PC(r3)
+    mfcr r4
+    stw r4, OFFSET_CR(r3)
+    # context_save returns 1
+    li r3, 1
+    blr
+context_restore:
+    CONTEXT_RESTORE_ARCH_CORE r3
+    lwz r4, OFFSET_CR(r3)
+    mtcr r4
+    lwz r4, OFFSET_PC(r3)
+    mtlr r4
+    # context_restore returns 0
+    li r3, 0
+    blr

 /branches/network/uspace/lib/libc/arch/ppc64/src/syscall.c
 ,0 → 1,66
+/*
+ * Copyright (c) 2006 Martin Decky
+ * 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 libcppc64 ppc64
+ * @brief ppc64 architecture dependent parts of libc
+ * @ingroup lc
+ * @{
+ */
+/** @file
+ */
+#include <libc.h>
+sysarg_t __syscall(const sysarg_t p1, const sysarg_t p2, const sysarg_t p3,
+    const sysarg_t p4, const sysarg_t p5, const sysarg_t p6, const syscall_t id)
+{
+    register sysarg_t __ppc32_reg_r3 asm("3") = p1;
+    register sysarg_t __ppc32_reg_r4 asm("4") = p2;
+    register sysarg_t __ppc32_reg_r5 asm("5") = p3;
+    register sysarg_t __ppc32_reg_r6 asm("6") = p4;
+    register sysarg_t __ppc32_reg_r7 asm("7") = p5;
+    register sysarg_t __ppc32_reg_r8 asm("8") = p6;
+    register sysarg_t __ppc32_reg_r9 asm("9") = id;
+    asm volatile (
+        "sc\n"
+        : "=r" (__ppc32_reg_r3)
+        : "r" (__ppc32_reg_r3),
+          "r" (__ppc32_reg_r4),
+          "r" (__ppc32_reg_r5),
+          "r" (__ppc32_reg_r6),
+          "r" (__ppc32_reg_r7),
+          "r" (__ppc32_reg_r8),
+          "r" (__ppc32_reg_r9)
+    );
+    return __ppc32_reg_r3;
+}
+/** @}
+ */

 /branches/network/uspace/lib/libc/arch/ppc64/src/tls.c
 ,0 → 1,60
+/*
+ * Copyright (c) 2006 Ondrej Palkovsky
+ * 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 libcppc64
+ * @{
+ */
+/** @file
+ */
+#include <tls.h>
+#include <malloc.h>
+/** Allocate TLS & TCB for initial module threads
+ *
+ * @param data Start of data section
+ * @return pointer to tcb_t structure
+ *
+ */
+tcb_t * __alloc_tls(void **data, size_t size)
+{
+    tcb_t *tcb;
+    *data = malloc(sizeof(tcb_t) + size);
+    tcb = (tcb_t *) (*data + size);
+    return tcb;
+}
+void __free_tls_arch(tcb_t *tcb, size_t size)
+{
+    void *start = ((void *) tcb) - size;
+    free(start);
+}
+/** @}
+ */

 /branches/network/uspace/lib/libc/arch/ppc64/src/thread_entry.s
 ,0 → 1,39
+#
+# Copyright (c) 2006 Martin Decky
+# 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.
+#
+.text
+.globl __thread_entry
+## User-space thread entry point for all but the first threads.
+#
+#
+__thread_entry:
+    b __thread_main
+.end __thread_entry

 /branches/network/uspace/lib/libc/arch/ppc64/_link.ld.in
 ,0 → 1,52
+STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+ENTRY(__entry)
+PHDRS {
+    text PT_LOAD FLAGS(5);
+    data PT_LOAD FLAGS(6);
+}
+SECTIONS {
+    . = 0x1000 + SIZEOF_HEADERS;
+    .init : {
+        *(.init);
+    } :text
+    .text : {
+        *(.text);
+        *(.toc);
+        *(.rodata*);
+    } :text
+    . = . + 0x1000;
+    .data : {
+        *(.opd);
+        *(.data*);
+        *(.sdata);
+    } :data
+    .tdata : {
+        _tdata_start = .;
+        *(.tdata);
+        _tdata_end = .;
+    } :data
+    .tbss : {
+        _tbss_start = .;
+        *(.tbss);
+        _tbss_end = .;
+    } :data
+    _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+    .bss : {
+        *(.sbss);
+        *(COMMON);
+        *(.bss);
+    } :data
+    . = ALIGN(0x1000);
+    _heap = .;
+    /DISCARD/ : {
+        *(*);
+    }
+}

 /branches/network/uspace/lib/libc/arch/mips32/Makefile.inc
 ,13 → 29,23
 ## Toolchain configuration
 #
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
 TARGET = mipsel-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/mipsel/bin
 CFLAGS += -mips3
-ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
-    arch/$(UARCH)/src/fibril.S \
-    arch/$(UARCH)/src/tls.c
+-include ../../Makefile.config
+ifeq ($(CONFIG_MIPS_FPU),y)
+    CFLAGS += -DCONFIG_MIPS_FPU
+endif
+ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
+    arch/$(ARCH)/src/fibril.S \
+    arch/$(ARCH)/src/tls.c
 BFD_ARCH = mips
 BFD_NAME = elf32-tradlittlemips

 /branches/network/uspace/lib/libc/arch/mips32/include/atomic.h
 ,14 → 59,13
     asm volatile (
         "1:\n"
         "   ll %0, %1\n"
-        "   addu %0, %0, %3\n"  /* same as add, but never traps on overflow */
+        "   addiu %0, %0, %3\n" /* same as addi, but never traps on overflow */
         "       move %2, %0\n"
         "   sc %0, %1\n"
         "   beq %0, %4, 1b\n"   /* if the atomic operation failed, try again */
         /*  nop */      /* nop is inserted automatically by compiler */
-        "   nop\n"
         : "=&r" (tmp), "+m" (val->count), "=&r" (v)
-        : "r" (i), "i" (0)
+        : "i" (i), "i" (0)
         );
     return v;

 /branches/network/uspace/lib/libc/arch/mips32/include/syscall.h
 ,8 → 36,6
 #ifndef LIBC_mips32_SYSCALL_H_
 #define LIBC_mips32_SYSCALL_H_
-#define LIBARCH_SYSCALL_GENERIC
 #include <syscall.h>
 #endif

/branches/network/uspace/lib/libc/arch/mips32/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /branches/network/uspace/lib/libc/arch/ia32/Makefile.inc
 ,13 → 29,17
 ## Toolchain configuration
 #
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
 TARGET = i686-pc-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/i686/bin
-ARCH_SOURCES += arch/$(UARCH)/src/syscall.S \
-    arch/$(UARCH)/src/fibril.S \
-    arch/$(UARCH)/src/tls.c \
-    arch/$(UARCH)/src/setjmp.S
+ARCH_SOURCES += arch/$(ARCH)/src/syscall.S \
+        arch/$(ARCH)/src/fibril.S \
+        arch/$(ARCH)/src/tls.c \
+        arch/$(ARCH)/src/setjmp.S
 LFLAGS += -N

 /branches/network/uspace/lib/libc/arch/ia32/include/syscall.h
 ,25 → 36,8
 #ifndef LIBC_ia32_SYSCALL_H_
 #define LIBC_ia32_SYSCALL_H_
-#include <sys/types.h>
-#include <kernel/syscall/syscall.h>
+#include <syscall.h>
-#define __syscall0  __syscall_sysenter
-#define __syscall1  __syscall_sysenter
-#define __syscall2  __syscall_sysenter
-#define __syscall3  __syscall_sysenter
-#define __syscall4  __syscall_sysenter
-#define __syscall5  __syscall_int
-#define __syscall6  __syscall_int
-extern sysarg_t
-__syscall_sysenter(const sysarg_t, const sysarg_t, const sysarg_t, const sysarg_t,
-     const sysarg_t, const sysarg_t, const syscall_t);
-extern sysarg_t
-__syscall_int(const sysarg_t, const sysarg_t, const sysarg_t, const sysarg_t,
-     const sysarg_t, const sysarg_t, const syscall_t);
 #endif
 /** @}

 /branches/network/uspace/lib/libc/arch/ia32/include/ddi.h
 ,72 → 33,43
 #ifndef LIBC_ia32_DDI_H_
 #define LIBC_ia32_DDI_H_
-#include <sys/types.h>
-#include <libarch/types.h>
+static inline void outb(int16_t port, uint8_t b)
+{
+    asm volatile ("outb %0, %1\n" :: "a" (b), "d" (port));
+}
-#define IO_SPACE_BOUNDARY   ((void *) (64 * 1024))
-static inline uint8_t pio_read_8(ioport8_t *port)
+static inline void outw(int16_t port, int16_t w)
 {
-    uint8_t val;
-    asm volatile (
-        "inb %w[port], %b[val]\n"
-        : [val] "=a" (val)
-        : [port] "d" (port)
-    );
-    return val;
+    asm volatile ("outw %0, %1\n" :: "a" (w), "d" (port));
 }
-static inline uint16_t pio_read_16(ioport16_t *port)
+static inline void outl(int16_t port, uint32_t l)
 {
-    uint16_t val;
-    asm volatile (
-        "inw %w[port], %w[val]\n"
-        : [val] "=a" (val)
-        : [port] "d" (port)
-    );
-    return val;
+    asm volatile ("outl %0, %1\n" :: "a" (l), "d" (port));
 }
-static inline uint32_t pio_read_32(ioport32_t *port)
+static inline uint8_t inb(int16_t port)
 {
-    uint32_t val;
-    asm volatile (
-        "inl %w[port], %[val]\n"
-        : [val] "=a" (val)
-        : [port] "d" (port)
-    );
+    uint8_t val;
+    asm volatile ("inb %1, %0 \n" : "=a" (val) : "d"(port));
     return val;
 }
-static inline void pio_write_8(ioport8_t *port, uint8_t val)
+static inline int16_t inw(int16_t port)
 {
-    asm volatile (
-        "outb %b[val], %w[port]\n"
-        :: [val] "a" (val), [port] "d" (port)
-    );
+    int16_t val;
+    asm volatile ("inw %1, %0 \n" : "=a" (val) : "d"(port));
+    return val;
 }
-static inline void pio_write_16(ioport16_t *port, uint16_t val)
+static inline uint32_t inl(int16_t port)
 {
-    asm volatile (
-        "outw %w[val], %w[port]\n"
-        :: [val] "a" (val), [port] "d" (port)
-    );
-}
+    uint32_t val;
-static inline void pio_write_32(ioport32_t *port, uint32_t val)
-{
-    asm volatile (
-        "outl %[val], %w[port]\n"
-        :: [val] "a" (val), [port] "d" (port)
-    );
+    asm volatile ("inl %1, %0 \n" : "=a" (val) : "d"(port));
+    return val;
 }
 #endif

 /branches/network/uspace/lib/libc/arch/ia32/src/syscall.S
 ,14 → 28,14
 .text
-/** Syscall wrapper - INT $0x30 version.
+/** Syscall wrapper.
  *
  * Mind the order of arguments. First two arguments and the syscall number go to
  * scratch registers. An optimized version of this wrapper for fewer arguments
  * could benefit from this and not save unused registers on the stack.
  */
-.global __syscall_int
-__syscall_int:
+.global __syscall
+__syscall:
     pushl %ebx
     pushl %esi
     pushl %edi
 ,38 → 53,3
     popl %esi
     popl %ebx
     ret
-/** Syscall wrapper - SYSENTER version.
- *
- * This is an optimized version of syscall for four or less arguments.  Note
- * that EBP and EDI are used to remember user stack address and the return
- * address. The kernel part doesn't save DS, ES and FS so the handler restores
- * these to the selector immediately following CS (it must be the flat data
- * segment, otherwise the SYSENTER wouldn't work in the first place).
- */
-.global __syscall_sysenter
-__syscall_sysenter:
-    pushl %ebx
-    pushl %esi
-    pushl %edi
-    pushl %ebp
-    mov %esp, %ebp
-    lea ra, %edi
-    movl 20(%esp), %edx # First argument.
-    movl 24(%esp), %ecx # Second argument.
-    movl 28(%esp), %ebx # Third argument.
-    movl 32(%esp), %esi # Fourth argument.
-    movl 44(%esp), %eax # Syscall number.
-    sysenter
-ra:
-    movw %cs, %cx
-    addw $8, %cx
-    movw %cx, %ds
-    movw %cx, %es
-    movw %cx, %fs
-    popl %ebp
-    popl %edi
-    popl %esi
-    popl %ebx
-    ret

/branches/network/uspace/lib/libc/arch/ia32/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /branches/network/uspace/lib/libc/arch/sparc64/Makefile.inc
 ,11 → 29,15
 ## Toolchain configuration
 #
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
 TARGET = sparc64-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/sparc64/bin
-ARCH_SOURCES += arch/$(UARCH)/src/fibril.S \
-    arch/$(UARCH)/src/tls.c
+ARCH_SOURCES += arch/$(ARCH)/src/fibril.S \
+        arch/$(ARCH)/src/tls.c
 CFLAGS += -mcpu=ultrasparc -m64
 LFLAGS += -no-check-sections -N

 /branches/network/uspace/lib/libc/arch/sparc64/include/syscall.h
 ,14 → 38,6
 #include <sys/types.h>
 #include <kernel/syscall/syscall.h>
-#define __syscall0  __syscall
-#define __syscall1  __syscall
-#define __syscall2  __syscall
-#define __syscall3  __syscall
-#define __syscall4  __syscall
-#define __syscall5  __syscall
-#define __syscall6  __syscall
 static inline sysarg_t
 __syscall(const sysarg_t p1, const sysarg_t p2, const sysarg_t p3,
     const sysarg_t p4, const sysarg_t p5, const sysarg_t p6, const syscall_t id)

/branches/network/uspace/lib/libc/arch/sparc64/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /branches/network/uspace/lib/libc/generic/io/stream.c
 ,8 → 42,7
 #include <ipc/ns.h>
 #include <ipc/fb.h>
 #include <ipc/services.h>
-#include <ipc/console.h>
-#include <kbd/kbd.h>
+#include <console.h>
 #include <unistd.h>
 #include <async.h>
 #include <sys/types.h>
 ,17 → 58,13
 {
     open_console();
     if (console_phone >= 0) {
-        kbd_event_t ev;
-        int rc;
+        ipcarg_t r0, r1;
         size_t i = 0;
         while (i < count) {
-            do {
-                rc = kbd_get_event(&ev);
-                if (rc < 0) return -1;
-            } while (ev.c == 0 || ev.type == KE_RELEASE);
-            ((char *) buf)[i++] = ev.c;
+            if (async_req_0_2(console_phone, CONSOLE_GETCHAR, &r0, &r1) < 0)
+                return -1;
+            ((char *) buf)[i++] = r0;
         }
         return i;
     } else {
 ,19 → 110,11
     (void) __SYSCALL3(SYS_KLOG, 1, NULL, 0);
 }
-int get_console_phone(void)
+int get_cons_phone(void)
 {
-    if (console_phone < 0)
-        console_phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_CONSOLE, 0, 0);
+    open_console();
     return console_phone;
 }
-void console_wait(void)
-{
-    while (console_phone < 0)
-        get_console_phone();
-}
 /** @}
  */

 /branches/network/uspace/lib/libc/generic/ipc.c
 ,7 → 598,7
     ipcarg_t newphid;
     int res;
-    res = ipc_call_sync_3_5(phoneid, IPC_M_CONNECT_ME_TO, arg1, arg2, arg3,
+    res = ipc_call_sync_3_5(phoneid, IPC_M_CONNECT_ME_TO, arg1, arg2, arg3,
         NULL, NULL, NULL, NULL, &newphid);
     if (res)
         return res;
 ,30 → 605,6
     return newphid;
 }
-/** Ask through phone for a new connection to some service.
- *
- * If the connection is not available at the moment, the
- * call will block.
- *
- * @param phoneid   Phone handle used for contacting the other side.
- * @param arg1      User defined argument.
- * @param arg2      User defined argument.
- * @param arg3      User defined argument.
- *
- * @return      New phone handle on success or a negative error code.
- */
-int ipc_connect_me_to_blocking(int phoneid, int arg1, int arg2, int arg3)
-{
-    ipcarg_t newphid;
-    int res;
-    res = ipc_call_sync_4_5(phoneid, IPC_M_CONNECT_ME_TO, arg1, arg2, arg3,
-        IPC_FLAG_BLOCKING, NULL, NULL, NULL, NULL, &newphid);
-    if (res)
-        return res;
-    return newphid;
-}
 /** Hang up a phone.
  *
  * @param phoneid   Handle of the phone to be hung up.
 ,23 → 666,6
         arg2, mode);
 }
-int ipc_forward_slow(ipc_callid_t callid, int phoneid, int method,
-    ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5,
-    int mode)
-{
-    ipc_call_t data;
-    IPC_SET_METHOD(data, method);
-    IPC_SET_ARG1(data, arg1);
-    IPC_SET_ARG2(data, arg2);
-    IPC_SET_ARG3(data, arg3);
-    IPC_SET_ARG4(data, arg4);
-    IPC_SET_ARG5(data, arg5);
-    return __SYSCALL3(SYS_IPC_FORWARD_SLOW, callid, (sysarg_t) &data, mode);
-}
 /** Wrapper for making IPC_M_SHARE_IN calls.
  *
  * @param phoneid   Phone that will be used to contact the receiving side.
 ,7 → 847,7
  *
  * @return      Zero on success or a value from @ref errno.h on failure.
  */
-int ipc_data_read_finalize(ipc_callid_t callid, const void *src, size_t size)
+int ipc_data_read_finalize(ipc_callid_t callid, void *src, size_t size)
 {
     return ipc_answer_2(callid, EOK, (ipcarg_t) src, (ipcarg_t) size);
 }
 ,7 → 860,7
  *
  * @return      Zero on success or a negative error code from errno.h.
  */
-int ipc_data_write_start(int phoneid, const void *src, size_t size)
+int ipc_data_write_start(int phoneid, void *src, size_t size)
 {
     return async_req_2_0(phoneid, IPC_M_DATA_WRITE, (ipcarg_t) src,
         (ipcarg_t) size);
 ,18 → 909,6
 {
     return ipc_answer_2(callid, EOK, (ipcarg_t) dst, (ipcarg_t) size);
 }
-#include <kernel/syscall/sysarg64.h>
-/** Connect to a task specified by id.
- */
-int ipc_connect_kbox(task_id_t id)
-{
-    sysarg64_t arg;
-    arg.value = (unsigned long long) id;
-    return __SYSCALL1(SYS_IPC_CONNECT_KBOX, (sysarg_t) &arg);
-}
 /** @}
  */

/branches/network/uspace/lib/libc/generic/vfs/canonify.c
36,7 → 36,6
*/

#include <stdlib.h>
#include <vfs/canonify.h>

/** Token types used for tokenization of path. */
typedef enum {

 /branches/network/uspace/lib/libc/generic/vfs/vfs.c
 ,7 → 31,7
  */
 /** @file
  */
 #include <vfs/vfs.h>
 #include <vfs/canonify.h>
 #include <stdlib.h>
 ,7 → 49,7
 #include <errno.h>
 #include <string.h>
 #include <ipc/devmap.h>
-#include "../../../srv/vfs/vfs.h"
+#include "../../srv/vfs/vfs.h"
 int vfs_phone = -1;
 futex_t vfs_phone_futex = FUTEX_INITIALIZER;
 ,7 → 57,7
 futex_t cwd_futex = FUTEX_INITIALIZER;
 DIR *cwd_dir = NULL;
 char *cwd_path = NULL;
-size_t cwd_len = 0;
+size_t cwd_len = 0;
 char *absolutize(const char *path, size_t *retlen)
 {
 ,39 → 109,34
     return ncwd_path;
 }
-static void vfs_connect(void)
+static int vfs_connect(void)
 {
-    while (vfs_phone < 0)
-        vfs_phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_VFS, 0, 0);
+    if (vfs_phone < 0)
+        vfs_phone = ipc_connect_me_to(PHONE_NS, SERVICE_VFS, 0, 0);
+    return vfs_phone;
 }
-static int device_get_handle(const char *name, dev_handle_t *handle,
-    const unsigned int flags)
+static int device_get_handle(char *name, dev_handle_t *handle)
 {
-    int phone;
-    if (flags & IPC_FLAG_BLOCKING)
-        phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAP, DEVMAP_CLIENT, 0);
-    else
-        phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP, DEVMAP_CLIENT, 0);
+    int phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP, DEVMAP_CLIENT,
+);
     if (phone < 0)
         return phone;
     ipc_call_t answer;
-    aid_t req = async_send_2(phone, DEVMAP_DEVICE_GET_HANDLE, flags, 0,
+    aid_t req = async_send_2(phone, DEVMAP_DEVICE_GET_HANDLE, 0, 0,
         &answer);
     ipcarg_t retval = ipc_data_write_start(phone, name, strlen(name) + 1);
     if (retval != EOK) {
         async_wait_for(req, NULL);
         ipc_hangup(phone);
         return retval;
     }
     async_wait_for(req, &retval);
     if (handle != NULL)
         *handle = -1;
 ,8 → 149,7
     return retval;
 }
-int mount(const char *fs_name, const char *mp, const char *dev,
-    const unsigned int flags)
+int mount(const char *fs_name, const char *mp, const char *dev)
 {
     int res;
     ipcarg_t rc;
 ,7 → 156,7
     aid_t req;
     dev_handle_t dev_handle;
-    res = device_get_handle(dev, &dev_handle, flags);
+    res = device_get_handle(dev, &dev_handle);
     if (res != EOK)
         return res;
 ,13 → 164,20
     char *mpa = absolutize(mp, &mpa_len);
     if (!mpa)
         return ENOMEM;
     futex_down(&vfs_phone_futex);
     async_serialize_start();
-    vfs_connect();
-    req = async_send_2(vfs_phone, VFS_MOUNT, dev_handle, flags, NULL);
-    rc = ipc_data_write_start(vfs_phone, (void *) mpa, mpa_len);
+    if (vfs_phone < 0) {
+        res = vfs_connect();
+        if (res < 0) {
+            async_serialize_end();
+            futex_up(&vfs_phone_futex);
+            free(mpa);
+            return res;
+        }
+    }
+    req = async_send_1(vfs_phone, VFS_MOUNT, dev_handle, NULL);
+    rc = ipc_data_write_start(vfs_phone, (void *)fs_name, strlen(fs_name));
     if (rc != EOK) {
         async_wait_for(req, NULL);
         async_serialize_end();
 ,8 → 185,8
         free(mpa);
         return (int) rc;
     }
-    rc = ipc_data_write_start(vfs_phone, (void *) fs_name, strlen(fs_name));
+    /* Ask VFS whether it likes fs_name. */
+    rc = async_req_0_0(vfs_phone, IPC_M_PING);
     if (rc != EOK) {
         async_wait_for(req, NULL);
         async_serialize_end();
 ,17 → 194,24
         free(mpa);
         return (int) rc;
     }
+    rc = ipc_data_write_start(vfs_phone, (void *)mpa, mpa_len);
+    if (rc != EOK) {
+        async_wait_for(req, NULL);
+        async_serialize_end();
+        futex_up(&vfs_phone_futex);
+        free(mpa);
+        return (int) rc;
+    }
     async_wait_for(req, &rc);
     async_serialize_end();
     futex_up(&vfs_phone_futex);
     free(mpa);
     return (int) rc;
 }
 static int _open(const char *path, int lflag, int oflag, ...)
 {
+    int res;
     ipcarg_t rc;
     ipc_call_t answer;
     aid_t req;
 ,8 → 223,15
     futex_down(&vfs_phone_futex);
     async_serialize_start();
-    vfs_connect();
+    if (vfs_phone < 0) {
+        res = vfs_connect();
+        if (res < 0) {
+            async_serialize_end();
+            futex_up(&vfs_phone_futex);
+            free(pa);
+            return res;
+        }
+    }
     req = async_send_3(vfs_phone, VFS_OPEN, lflag, oflag, 0, &answer);
     rc = ipc_data_write_start(vfs_phone, pa, pa_len);
     if (rc != EOK) {
 ,14 → 258,22
 int close(int fildes)
 {
+    int res;
     ipcarg_t rc;
     futex_down(&vfs_phone_futex);
     async_serialize_start();
-    vfs_connect();
+    if (vfs_phone < 0) {
+        res = vfs_connect();
+        if (res < 0) {
+            async_serialize_end();
+            futex_up(&vfs_phone_futex);
+            return res;
+        }
+    }
     rc = async_req_1_0(vfs_phone, VFS_CLOSE, fildes);
     async_serialize_end();
     futex_up(&vfs_phone_futex);
 ,6 → 282,7
 ssize_t read(int fildes, void *buf, size_t nbyte)
 {
+    int res;
     ipcarg_t rc;
     ipc_call_t answer;
     aid_t req;
 ,8 → 289,14
     futex_down(&vfs_phone_futex);
     async_serialize_start();
-    vfs_connect();
+    if (vfs_phone < 0) {
+        res = vfs_connect();
+        if (res < 0) {
+            async_serialize_end();
+            futex_up(&vfs_phone_futex);
+            return res;
+        }
+    }
     req = async_send_1(vfs_phone, VFS_READ, fildes, &answer);
     rc = ipc_data_read_start(vfs_phone, (void *)buf, nbyte);
     if (rc != EOK) {
 ,6 → 316,7
 ssize_t write(int fildes, const void *buf, size_t nbyte)
 {
+    int res;
     ipcarg_t rc;
     ipc_call_t answer;
     aid_t req;
 ,8 → 323,14
     futex_down(&vfs_phone_futex);
     async_serialize_start();
-    vfs_connect();
+    if (vfs_phone < 0) {
+        res = vfs_connect();
+        if (res < 0) {
+            async_serialize_end();
+            futex_up(&vfs_phone_futex);
+            return res;
+        }
+    }
     req = async_send_1(vfs_phone, VFS_WRITE, fildes, &answer);
     rc = ipc_data_write_start(vfs_phone, (void *)buf, nbyte);
     if (rc != EOK) {
 ,15 → 350,23
 off_t lseek(int fildes, off_t offset, int whence)
 {
+    int res;
     ipcarg_t rc;
     futex_down(&vfs_phone_futex);
     async_serialize_start();
-    vfs_connect();
-    ipcarg_t newoffs;
+    if (vfs_phone < 0) {
+        res = vfs_connect();
+        if (res < 0) {
+            async_serialize_end();
+            futex_up(&vfs_phone_futex);
+            return res;
+        }
+    }
+    off_t newoffs;
     rc = async_req_3_1(vfs_phone, VFS_SEEK, fildes, offset, whence,
-        &newoffs);
+        (ipcarg_t)&newoffs);
     async_serialize_end();
     futex_up(&vfs_phone_futex);
 ,17 → 374,24
     if (rc != EOK)
         return (off_t) -1;
-    return (off_t) newoffs;
+    return newoffs;
 }
 int ftruncate(int fildes, off_t length)
 {
+    int res;
     ipcarg_t rc;
     futex_down(&vfs_phone_futex);
     async_serialize_start();
-    vfs_connect();
+    if (vfs_phone < 0) {
+        res = vfs_connect();
+        if (res < 0) {
+            async_serialize_end();
+            futex_up(&vfs_phone_futex);
+            return res;
+        }
+    }
     rc = async_req_2_0(vfs_phone, VFS_TRUNCATE, fildes, length);
     async_serialize_end();
     futex_up(&vfs_phone_futex);
 ,6 → 433,7
 int mkdir(const char *path, mode_t mode)
 {
+    int res;
     ipcarg_t rc;
     aid_t req;
 ,11 → 441,18
     char *pa = absolutize(path, &pa_len);
     if (!pa)
         return ENOMEM;
     futex_down(&vfs_phone_futex);
     async_serialize_start();
-    vfs_connect();
+    if (vfs_phone < 0) {
+        res = vfs_connect();
+        if (res < 0) {
+            async_serialize_end();
+            futex_up(&vfs_phone_futex);
+            free(pa);
+            return res;
+        }
+    }
     req = async_send_1(vfs_phone, VFS_MKDIR, mode, NULL);
     rc = ipc_data_write_start(vfs_phone, pa, pa_len);
     if (rc != EOK) {
 ,6 → 471,7
 static int _unlink(const char *path, int lflag)
 {
+    int res;
     ipcarg_t rc;
     aid_t req;
 ,8 → 482,15
     futex_down(&vfs_phone_futex);
     async_serialize_start();
-    vfs_connect();
+    if (vfs_phone < 0) {
+        res = vfs_connect();
+        if (res < 0) {
+            async_serialize_end();
+            futex_up(&vfs_phone_futex);
+            free(pa);
+            return res;
+        }
+    }
     req = async_send_0(vfs_phone, VFS_UNLINK, NULL);
     rc = ipc_data_write_start(vfs_phone, pa, pa_len);
     if (rc != EOK) {
 ,6 → 519,7
 int rename(const char *old, const char *new)
 {
+    int res;
     ipcarg_t rc;
     aid_t req;
 ,8 → 537,16
     futex_down(&vfs_phone_futex);
     async_serialize_start();
-    vfs_connect();
+    if (vfs_phone < 0) {
+        res = vfs_connect();
+        if (res < 0) {
+            async_serialize_end();
+            futex_up(&vfs_phone_futex);
+            free(olda);
+            free(newa);
+            return res;
+        }
+    }
     req = async_send_0(vfs_phone, VFS_RENAME, NULL);
     rc = ipc_data_write_start(vfs_phone, olda, olda_len);
     if (rc != EOK) {
 ,7 → 599,6
     cwd_path = pa;
     cwd_len = pa_len;
     futex_up(&cwd_futex);
-    return EOK;
 }
 char *getcwd(char *buf, size_t size)

 /branches/network/uspace/lib/libc/generic/task.c
 ,11 → 34,14
  */
 #include <task.h>
+#include <ipc/ipc.h>
+#include <ipc/loader.h>
 #include <libc.h>
+#include <string.h>
 #include <stdlib.h>
+#include <async.h>
 #include <errno.h>
-#include <loader/loader.h>
-#include <string.h>
+#include <vfs/vfs.h>
 task_id_t task_get_id(void)
 {
 ,72 → 52,134
     return task_id;
 }
-/** Set the task name.
- *
- * @param name  The new name, typically the command used to execute the
- *      program.
- * @return  Zero on success or negative error code.
- */
-int task_set_name(const char *name)
+static int task_spawn_loader(void)
 {
-    return __SYSCALL2(SYS_TASK_SET_NAME, (sysarg_t) name, strlen(name));
+    int phone_id, rc;
+    rc = __SYSCALL1(SYS_PROGRAM_SPAWN_LOADER, (sysarg_t) &phone_id);
+    if (rc != 0)
+        return rc;
+    return phone_id;
 }
-/** Create a new task by running an executable from the filesystem.
+static int loader_set_args(int phone_id, const char *argv[])
+{
+    aid_t req;
+    ipc_call_t answer;
+    ipcarg_t rc;
+    const char **ap;
+    char *dp;
+    char *arg_buf;
+    size_t buffer_size;
+    size_t len;
+    /*
+     * Serialize the arguments into a single array. First
+     * compute size of the buffer needed.
+     */
+    ap = argv;
+    buffer_size = 0;
+    while (*ap != NULL) {
+        buffer_size += strlen(*ap) + 1;
+        ++ap;
+    }
+    arg_buf = malloc(buffer_size);
+    if (arg_buf == NULL) return ENOMEM;
+    /* Now fill the buffer with null-terminated argument strings */
+    ap = argv;
+    dp = arg_buf;
+    while (*ap != NULL) {
+        strcpy(dp, *ap);
+        dp += strlen(*ap) + 1;
+        ++ap;
+    }
+    /* Send serialized arguments to the loader */
+    req = async_send_0(phone_id, LOADER_SET_ARGS, &answer);
+    rc = ipc_data_write_start(phone_id, (void *)arg_buf, buffer_size);
+    if (rc != EOK) {
+        async_wait_for(req, NULL);
+        return rc;
+    }
+    async_wait_for(req, &rc);
+    if (rc != EOK) return rc;
+    /* Free temporary buffer */
+    free(arg_buf);
+    return EOK;
+}
+/** Create a new task by running an executable from VFS.
  *
- * This is really just a convenience wrapper over the more complicated
- * loader API.
- *
  * @param path  pathname of the binary to execute
  * @param argv  command-line arguments
  * @return  ID of the newly created task or zero on error.
  */
-task_id_t task_spawn(const char *path, char *const argv[])
+task_id_t task_spawn(const char *path, const char *argv[])
 {
-    loader_t *ldr;
-    task_id_t task_id;
+    int phone_id;
+    ipc_call_t answer;
+    aid_t req;
     int rc;
+    ipcarg_t retval;
-    /* Connect to a program loader. */
-    ldr = loader_connect();
-    if (ldr == NULL)
+    char *pa;
+    size_t pa_len;
+    pa = absolutize(path, &pa_len);
+    if (!pa)
         return 0;
-    /* Get task ID. */
-    rc = loader_get_task_id(ldr, &task_id);
-    if (rc != EOK)
-        goto error;
+    /* Spawn a program loader */
+    phone_id = task_spawn_loader();
+    if (phone_id < 0)
+        return 0;
-    /* Send program pathname. */
-    rc = loader_set_pathname(ldr, path);
+    /*
+     * Say hello so that the loader knows the incoming connection's
+     * phone hash.
+     */
+    rc = async_req_0_0(phone_id, LOADER_HELLO);
     if (rc != EOK)
-        goto error;
+        return 0;
-    /* Send arguments. */
-    rc = loader_set_args(ldr, argv);
-    if (rc != EOK)
+    /* Send program pathname */
+    req = async_send_0(phone_id, LOADER_SET_PATHNAME, &answer);
+    rc = ipc_data_write_start(phone_id, (void *)pa, pa_len);
+    if (rc != EOK) {
+        async_wait_for(req, NULL);
+        return 1;
+    }
+    async_wait_for(req, &retval);
+    if (retval != EOK)
         goto error;
-    /* Load the program. */
-    rc = loader_load_program(ldr);
+    /* Send arguments */
+    rc = loader_set_args(phone_id, argv);
     if (rc != EOK)
         goto error;
-    /* Run it. */
-    rc = loader_run(ldr);
+    /* Request loader to start the program */
+    rc = async_req_0_0(phone_id, LOADER_RUN);
     if (rc != EOK)
         goto error;
     /* Success */
+    ipc_hangup(phone_id);
+    return 1;
-    free(ldr);
-    return task_id;
     /* Error exit */
 error:
-    loader_abort(ldr);
-    free(ldr);
+    ipc_hangup(phone_id);
     return 0;
 }

 /branches/network/uspace/lib/libc/generic/string.c
 ,6 → 1,5
 /*
  * Copyright (c) 2005 Martin Decky
- * Copyright (c) 2008 Jiri Svoboda
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
 ,11 → 33,96
  */
 #include <string.h>
-#include <stdlib.h>
+#include <unistd.h>
+#include <ctype.h>
 #include <limits.h>
-#include <ctype.h>
+#include <align.h>
+#include <sys/types.h>
 #include <malloc.h>
+/* Dummy implementation of mem/ functions */
+void *memset(void *s, int c, size_t n)
+{
+    char *os = s;
+    while (n--)
+        *(os++) = c;
+    return s;
+}
+struct along {
+    unsigned long n;
+} __attribute__ ((packed));
+static void *unaligned_memcpy(void *dst, const void *src, size_t n)
+{
+    int i, j;
+    struct along *adst = dst;
+    const struct along *asrc = src;
+    for (i = 0; i < n / sizeof(unsigned long); i++)
+        adst[i].n = asrc[i].n;
+    for (j = 0; j < n % sizeof(unsigned long); j++)
+        ((unsigned char *) (((unsigned long *) dst) + i))[j] =
+            ((unsigned char *) (((unsigned long *) src) + i))[j];
+    return (char *) dst;
+}
+void *memcpy(void *dst, const void *src, size_t n)
+{
+    int i, j;
+    if (((long) dst & (sizeof(long) - 1)) ||
+        ((long) src & (sizeof(long) - 1)))
+        return unaligned_memcpy(dst, src, n);
+    for (i = 0; i < n / sizeof(unsigned long); i++)
+        ((unsigned long *) dst)[i] = ((unsigned long *) src)[i];
+    for (j = 0; j < n % sizeof(unsigned long); j++)
+        ((unsigned char *) (((unsigned long *) dst) + i))[j] =
+            ((unsigned char *) (((unsigned long *) src) + i))[j];
+    return (char *) dst;
+}
+void *memmove(void *dst, const void *src, size_t n)
+{
+    int i, j;
+    if (src > dst)
+        return memcpy(dst, src, n);
+    for (j = (n % sizeof(unsigned long)) - 1; j >= 0; j--)
+        ((unsigned char *) ((unsigned long *) dst))[j] =
+            ((unsigned char *) ((unsigned long *) src))[j];
+    for (i = n / sizeof(unsigned long) - 1; i >=0 ; i--)
+        ((unsigned long *) dst)[i] = ((unsigned long *) src)[i];
+    return (char *) dst;
+}
+/** Compare two memory areas.
+ *
+ * @param s1        Pointer to the first area to compare.
+ * @param s2        Pointer to the second area to compare.
+ * @param len       Size of the first area in bytes. Both areas must have
+ *          the same length.
+ * @return      If len is 0, return zero. If the areas match, return
+ *          zero. Otherwise return non-zero.
+ */
+int bcmp(const char *s1, const char *s2, size_t len)
+{
+    for (; len && *s1++ == *s2++; len--)
+        ;
+    return len;
+}
 /** Count the number of characters in the string, not including terminating 0.
  *
  * @param str       String.
 ,37 → 396,5
     return (char *) memcpy(ret, s1, len);
 }
-char *strtok(char *s, const char *delim)
-{
-    static char *next;
-    return strtok_r(s, delim, &next);
-}
-char *strtok_r(char *s, const char *delim, char **next)
-{
-    char *start, *end;
-    if (s == NULL)
-        s = *next;
-    /* Skip over leading delimiters. */
-    while (*s && (strchr(delim, *s) != NULL)) ++s;
-    start = s;
-    /* Skip over token characters. */
-    while (*s && (strchr(delim, *s) == NULL)) ++s;
-    end = s;
-    *next = (*s ? s + 1 : s);
-    if (start == end) {
-        return NULL;    /* No more tokens. */
-    }
-    /* Overwrite delimiter with NULL terminator. */
-    *end = '\0';
-    return start;
-}
 /** @}
  */

 /branches/network/uspace/lib/libc/generic/libc.c
 ,8 → 53,6
 extern char _heap;
 extern int main(int argc, char *argv[]);
-int _errno;
 void _exit(int status)
 {
     thread_exit(status);
 ,6 → 69,8
     f = fibril_setup();
     __tcb_set(f->tcb);
+    open_console();
     /* Save the PCB pointer */
     __pcb = (pcb_t *)pcb_ptr;

/branches/network/uspace/lib/libc/generic/smc.c
34,7 → 34,6

#include <libc.h>
#include <sys/types.h>
#include <smc.h>

int smc_coherence(void *address, size_t size)
{

 /branches/network/uspace/lib/libc/generic/async.c
 ,7 → 483,7
 {
     connection_t *conn;
     unsigned long key;
     conn = malloc(sizeof(*conn));
     if (!conn) {
         if (callid)
 ,7 → 498,7
         conn->call = *call;
     conn->wdata.active = 1; /* We will activate the fibril ASAP */
     conn->cfibril = cfibril;
     conn->wdata.fid = fibril_create(connection_fibril, conn);
     if (!conn->wdata.fid) {
         free(conn);
 ,15 → 506,14
             ipc_answer_0(callid, ENOMEM);
         return NULL;
     }
     /* Add connection to the connection hash table */
     key = conn->in_phone_hash;
     futex_down(&async_futex);
     hash_table_insert(&conn_hash_table, &key, &conn->link);
     futex_up(&async_futex);
     fibril_add_ready(conn->wdata.fid);
     return conn->wdata.fid;
 }
 ,7 → 524,6
  *
  * @param callid    Hash of the incoming call.
  * @param call      Data of the incoming call.
- *
  */
 static void handle_call(ipc_callid_t callid, ipc_call_t *call)
 {
 ,8 → 533,8
         (*interrupt_received)(callid, call);
         _in_interrupt_handler = 0;
         return;
-    }
+    }
     switch (IPC_GET_METHOD(*call)) {
     case IPC_M_CONNECT_ME_TO:
         /* Open new connection with fibril etc. */
 ,11 → 542,11
             client_connection);
         return;
     }
     /* Try to route the call through the connection hash table */
     if (route_call(callid, call))
         return;
     /* Unknown call from unknown phone - hang it up */
     ipc_answer_0(callid, EHANGUP);
 }
 ,17 → 739,23
     ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipc_call_t *dataptr)
 {
     amsg_t *msg;
+    if (_in_interrupt_handler) {
+        printf("Cannot send asynchronous request in interrupt "
+            "handler.\n");
+        _exit(1);
+    }
     msg = malloc(sizeof(*msg));
     msg->done = 0;
     msg->dataptr = dataptr;
     /* We may sleep in the next method, but it will use its own mechanism */
     msg->wdata.active = 1;
     ipc_call_async_4(phoneid, method, arg1, arg2, arg3, arg4, msg,
-        reply_received, !_in_interrupt_handler);
+        reply_received, 1);
     return (aid_t) msg;
 }
 ,17 → 781,23
     ipc_call_t *dataptr)
 {
     amsg_t *msg;
+    if (_in_interrupt_handler) {
+        printf("Cannot send asynchronous request in interrupt "
+            "handler.\n");
+        _exit(1);
+    }
     msg = malloc(sizeof(*msg));
     msg->done = 0;
     msg->dataptr = dataptr;
     /* We may sleep in next method, but it will use its own mechanism */
     msg->wdata.active = 1;
     ipc_call_async_5(phoneid, method, arg1, arg2, arg3, arg4, arg5, msg,
-        reply_received, !_in_interrupt_handler);
+        reply_received, 1);
     return (aid_t) msg;
 }
 ,16 → 884,21
 {
     amsg_t *msg;
+    if (_in_interrupt_handler) {
+        printf("Cannot call async_usleep in interrupt handler.\n");
+        _exit(1);
+    }
     msg = malloc(sizeof(*msg));
     if (!msg)
         return;
     msg->wdata.fid = fibril_get_id();
     msg->wdata.active = 0;
     gettimeofday(&msg->wdata.expires, NULL);
     tv_add(&msg->wdata.expires, timeout);
     futex_down(&async_futex);
     insert_timeout(&msg->wdata);
     /* Leave the async_futex locked when entering this function */

 /branches/network/uspace/lib/libc/generic/time.c
 ,8 → 47,6
 #include <as.h>
 #include <ddi.h>
-#include <time.h>
 /* Pointers to public variables with time */
 struct {
     volatile sysarg_t seconds1;

 /branches/network/uspace/lib/libc/generic/tls.c
 ,7 → 116,7
     tcb_t *tcb;
     size = ALIGN_UP(size, &_tls_alignment);
-    *data = memalign((uintptr_t) &_tls_alignment, sizeof(tcb_t) + size);
+    *data = memalign(&_tls_alignment, sizeof(tcb_t) + size);
     tcb = (tcb_t *) (*data + size);
     tcb->self = tcb;

 /branches/network/uspace/lib/libc/generic/thread.c
 ,8 → 108,8
     uarg->uspace_thread_arg = arg;
     uarg->uspace_uarg = uarg;
-    rc = __SYSCALL4(SYS_THREAD_CREATE, (sysarg_t) uarg, (sysarg_t) name,
-        (sysarg_t) strlen(name), (sysarg_t) tid);
+    rc = __SYSCALL3(SYS_THREAD_CREATE, (sysarg_t) uarg, (sysarg_t) name,
+        (sysarg_t) tid);
     if (rc) {
         /*

 /branches/network/uspace/lib/libc/generic/ddi.c
 ,42 → 33,26
  */
 #include <ddi.h>
-#include <libarch/ddi.h>
 #include <libc.h>
 #include <task.h>
-#include <as.h>
-#include <align.h>
-#include <libarch/config.h>
 #include <kernel/ddi/ddi_arg.h>
-/** Return unique device number.
- *
- * @return New unique device number.
- *
- */
-int device_assign_devno(void)
-{
-    return __SYSCALL0(SYS_DEVICE_ASSIGN_DEVNO);
-}
 /** Map piece of physical memory to task.
  *
  * Caller of this function must have the CAP_MEM_MANAGER capability.
  *
- * @param pf        Physical address of the starting frame.
- * @param vp        Virtual address of the starting page.
- * @param pages     Number of pages to map.
- * @param flags     Flags for the new address space area.
+ * @param pf Physical address of the starting frame.
+ * @param vp Virtual address of the sterting page.
+ * @param pages Number of pages to map.
+ * @param flags Flags for the new address space area.
  *
- * @return      0 on success, EPERM if the caller lacks the
- *          CAP_MEM_MANAGER capability, ENOENT if there is no task
- *          with specified ID and ENOMEM if there was some problem
- *          in creating address space area.
+ * @return 0 on success, EPERM if the caller lacks the CAP_MEM_MANAGER capability,
+ *     ENOENT if there is no task with specified ID and ENOMEM if there
+ *     was some problem in creating address space area.
  */
 int physmem_map(void *pf, void *vp, unsigned long pages, int flags)
 {
-    return __SYSCALL4(SYS_PHYSMEM_MAP, (sysarg_t) pf, (sysarg_t) vp, pages,
-        flags);
+    return __SYSCALL4(SYS_PHYSMEM_MAP, (sysarg_t) pf, (sysarg_t) vp, pages, flags);
 }
 /** Enable I/O space range to task.
 ,14 → 59,13
  *
  * Caller of this function must have the IO_MEM_MANAGER capability.
  *
- * @param id        Task ID.
- * @param ioaddr    Starting address of the I/O range.
- * @param size      Size of the range.
+ * @param id Task ID.
+ * @param ioaddr Starting address of the I/O range.
+ * @param size Size of the range.
  *
- * @return      0 on success, EPERM if the caller lacks the
- *          CAP_IO_MANAGER capability, ENOENT if there is no task
- *          with specified ID and ENOMEM if there was some problem
- *          in allocating memory.
+ * @return 0 on success, EPERM if the caller lacks the CAP_IO_MANAGER capability,
+ *     ENOENT if there is no task with specified ID and ENOMEM if there
+ *     was some problem in allocating memory.
  */
 int iospace_enable(task_id_t id, void *ioaddr, unsigned long size)
 {
 ,7 → 80,7
 /** Interrupt control
  *
- * @param enable    1 - enable interrupts, 0 - disable interrupts
+ * @param enable 1 - enable interrupts, 0 - disable interrupts
  */
 int preemption_control(int enable)
 {
 ,36 → 87,5
     return __SYSCALL1(SYS_PREEMPT_CONTROL, (sysarg_t) enable);
 }
-/** Enable PIO for specified I/O range.
- *
- * @param pio_addr  I/O start address.
- * @param size      Size of the I/O region.
- * @param use_addr  Address where the final address for application's PIO
- *          will be stored.
- *
- * @return      Zero on success or negative error code.
- */
-int pio_enable(void *pio_addr, size_t size, void **use_addr)
-{
-    void *phys;
-    void *virt;
-    size_t offset;
-    unsigned int pages;
-#ifdef IO_SPACE_BOUNDARY
-    if (pio_addr < IO_SPACE_BOUNDARY) {
-        *use_addr = pio_addr;
-        return iospace_enable(task_get_id(), pio_addr, size);
-    }
-#endif
-    phys = ALIGN_DOWN((uintptr_t) pio_addr, PAGE_SIZE);
-    offset = pio_addr - phys;
-    pages = ALIGN_UP(offset + size, PAGE_SIZE) >> PAGE_WIDTH;
-    virt = as_get_mappable_page(pages);
-    *use_addr = virt + offset;
-    return physmem_map(phys, virt, pages, AS_AREA_READ | AS_AREA_WRITE);
-}
 /** @}
  */

 /branches/network/uspace/lib/libc/Makefile
 ,6 → 31,7
 LIBC_PREFIX = $(shell pwd)
 SOFTINT_PREFIX = ../softint
+CONSOLE_PREFIX = ../../srv/console
 ## Setup toolchain
 #
 ,17 → 38,17
 include $(LIBC_PREFIX)/Makefile.toolchain
+CFLAGS += -I$(CONSOLE_PREFIX)
 ## Sources
 #
 GENERIC_SOURCES = \
     generic/libc.c \
     generic/ddi.c \
     generic/as.c \
     generic/cap.c \
-    generic/console.c \
-    generic/mem.c \
     generic/string.c \
     generic/fibril.c \
     generic/pcb.c \
 ,8 → 60,6
     generic/io/asprintf.c \
     generic/io/io.c \
     generic/io/printf.c \
-    generic/io/fprintf.c \
-    generic/io/stdio.c \
     generic/io/stream.c \
     generic/io/sprintf.c \
     generic/io/snprintf.c \
 ,7 → 71,6
     generic/sysinfo.c \
     generic/ipc.c \
     generic/async.c \
-    generic/loader.c \
     generic/getopt.c \
     generic/libadt/list.o \
     generic/libadt/hash_table.o \
 ,42 → 77,39
     generic/time.c \
     generic/err.c \
     generic/stdlib.c \
-    generic/kbd.c \
     generic/mman.c \
-    generic/udebug.c \
     generic/vfs/vfs.c \
     generic/vfs/canonify.c
 ARCH_SOURCES += \
-    arch/$(UARCH)/src/entry.s \
-    arch/$(UARCH)/src/thread_entry.s
+    arch/$(ARCH)/src/entry.s \
+    arch/$(ARCH)/src/thread_entry.s
 GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
 ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))
-OBJECTS := $(GENERIC_OBJECTS) $(ARCH_OBJECTS)
 .PHONY: all clean depend kerninc
-all: kerninc libc.a arch/$(UARCH)/_link.ld
+all: kerninc libc.a arch/$(ARCH)/_link.ld
 kerninc:
     ln -sfn ../../../../kernel/generic/include include/kernel
     ln -sfn kernel/arch include/arch
-    ln -sfn ../arch/$(UARCH)/include include/libarch
+    ln -sfn ../arch/$(ARCH)/include include/libarch
 -include Makefile.depend
 clean:
-    -rm -f include/kernel include/arch include/libarch libc.a arch/$(UARCH)/_link.ld Makefile.depend
-    find generic/ arch/$(UARCH)/ malloc -name '*.o' -follow -exec rm \{\} \;
+    -rm -f include/kernel include/arch include/libarch libc.a arch/$(ARCH)/_link.ld Makefile.depend
+    find generic/ arch/$(ARCH)/ -name '*.o' -follow -exec rm \{\} \;
 depend: kerninc
-    -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
+    -makedepend $(DEFS) $(CFLAGS) -f - $(ARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
 libc.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
     $(AR) rc libc.a $(LIBS) $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
-arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in
+arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
     $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
 %.o: %.S

 /branches/network/uspace/lib/libc/Makefile.toolchain
 ,23 → 26,16
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-CFLAGS = -fno-builtin -Wall -Werror-implicit-function-declaration -Wmissing-prototypes -O3 -nostdlib -nostdinc -imacros $(LIBC_PREFIX)/../../../config.h -I$(LIBC_PREFIX)/include -pipe -g
+DEFS = -DARCH=$(ARCH)
+CFLAGS = -fno-builtin -Wall -Werror-implicit-function-declaration -Wmissing-prototypes -O3 -nostdlib -nostdinc -I$(LIBC_PREFIX)/include
 LFLAGS = -M -N $(SOFTINT_PREFIX)/libsoftint.a
 AFLAGS =
+#-Werror
-## Cross-toolchain prefix
-#
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 ## Setup platform configuration
 #
--include $(LIBC_PREFIX)/../../../Makefile.config
--include $(LIBC_PREFIX)/../../../config.defs
--include $(LIBC_PREFIX)/arch/$(UARCH)/Makefile.inc
+include $(LIBC_PREFIX)/arch/$(ARCH)/Makefile.inc
 ## Simple detection of the host system
 #
 ,7 → 59,6
     AR = $(BINUTILS_PREFIX)ar
     OBJCOPY = $(BINUTILS_PREFIX)objcopy
     OBJDUMP = $(BINUTILS_PREFIX)objdump
-    DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 ifeq ($(COMPILER),icc_native)
 ,7 → 68,6
     AR = ar
     OBJCOPY = objcopy
     OBJDUMP = objdump
-    DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 ifeq ($(COMPILER),gcc_cross)
 ,5 → 77,5
     AR = $(TOOLCHAIN_DIR)/$(TARGET)-ar
     OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy
     OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
-    DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif

 /branches/network/uspace/lib/libfs/libfs.c
 ,6 → 36,7
 #include "libfs.h"
 #include "../../srv/vfs/vfs.h"
+#include "../../srv/rd/rd.h"
 #include <errno.h>
 #include <async.h>
 #include <ipc/ipc.h>
 ,20 → 192,17
                 }
                 void *nodep;
                 if (lflag & L_CREATE)
-                    nodep = ops->create(dev_handle, lflag);
+                    nodep = ops->create(lflag);
                 else
                     nodep = ops->node_get(dev_handle,
                         index);
                 if (nodep) {
-                    int rc;
-                    rc = ops->link(cur, nodep, component);
-                    if (rc != EOK) {
+                    if (!ops->link(cur, nodep, component)) {
                         if (lflag & L_CREATE) {
                             (void)ops->destroy(
                                 nodep);
                         }
-                        ipc_answer_0(rid, rc);
+                        ipc_answer_0(rid, ENOSPC);
                     } else {
                         ipc_answer_5(rid, EOK,
                             fs_handle, dev_handle,
 ,17 → 263,14
             void *nodep;
             if (lflag & L_CREATE)
-                nodep = ops->create(dev_handle, lflag);
+                nodep = ops->create(lflag);
             else
                 nodep = ops->node_get(dev_handle, index);
             if (nodep) {
-                int rc;
-                rc = ops->link(cur, nodep, component);
-                if (rc != EOK) {
+                if (!ops->link(cur, nodep, component)) {
                     if (lflag & L_CREATE)
                         (void)ops->destroy(nodep);
-                    ipc_answer_0(rid, rc);
+                    ipc_answer_0(rid, ENOSPC);
                 } else {
                     ipc_answer_5(rid, EOK,
                         fs_handle, dev_handle,
 ,5 → 331,62
         ops->node_put(tmp);
 }
+/** Read data from a block device.
+ *
+ * @param phone     Phone to be used to communicate with the device.
+ * @param buffer    Communication buffer shared with the device.
+ * @param bufpos    Pointer to the first unread valid offset within the
+ *          communication buffer.
+ * @param buflen    Pointer to the number of unread bytes that are ready in
+ *          the communication buffer.
+ * @param pos       Device position to be read.
+ * @param dst       Destination buffer.
+ * @param size      Size of the destination buffer.
+ * @param block_size    Block size to be used for the transfer.
+ *
+ * @return      True on success, false on failure.
+ */
+bool libfs_blockread(int phone, void *buffer, off_t *bufpos, size_t *buflen,
+    off_t *pos, void *dst, size_t size, size_t block_size)
+{
+    off_t offset = 0;
+    size_t left = size;
+    while (left > 0) {
+        size_t rd;
+        if (*bufpos + left < *buflen)
+            rd = left;
+        else
+            rd = *buflen - *bufpos;
+        if (rd > 0) {
+            /*
+             * Copy the contents of the communication buffer to the
+             * destination buffer.
+             */
+            memcpy(dst + offset, buffer + *bufpos, rd);
+            offset += rd;
+            *bufpos += rd;
+            *pos += rd;
+            left -= rd;
+        }
+        if (*bufpos == *buflen) {
+            /* Refill the communication buffer with a new block. */
+            ipcarg_t retval;
+            int rc = async_req_2_1(phone, RD_READ_BLOCK,
+                *pos / block_size, block_size, &retval);
+            if ((rc != EOK) || (retval != EOK))
+                return false;
+            *bufpos = 0;
+            *buflen = block_size;
+        }
+    }
+    return true;
+}
 /** @}
  */

 /branches/network/uspace/lib/libfs/libfs.h
 ,9 → 45,9
     void * (* match)(void *, const char *);
     void * (* node_get)(dev_handle_t, fs_index_t);
     void (* node_put)(void *);
-    void * (* create)(dev_handle_t, int);
+    void * (* create)(int);
     int (* destroy)(void *);
-    int (* link)(void *, void *, const char *);
+    bool (* link)(void *, void *, const char *);
     int (* unlink)(void *, void *);
     fs_index_t (* index_get)(void *);
     size_t (* size_get)(void *);
 ,6 → 69,9
 extern void libfs_lookup(libfs_ops_t *, fs_handle_t, ipc_callid_t, ipc_call_t *);
+extern bool libfs_blockread(int, void *, off_t *, size_t *, off_t *, void *,
+    size_t, size_t);
 #endif
 /** @}

 /branches/network/uspace/lib/libfs/Makefile
 ,7 → 31,6
 #
 LIBC_PREFIX = ../libc
 ## Setup toolchain
 #
 ,7 → 57,7
     find . -name '*.o' -follow -exec rm \{\} \;
 depend:
-    -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > Makefile.depend 2> /dev/null
+    -makedepend $(DEFS) $(CFLAGS) -f - $(SOURCES) > Makefile.depend 2> /dev/null
 libfs.a: depend $(OBJECTS)
     $(AR) rc libfs.a $(OBJECTS)

 /branches/network/uspace/lib/softfloat/arch/ppc64/include/functions.h
 ,0 → 1,76
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * 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 softfloatppc64 ppc64
+ * @ingroup sfl
+ * @brief softfloat architecture dependent definitions
+ * @{
+ */
+/** @file
+ */
+#ifndef __SOFTFLOAT_FUNCTIONS_H__
+#define __SOFTFLOAT_FUNCTIONS_H__
+#define float32_to_int(X) float32_to_int32(X);
+#define float32_to_long(X) float32_to_int64(X);
+#define float32_to_longlong(X) float32_to_int64(X);
+#define float64_to_int(X) float64_to_int32(X);
+#define float64_to_long(X) float64_to_int64(X);
+#define float64_to_longlong(X) float64_to_int64(X);
+#define float32_to_uint(X) float32_to_uint32(X);
+#define float32_to_ulong(X) float32_to_uint64(X);
+#define float32_to_ulonglong(X) float32_to_uint64(X);
+#define float64_to_uint(X) float64_to_uint32(X);
+#define float64_to_ulong(X) float64_to_uint64(X);
+#define float64_to_ulonglong(X) float64_to_uint64(X);
+#define int_to_float32(X) int32_to_float32(X);
+#define long_to_float32(X) int64_to_float32(X);
+#define longlong_to_float32(X) int64_to_float32(X);
+#define int_to_float64(X) int32_to_float64(X);
+#define long_to_float64(X) int64_to_float64(X);
+#define longlong_to_float64(X) int64_to_float64(X);
+#define uint_to_float32(X) uint32_to_float32(X);
+#define ulong_to_float32(X) uint64_to_float32(X);
+#define ulonglong_to_float32(X) uint64_to_float32(X);
+#define uint_to_float64(X) uint32_to_float64(X);
+#define ulong_to_float64(X) uint64_to_float64(X);
+#define ulonglong_to_float64(X) uint64_to_float64(X);
+#endif
+ /** @}
+ */

 /branches/network/uspace/lib/softfloat/Makefile
 ,26 → 30,25
 #
 LIBC_PREFIX = ../libc
 ## Setup toolchain
 #
 include $(LIBC_PREFIX)/Makefile.toolchain
-CFLAGS +=-Iinclude -Iarch/$(UARCH)/include/
+CFLAGS +=-Iinclude -Iarch/$(ARCH)/include/
 ## Sources
 #
-GENERIC_SOURCES = \
-    generic/add.c \
-    generic/common.c \
-    generic/comparison.c \
-    generic/conversion.c \
-    generic/div.c \
-    generic/mul.c \
-    generic/other.c \
-    generic/softfloat.c \
+GENERIC_SOURCES =       \
+    generic/add.c       \
+    generic/common.c    \
+    generic/comparison.c    \
+    generic/conversion.c    \
+    generic/div.c       \
+    generic/mul.c       \
+    generic/other.c     \
+    generic/softfloat.c \
     generic/sub.c
 ARCH_SOURCES =
 ,7 → 66,7
     find generic/ -name '*.o' -follow -exec rm \{\} \;
 depend:
-    -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
+    -makedepend $(DEFS) $(CFLAGS) -f - $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
 libsoftfloat.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
     $(AR) rc libsoftfloat.a $(ARCH_OBJECTS) $(GENERIC_OBJECTS)

 /branches/network/uspace/lib/softint/Makefile
 ,7 → 30,6
 #
 LIBC_PREFIX = ../libc
 ## Setup toolchain
 #
 ,7 → 58,7
     find generic/ -name '*.o' -follow -exec rm \{\} \;
 depend:
-    -makedepend -f - -- $(DEPEMD_DEFS) $(CFLAGS) -- $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
+    -makedepend $(DEFS) $(CFLAGS) -f - $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
 libsoftint.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
     $(AR) rc libsoftint.a $(ARCH_OBJECTS) $(GENERIC_OBJECTS)

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4153 → Rev 4152