From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13827 invoked by alias); 29 Aug 2018 13:50:26 -0000 Mailing-List: contact newlib-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: newlib-cvs-owner@sourceware.org Received: (qmail 13498 invoked by uid 9078); 29 Aug 2018 13:50:25 -0000 Date: Wed, 29 Aug 2018 13:50:00 -0000 Message-ID: <20180829135025.13492.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] RISC-V: Fix _sbrk, it's failed only when return value is -1. X-Act-Checkin: newlib-cygwin X-Git-Author: Denis Ivanov X-Git-Refname: refs/heads/master X-Git-Oldrev: 258996b696acc2efda5cc10390d373660157b22c X-Git-Newrev: 9e032fd939a188b38ab36b6e94c93056ed347952 X-SW-Source: 2018-q3/txt/msg00101.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=9e032fd939a188b38ab36b6e94c93056ed347952 commit 9e032fd939a188b38ab36b6e94c93056ed347952 Author: Denis Ivanov Date: Fri Jul 6 19:03:23 2018 +0300 RISC-V: Fix _sbrk, it's failed only when return value is -1. Signed-off-by: Kito Cheng Diff: --- libgloss/riscv/internal_syscall.h | 11 ++++++++--- libgloss/riscv/sys_sbrk.c | 8 ++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/libgloss/riscv/internal_syscall.h b/libgloss/riscv/internal_syscall.h index 8f7dcb4..e5d5594 100644 --- a/libgloss/riscv/internal_syscall.h +++ b/libgloss/riscv/internal_syscall.h @@ -40,13 +40,18 @@ __internal_syscall(long n, long _a0, long _a1, long _a2, long _a3, long _a4, lon asm volatile ("scall" : "+r"(a0) : "r"(a1), "r"(a2), "r"(a3), "r"(a4), "r"(a5), "r"(syscall_id)); + return a0; +} + +static inline long +syscall_errno(long n, long _a0, long _a1, long _a2, long _a3, long _a4, long _a5) +{ + long a0 = __internal_syscall (n, _a0, _a1, _a2, _a3, _a4, _a5); + if (a0 < 0) return __syscall_error (a0); else return a0; } -#define syscall_errno(n, a, b, c, d, e, f) \ - __internal_syscall(n, (long)(a), (long)(b), (long)(c), (long)(d), (long)(e), (long)(f)) - #endif diff --git a/libgloss/riscv/sys_sbrk.c b/libgloss/riscv/sys_sbrk.c index 19802fb..f91c2c5 100644 --- a/libgloss/riscv/sys_sbrk.c +++ b/libgloss/riscv/sys_sbrk.c @@ -41,14 +41,14 @@ _sbrk(ptrdiff_t incr) if (heap_end == 0) { - long brk = syscall_errno (SYS_brk, 0, 0, 0, 0, 0, 0); + long brk = __internal_syscall (SYS_brk, 0, 0, 0, 0, 0, 0); if (brk == -1) - return (void *)-1; + return (void *)__syscall_error (-ENOMEM); heap_end = brk; } - if (syscall_errno (SYS_brk, heap_end + incr, 0, 0, 0, 0, 0) != heap_end + incr) - return (void *)-1; + if (__internal_syscall (SYS_brk, heap_end + incr, 0, 0, 0, 0, 0) != heap_end + incr) + return (void *)__syscall_error (-ENOMEM); heap_end += incr; return (void *)(heap_end - incr);