ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

semihosting: Clean up common_semi_flen_cb 

Do not read from the gdb struct stat buffer if the callback is
reporting an error. Use common_semi_cb to finish returning results.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2022-05-16 19:34:06 -07:00
parent 709fe27b18
commit 84ca0dfd1e
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
semihosting/arm-compat-semi.c
View File

@ -346,15 +346,17 @@ static target_ulong common_semi_flen_buf(CPUState *cs)
static void static void
common_semi_flen_cb(CPUState *cs, target_ulong ret, target_ulong err) common_semi_flen_cb(CPUState *cs, target_ulong ret, target_ulong err)
{ {
/* The size is always stored in big-endian order, extract if (!err) {
the value. We assume the size always fit in 32 bits. */ /*
uint32_t size; * The size is always stored in big-endian order, extract
cpu_memory_rw_debug(cs, common_semi_flen_buf(cs) + 32, * the value. We assume the size always fit in 32 bits.
(uint8_t *)&size, 4, 0); */
size = be32_to_cpu(size); uint32_t size;
common_semi_set_ret(cs, size); cpu_memory_rw_debug(cs, common_semi_flen_buf(cs) + 32,
errno = err; (uint8_t *)&size, 4, 0);
set_swi_errno(cs, -1); ret = be32_to_cpu(size);
}
common_semi_cb(cs, ret, err);
} }
static int common_semi_open_guestfd; static int common_semi_open_guestfd;