Changeset 90f5d64 in mainline for libc


Ignore:
Timestamp:
2006-06-03T14:54:51Z (20 years ago)
Author:
Ondrej Palkovsky <ondrap@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
dc5a0fe1
Parents:
0861786
Message:

AS_AREA_CACHEABLE not needed anymore for sharing.
Added icons to console.

Location:
libc
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • libc/arch/amd64/Makefile.inc

    r0861786 r90f5d64  
    3838
    3939LFLAGS += -N
     40
     41BFD_NAME = elf64-x86-64
     42BFD_ARCH = i386:x86-64

  • libc/arch/ia32/Makefile.inc

    r0861786 r90f5d64  
    3838
    3939LFLAGS += -N
     40
     41BFD_NAME = elf32-i386
     42BFD_ARCH = i386

  • libc/arch/ia64/Makefile.inc

    r0861786 r90f5d64  
    3939                arch/$(ARCH)/src/psthread.S \
    4040                arch/$(ARCH)/src/thread.c
     41
     42BFD_NAME = elf64-little
     43BFD_ARCH = ia64-elf64

  • libc/arch/mips32/Makefile.inc

    r0861786 r90f5d64  
    3838        arch/$(ARCH)/src/thread.c
    3939
    40 
     40BFD_ARCH = mips
     41BFD_NAME = elf32-little

  • libc/arch/mips32eb/Makefile.inc

    r0861786 r90f5d64  
    3232TARGET = mips-sgi-irix5
    3333TOOLCHAIN_DIR = /usr/local/mips/bin
    34 CFLAGS += -mno-abicalls -mips3
     34CFLAGS += -mips3
    3535
    36 ARCH_SOURCES += arch/$(ARCH)/src/syscall.c
     36ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
     37                arch/$(ARCH)/src/psthread.S \
     38                arch/$(ARCH)/src/thread.c
    3739
    3840LFLAGS += -N
    3941
     42BFD_ARCH = mips
     43BFD_NAME = elf32-big

  • libc/arch/ppc32/Makefile.inc

    r0861786 r90f5d64  
    4040AFLAGS += -a32
    4141LFLAGS += -N
     42
     43BFD_NAME = elf32-powerpc
     44BFD_ARCH = powerpc:common

  • libc/generic/async.c

    r0861786 r90f5d64  
    624624}
    625625
     626/** Send message and return id of the sent message
     627 *
     628 * The return value can be used as input for async_wait() to wait
     629 * for completion.
     630 */
     631aid_t async_send_3(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2,
     632                   ipcarg_t arg3, ipc_call_t *dataptr)
     633{
     634        amsg_t *msg;
     635
     636        msg = malloc(sizeof(*msg));
     637        msg->done = 0;
     638        msg->dataptr = dataptr;
     639
     640        msg->wdata.active = 1; /* We may sleep in next method, but it
     641                                * will use it's own mechanism */
     642        ipc_call_async_3(phoneid,method,arg1,arg2,arg3, msg,reply_received,1);
     643
     644        return (aid_t) msg;
     645}
     646
    626647/** Wait for a message sent by async framework
    627648 *

  • libc/generic/mmap.c

    r0861786 r90f5d64  
    3434           off_t offset)
    3535{
     36        int rc;
     37
    3638        if (!start)
    3739                start = as_get_mappable_page(length);
    3840       
    39         prot |= AS_AREA_CACHEABLE;
    40        
    4141//      if (! ((flags & MAP_SHARED) ^ (flags & MAP_PRIVATE)))
    42 //              return NULL;
     42//              return MAP_FAILED;
    4343        if (! (flags & MAP_ANONYMOUS))
    44                 return NULL;
     44                return MAP_FAILED;
    4545
    4646        return as_area_create(start, length, prot);

  • libc/generic/time.c

    r0861786 r90f5d64  
    7474                        _exit(1);
    7575                }
    76                 if (rights != (AS_AREA_READ | AS_AREA_CACHEABLE)) {
     76                if (! (rights & AS_AREA_READ)) {
    7777                        printf("Received bad rights on time area: %X\n",
    7878                               rights);

  • libc/include/async.h

    r0861786 r90f5d64  
    4747aid_t async_send_2(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2,
    4848                   ipc_call_t *dataptr);
     49aid_t async_send_3(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2,
     50                   ipcarg_t arg3, ipc_call_t *dataptr);
    4951void async_wait_for(aid_t amsgid, ipcarg_t *result);
    5052int async_wait_timeout(aid_t amsgid, ipcarg_t *retval, suseconds_t timeout);
    … …  
    6971        return rc;
    7072}
     73static inline ipcarg_t sync_send_3(int phoneid, ipcarg_t method, ipcarg_t arg1,
     74                                   ipcarg_t arg2, ipcarg_t arg3, ipcarg_t *r1,
     75                                   ipcarg_t *r2, ipcarg_t *r3)
     76{
     77        ipc_call_t result;
     78        ipcarg_t rc;
     79
     80        aid_t eid = async_send_3(phoneid, method, arg1, arg2, arg3, &result);
     81        async_wait_for(eid, &rc);
     82        if (r1)
     83                *r1 = IPC_GET_ARG1(result);
     84        if (r2)
     85                *r2 = IPC_GET_ARG2(result);
     86        if (r3)
     87                *r3 = IPC_GET_ARG3(result);
     88        return rc;
     89}
    7190
    7291

  • libc/include/ipc/fb.h

    r0861786 r90f5d64  
    2121#define FB_FLUSH             1037
    2222
     23#define FB_DRAW_PPM          1038
     24#define FB_PREPARE_SHM       1039
     25#define FB_DROP_SHM          1040
     26
    2327#endif

  • libc/include/sys/mman.h

    r0861786 r90f5d64  
    3232#include <as.h>
    3333
     34#define MAP_FAILED  ((void *) -1)
     35
    3436#define MAP_SHARED       (1 << 0)
    3537#define MAP_PRIVATE      (1 << 1)
Note: See TracChangeset for help on using the changeset viewer.