[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/18] m68k-semi.c: Use correct check for failure of
From: |
riku . voipio |
Subject: |
[Qemu-devel] [PATCH 06/18] m68k-semi.c: Use correct check for failure of do_brk() |
Date: |
Mon, 20 Jun 2011 19:20:11 +0300 |
From: Peter Maydell <address@hidden>
In the m68k semihosting implementation of HOSTED_INIT_SIM, use the correct
check for whether do_brk() has failed -- it does not return -1 but the
previous value of the break limit.
Signed-off-by: Peter Maydell <address@hidden>
Signed-off-by: Riku Voipio <address@hidden>
---
m68k-semi.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/m68k-semi.c b/m68k-semi.c
index 0371089..7fde10e 100644
--- a/m68k-semi.c
+++ b/m68k-semi.c
@@ -370,7 +370,7 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
TaskState *ts = env->opaque;
/* Allocate the heap using sbrk. */
if (!ts->heap_limit) {
- long ret;
+ abi_ulong ret;
uint32_t size;
uint32_t base;
@@ -379,8 +379,9 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
/* Try a big heap, and reduce the size if that fails. */
for (;;) {
ret = do_brk(base + size);
- if (ret != -1)
+ if (ret >= (base + size)) {
break;
+ }
size >>= 1;
}
ts->heap_limit = base + size;
--
1.7.4.1
- [Qemu-devel] [PATCH 00/18] pending linux-user patches, riku . voipio, 2011/06/20
- [Qemu-devel] [PATCH 01/18] Don't translate pointer when in restore_sigcontext, riku . voipio, 2011/06/20
- [Qemu-devel] [PATCH 05/18] arm-semi.c: Use correct check for failure of do_brk(), riku . voipio, 2011/06/20
- [Qemu-devel] [PATCH 04/18] linux-user: Don't use MAP_FIXED in do_brk(), riku . voipio, 2011/06/20
- [Qemu-devel] [PATCH 02/18] linux-user: Fix the load of ELF files that have no "useful" symbol, riku . voipio, 2011/06/20
- [Qemu-devel] [PATCH 07/18] linux-user: Fix the computation of the requested heap size, riku . voipio, 2011/06/20
- [Qemu-devel] [PATCH 03/18] linux-user: Handle images where lowest vaddr is not page aligned, riku . voipio, 2011/06/20
- [Qemu-devel] [PATCH 06/18] m68k-semi.c: Use correct check for failure of do_brk(),
riku . voipio <=
- [Qemu-devel] [PATCH 08/18] linux-user: add pselect6 syscall support, riku . voipio, 2011/06/20
- [Qemu-devel] [PATCH 09/18] linux-user: Define AT_RANDOM to support target stack protection mechanism., riku . voipio, 2011/06/20
- [Qemu-devel] [PATCH 10/18] linuxload: id_change was a write only variable, riku . voipio, 2011/06/20
- [Qemu-devel] [PATCH 11/18] syscall: really return ret code, riku . voipio, 2011/06/20
- [Qemu-devel] [PATCH 12/18] linux-user: syscall should use sanitized arg1, riku . voipio, 2011/06/20
- [Qemu-devel] [PATCH 13/18] flatload: end_code was only used in a debug message, riku . voipio, 2011/06/20
- [Qemu-devel] [PATCH 14/18] flatload: memp was a write-only variable, riku . voipio, 2011/06/20
- [Qemu-devel] [PATCH 15/18] linux-user: Bump do_syscall() up to 8 syscall arguments, riku . voipio, 2011/06/20
- [Qemu-devel] [PATCH 16/18] linux-user/signal.c: Remove only-ever-set variable fpu_save_addr, riku . voipio, 2011/06/20