diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-18 14:10:49 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-06-18 13:53:24 +0000 |
commit | 813fbf95af77a531c57a8c497345ad2c61d475b3 (patch) | |
tree | 821b2c8de8365f21b6c9ba17a236fb3006a1d506 /chromium/third_party/lss | |
parent | af6588f8d723931a298c995fa97259bb7f7deb55 (diff) | |
download | qtwebengine-chromium-813fbf95af77a531c57a8c497345ad2c61d475b3.tar.gz |
BASELINE: Update chromium to 44.0.2403.47
Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/third_party/lss')
-rw-r--r-- | chromium/third_party/lss/linux_syscall_support.h | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h index 1fe0ae89e9e..a143fc2835e 100644 --- a/chromium/third_party/lss/linux_syscall_support.h +++ b/chromium/third_party/lss/linux_syscall_support.h @@ -2579,7 +2579,7 @@ struct kernel_statfs { #define LSS_BODY(type,name,r7,...) \ register unsigned long __v0 __asm__("$2") = __NR_##name; \ __asm__ __volatile__ ("syscall\n" \ - : "+r"(__v0), r7 (__r7) \ + : "=r"(__v0), r7 (__r7) \ : "0"(__v0), ##__VA_ARGS__ \ : LSS_SYSCALL_CLOBBERS); \ LSS_RETURN(type, __v0, __r7) @@ -2695,7 +2695,7 @@ struct kernel_statfs { LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack, int flags, void *arg, int *parent_tidptr, void *newtls, int *child_tidptr) { - register unsigned long __v0 __asm__("$2"); + register unsigned long __v0 __asm__("$2") = -EINVAL; register unsigned long __r7 __asm__("$7") = (unsigned long)newtls; { register int __flags __asm__("$4") = flags; @@ -2714,25 +2714,24 @@ struct kernel_statfs { /* if (fn == NULL || child_stack == NULL) * return -EINVAL; */ - "li %0,%2\n" + "beqz %4,1f\n" "beqz %5,1f\n" - "beqz %6,1f\n" /* Push "arg" and "fn" onto the stack that will be * used by the child. */ #if _MIPS_SIM == _MIPS_SIM_ABI32 && _MIPS_SZPTR == 32 - "subu %6,32\n" - "sw %5,0(%6)\n" - "sw %8,4(%6)\n" + "subu %5,32\n" + "sw %4,0(%5)\n" + "sw %7,4(%5)\n" #elif _MIPS_SIM == _MIPS_SIM_NABI32 - "sub %6,32\n" - "sw %5,0(%6)\n" - "sw %8,8(%6)\n" + "sub %5,32\n" + "sw %4,0(%5)\n" + "sw %7,8(%5)\n" #else - "dsubu %6,32\n" - "sd %5,0(%6)\n" - "sd %8,8(%6)\n" + "dsubu %5,32\n" + "sd %4,0(%5)\n" + "sd %7,8(%5)\n" #endif /* $7 = syscall($4 = flags, @@ -2741,7 +2740,7 @@ struct kernel_statfs { * $7 = newtls, * $8 = child_tidptr) */ - "li $2,%3\n" + "li $2,%2\n" "syscall\n" /* if ($7 != 0) @@ -2767,7 +2766,7 @@ struct kernel_statfs { /* Call _exit($2) */ "move $4,$2\n" - "li $2,%4\n" + "li $2,%3\n" "syscall\n" "1:\n" @@ -2779,9 +2778,9 @@ struct kernel_statfs { "daddu $29,16\n" #endif : "+r" (__v0), "+r" (__r7) - : "i"(-EINVAL), "i"(__NR_clone), "i"(__NR_exit), - "r"(fn), "r"(__stack), "r"(__flags), "r"(arg), - "r"(__ptid), "r"(__r7), "r"(__ctid) + : "i"(__NR_clone), "i"(__NR_exit), "r"(fn), + "r"(__stack), "r"(__flags), "r"(arg), + "r"(__ptid), "r"(__ctid) : "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", "$25", "memory"); } @@ -3742,7 +3741,7 @@ struct kernel_statfs { register unsigned long __v1 __asm__("$3"); register unsigned long __r7 __asm__("$7"); __asm__ __volatile__ ("syscall\n" - : "+r"(__v0), "=r"(__v1), "=r" (__r7) + : "=r"(__v0), "=r"(__v1), "=r" (__r7) : "0"(__v0) : "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", "$25", "memory"); @@ -3881,6 +3880,8 @@ struct kernel_statfs { loff_t, o) LSS_INLINE _syscall3(int, readahead, int, f, loff_t, o, unsigned, c) + LSS_INLINE _syscall6(void *, mmap, void *, addr, size_t, length, int, prot, + int, flags, int, fd, int64_t, offset) #else #define __NR__pread64 __NR_pread64 #define __NR__pwrite64 __NR_pwrite64 @@ -3944,7 +3945,7 @@ struct kernel_statfs { LSS_INLINE _syscall2(int, pipe2, int *, pipefd, int, flags) LSS_INLINE _syscall5(int, ppoll, struct kernel_pollfd *, u, unsigned int, n, const struct kernel_timespec *, t, - const kernel_sigset_t *, sigmask, size_t, s) + const struct kernel_sigset_t *, sigmask, size_t, s) LSS_INLINE _syscall4(int, readlinkat, int, d, const char *, p, char *, b, size_t, s) #endif |