Skip to content

Commit

Permalink
target/arm: Make SYS_HEAPINFO work with RAM that doesn't start at 0
Browse files Browse the repository at this point in the history
The semihosting SYS_HEAPINFO call is supposed to return an array
of four guest addresses:
 * base of heap memory
 * limit of heap memory
 * base of stack memory
 * limit of stack memory

Some semihosting programs (including those compiled to use the
'newlib' embedded C library) use this call to work out where they
should initialize themselves to.

QEMU's implementation when in system emulation mode is very
simplistic: we say that the heap starts halfway into RAM and
continues to the end of RAM, and the stack starts at the top of RAM
and works down to the bottom.  Unfortunately the code assumes that
the base address of RAM is at address 0, so on boards like 'virt'
where this is not true the addresses returned will all be wrong and
the guest application will usually crash.

Conveniently since all Arm boards call arm_load_kernel() we have the
base address of the main RAM block in the arm_boot_info struct which
is accessible via the CPU object.  Use this to return sensible values
from SYS_HEAPINFO.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 20201119092346.32356-1-peter.maydell@linaro.org
  • Loading branch information
pm215 committed Nov 23, 2020
1 parent 75bf6e1 commit 6951595
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions target/arm/arm-semi.c
Expand Up @@ -36,6 +36,7 @@
#else
#include "exec/gdbstub.h"
#include "qemu/cutils.h"
#include "hw/arm/boot.h"
#endif

#define TARGET_SYS_OPEN 0x01
Expand Down Expand Up @@ -1014,6 +1015,9 @@ target_ulong do_arm_semihosting(CPUARMState *env)
int i;
#ifdef CONFIG_USER_ONLY
TaskState *ts = cs->opaque;
#else
const struct arm_boot_info *info = env->boot_info;
target_ulong rambase = info->loader_start;
#endif

GET_ARG(0);
Expand Down Expand Up @@ -1046,10 +1050,10 @@ target_ulong do_arm_semihosting(CPUARMState *env)
#else
limit = ram_size;
/* TODO: Make this use the limit of the loaded application. */
retvals[0] = limit / 2;
retvals[1] = limit;
retvals[2] = limit; /* Stack base */
retvals[3] = 0; /* Stack limit. */
retvals[0] = rambase + limit / 2;
retvals[1] = rambase + limit;
retvals[2] = rambase + limit; /* Stack base */
retvals[3] = rambase; /* Stack limit. */
#endif

for (i = 0; i < ARRAY_SIZE(retvals); i++) {
Expand Down

0 comments on commit 6951595

Please sign in to comment.