Commit f777501c authored by Blue Swirl's avatar Blue Swirl
Browse files

Merge branch 'axp-next' of git://repo.or.cz/qemu/rth 

* 'axp-next' of git://repo.or.cz/qemu/rth:
  alpha-linux-user: Fix the getpriority syscall
  alpha-linux-user: Properly handle the non-rt sigprocmask syscall.
  alpha-linux-user: Fix a3 error return with v0 error bypass.
  linux-user: Translate pipe2 flags; add to strace
  linux-user: Allocate the right amount of space for non-fixed file maps
  linux-user: Handle O_SYNC, O_NOATIME, O_CLOEXEC, O_PATH
  linux-user: Sync fcntl.h bits with the kernel
  alpha-linux-user: Handle TARGET_SSI_IEEE_RAISE_EXCEPTION properly
  alpha-linux-user: Work around hosted mmap allocation problems
  alpha-linux-user: Fix signal handling
parents 17a4ed8a 95c09828

linux-user/alpha/syscall_nr.h

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
#define TARGET_NR_open		 45

#define TARGET_NR_osf_old_sigaction	 46	/* not implemented */

#define TARGET_NR_getxgid		 47

#define TARGET_NR_osf_sigprocmask	 48

#define TARGET_NR_sigprocmask    48

#define TARGET_NR_osf_getlogin	 49	/* not implemented */

#define TARGET_NR_osf_setlogin	 50	/* not implemented */

#define TARGET_NR_acct		 51

linux-user/main.c

+8 −7
Original line number Diff line number Diff line
@@ -2846,13 +2846,11 @@ void cpu_loop(CPUAlphaState *env) 
                    break;

                }

                /* Syscall writes 0 to V0 to bypass error check, similar

                   to how this is handled internal to Linux kernel.  */

                if (env->ir[IR_V0] == 0) {

                    env->ir[IR_V0] = sysret;

                } else {

                    env->ir[IR_V0] = (sysret < 0 ? -sysret : sysret);

                    env->ir[IR_A3] = (sysret < 0);

                }

                   to how this is handled internal to Linux kernel.

                   (Ab)use trapnr temporarily as boolean indicating error.  */

                trapnr = (env->ir[IR_V0] != 0 && sysret < 0);

                env->ir[IR_V0] = (trapnr ? -sysret : sysret);

                env->ir[IR_A3] = trapnr;

                break;

            case 0x86:

                /* IMB */
@@ -2921,6 +2919,9 @@ void cpu_loop(CPUAlphaState *env) 
        case EXCP_STQ_C:

            do_store_exclusive(env, env->error_code, trapnr - EXCP_STL_C);

            break;

        case EXCP_INTERRUPT:

            /* Just indicate that signals should be handled asap.  */

            break;

        default:

            printf ("Unhandled trap: 0x%x\n", trapnr);

            cpu_dump_state(env, stderr, fprintf, 0);

linux-user/mmap.c

+19 −11
Original line number Diff line number Diff line
@@ -382,7 +382,6 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, 
                     int flags, int fd, abi_ulong offset)

{

    abi_ulong ret, end, real_start, real_end, retaddr, host_offset, host_len;

    unsigned long host_start;



    mmap_lock();

#ifdef DEBUG_MMAP
@@ -421,6 +420,19 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, 
    if (len == 0)

        goto the_end;

    real_start = start & qemu_host_page_mask;

    host_offset = offset & qemu_host_page_mask;



    /* If the user is asking for the kernel to find a location, do that

       before we truncate the length for mapping files below.  */

    if (!(flags & MAP_FIXED)) {

        host_len = len + offset - host_offset;

        host_len = HOST_PAGE_ALIGN(host_len);

        start = mmap_find_vma(real_start, host_len);

        if (start == (abi_ulong)-1) {

            errno = ENOMEM;

            goto fail;

        }

    }



    /* When mapping files into a memory area larger than the file, accesses

       to pages beyond the file size will cause a SIGBUS.
@@ -453,27 +465,23 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, 
    }



    if (!(flags & MAP_FIXED)) {

        abi_ulong mmap_start;

        unsigned long host_start;

        void *p;

        host_offset = offset & qemu_host_page_mask;



        host_len = len + offset - host_offset;

        host_len = HOST_PAGE_ALIGN(host_len);

        mmap_start = mmap_find_vma(real_start, host_len);

        if (mmap_start == (abi_ulong)-1) {

            errno = ENOMEM;

            goto fail;

        }



        /* Note: we prefer to control the mapping address. It is

           especially important if qemu_host_page_size >

           qemu_real_host_page_size */

        p = mmap(g2h(mmap_start),

                 host_len, prot, flags | MAP_FIXED | MAP_ANONYMOUS, -1, 0);

        p = mmap(g2h(start), host_len, prot,

                 flags | MAP_FIXED | MAP_ANONYMOUS, -1, 0);

        if (p == MAP_FAILED)

            goto fail;

        /* update start so that it points to the file position at 'offset' */

        host_start = (unsigned long)p;

        if (!(flags & MAP_ANONYMOUS)) {

            p = mmap(g2h(mmap_start), len, prot, 

            p = mmap(g2h(start), len, prot,

                     flags | MAP_FIXED, fd, host_offset);

            host_start += offset - host_offset;

        }

linux-user/strace.c

+11 −1
Original line number Diff line number Diff line
@@ -371,10 +371,20 @@ UNUSED static struct flags open_flags[] = { 
    FLAG_TARGET(O_NOCTTY),

    FLAG_TARGET(O_NOFOLLOW),

    FLAG_TARGET(O_NONBLOCK),      /* also O_NDELAY */

    FLAG_TARGET(O_SYNC),

    FLAG_TARGET(O_DSYNC),

    FLAG_TARGET(__O_SYNC),

    FLAG_TARGET(O_TRUNC),

#ifdef O_DIRECT

    FLAG_TARGET(O_DIRECT),

#endif

#ifdef O_NOATIME

    FLAG_TARGET(O_NOATIME),

#endif

#ifdef O_CLOEXEC

    FLAG_TARGET(O_CLOEXEC),

#endif

#ifdef O_PATH

    FLAG_TARGET(O_PATH),

#endif

    FLAG_END,

};

linux-user/strace.list

+3 −0
Original line number Diff line number Diff line
@@ -1527,3 +1527,6 @@ 
#ifdef TARGET_NR_sync_file_range2

{ TARGET_NR_sync_file_range2, "sync_file_range2", NULL, NULL, NULL },

#endif

#ifdef TARGET_NR_pipe2

{ TARGET_NR_pipe2, "pipe2", NULL, NULL, NULL },

#endif