OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

gdbstub: Adjust gdb_syscall_complete_cb declaration

Browse Source 
Change 'ret' to uint64_t.  This resolves a FIXME in the
m68k and nios2 semihosting that we've lost data.
Change 'err' to int.  There is nothing target-specific
about the width of the errno value.

Reviewed-by: Luc Michel <lmichel@kalray.eu>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2022-04-29 16:21:43 -07:00
parent 1875dab0ee
commit 64c8c6a992
7 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdbstub.c
View File

@ -1878,11 +1878,12 @@ static void handle_read_all_regs(GArray *params, void *user_ctx)
static void handle_file_io(GArray *params, void *user_ctx) static void handle_file_io(GArray *params, void *user_ctx)
{ {
if (params->len >= 1 && gdbserver_state.current_syscall_cb) { if (params->len >= 1 && gdbserver_state.current_syscall_cb) {
target_ulong ret, err; uint64_t ret;
int err;
ret = (target_ulong)get_param(params, 0)->val_ull; ret = get_param(params, 0)->val_ull;
if (params->len >= 2) { if (params->len >= 2) {
err = (target_ulong)get_param(params, 1)->val_ull; err = get_param(params, 1)->val_ull;
} else { } else {
err = 0; err = 0;
} }

3
include/exec/gdbstub.h
View File

@ -74,8 +74,7 @@ struct gdb_timeval {
#ifdef NEED_CPU_H #ifdef NEED_CPU_H
#include "cpu.h" #include "cpu.h"
typedef void (*gdb_syscall_complete_cb)(CPUState *cpu, typedef void (*gdb_syscall_complete_cb)(CPUState *cpu, uint64_t ret, int err);
target_ulong ret, target_ulong err);
/** /**
* gdb_do_syscall: * gdb_do_syscall:

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

@ -215,7 +215,7 @@ static inline uint32_t get_swi_errno(CPUState *cs)
#endif #endif
} }
static void common_semi_cb(CPUState *cs, target_ulong ret, target_ulong err) static void common_semi_cb(CPUState *cs, uint64_t ret, int err)
{ {
if (err) { if (err) {
#ifdef CONFIG_USER_ONLY #ifdef CONFIG_USER_ONLY
@ -232,7 +232,7 @@ static void common_semi_cb(CPUState *cs, target_ulong ret, target_ulong err)
* SYS_READ and SYS_WRITE always return the number of bytes not read/written. * SYS_READ and SYS_WRITE always return the number of bytes not read/written.
* There is no error condition, other than returning the original length. * There is no error condition, other than returning the original length.
*/ */
static void common_semi_rw_cb(CPUState *cs, target_ulong ret, target_ulong err) static void common_semi_rw_cb(CPUState *cs, uint64_t ret, int err)
{ {
/* Recover the original length from the third argument. */ /* Recover the original length from the third argument. */
CPUArchState *env G_GNUC_UNUSED = cs->env_ptr; CPUArchState *env G_GNUC_UNUSED = cs->env_ptr;
@ -251,8 +251,7 @@ static void common_semi_rw_cb(CPUState *cs, target_ulong ret, target_ulong err)
* Convert from Posix ret+errno to Arm SYS_ISTTY return values. * Convert from Posix ret+errno to Arm SYS_ISTTY return values.
* With gdbstub, err is only ever set for protocol errors to EIO. * With gdbstub, err is only ever set for protocol errors to EIO.
*/ */
static void common_semi_istty_cb(CPUState *cs, target_ulong ret, static void common_semi_istty_cb(CPUState *cs, uint64_t ret, int err)
target_ulong err)
{ {
if (err) { if (err) {
ret = (err == ENOTTY ? 0 : -1); ret = (err == ENOTTY ? 0 : -1);
@ -263,8 +262,7 @@ static void common_semi_istty_cb(CPUState *cs, target_ulong ret,
/* /*
* SYS_SEEK returns 0 on success, not the resulting offset. * SYS_SEEK returns 0 on success, not the resulting offset.
*/ */
static void common_semi_seek_cb(CPUState *cs, target_ulong ret, static void common_semi_seek_cb(CPUState *cs, uint64_t ret, int err)
target_ulong err)
{ {
if (!err) { if (!err) {
ret = 0; ret = 0;
@ -285,7 +283,7 @@ static target_ulong common_semi_flen_buf(CPUState *cs)
} }
static void static void
common_semi_flen_fstat_cb(CPUState *cs, target_ulong ret, target_ulong err) common_semi_flen_fstat_cb(CPUState *cs, uint64_t ret, int err)
{ {
if (!err) { if (!err) {
/* The size is always stored in big-endian order, extract the value. */ /* The size is always stored in big-endian order, extract the value. */

7
semihosting/console.c
View File

@ -64,11 +64,10 @@ static GString *copy_user_string(CPUArchState *env, target_ulong addr)
return s; return s;
} }
static void semihosting_cb(CPUState *cs, target_ulong ret, target_ulong err) static void semihosting_cb(CPUState *cs, uint64_t ret, int err)
{ {
if (ret == (target_ulong) -1) { if (err) {
qemu_log("%s: gdb console output failed ("TARGET_FMT_ld")", qemu_log("%s: gdb console output failed (%d)\n", __func__, err);
__func__, err);
} }
} }

2
semihosting/syscalls.c
View File

@ -115,7 +115,7 @@ static int copy_stat_to_user(CPUState *cs, target_ulong addr,
static gdb_syscall_complete_cb gdb_open_complete; static gdb_syscall_complete_cb gdb_open_complete;
static void gdb_open_cb(CPUState *cs, target_ulong ret, target_ulong err) static void gdb_open_cb(CPUState *cs, uint64_t ret, int err)
{ {
if (!err) { if (!err) {
int guestfd = alloc_guestfd(); int guestfd = alloc_guestfd();

10
target/m68k/m68k-semi.c
View File

@ -95,7 +95,7 @@ static void translate_stat(CPUM68KState *env, target_ulong addr, struct stat *s)
unlock_user(p, addr, sizeof(struct gdb_stat)); unlock_user(p, addr, sizeof(struct gdb_stat));
} }
static void m68k_semi_return_u32(CPUM68KState *env, uint32_t ret, uint32_t err) static void m68k_semi_return_u32(CPUM68KState *env, uint32_t ret, int err)
{ {
target_ulong args = env->dregs[1]; target_ulong args = env->dregs[1];
if (put_user_u32(ret, args) || if (put_user_u32(ret, args) ||
@ -110,7 +110,7 @@ static void m68k_semi_return_u32(CPUM68KState *env, uint32_t ret, uint32_t err)
} }
} }
static void m68k_semi_return_u64(CPUM68KState *env, uint64_t ret, uint32_t err) static void m68k_semi_return_u64(CPUM68KState *env, uint64_t ret, int err)
{ {
target_ulong args = env->dregs[1]; target_ulong args = env->dregs[1];
if (put_user_u32(ret >> 32, args) || if (put_user_u32(ret >> 32, args) ||
@ -124,16 +124,12 @@ static void m68k_semi_return_u64(CPUM68KState *env, uint64_t ret, uint32_t err)
static int m68k_semi_is_fseek; static int m68k_semi_is_fseek;
static void m68k_semi_cb(CPUState *cs, target_ulong ret, target_ulong err) static void m68k_semi_cb(CPUState *cs, uint64_t ret, int err)
{ {
M68kCPU *cpu = M68K_CPU(cs); M68kCPU *cpu = M68K_CPU(cs);
CPUM68KState *env = &cpu->env; CPUM68KState *env = &cpu->env;
if (m68k_semi_is_fseek) { if (m68k_semi_is_fseek) {
/*
* FIXME: We've already lost the high bits of the fseek
* return value.
*/
m68k_semi_return_u64(env, ret, err); m68k_semi_return_u64(env, ret, err);
m68k_semi_is_fseek = 0; m68k_semi_is_fseek = 0;
} else { } else {

8
target/nios2/nios2-semi.c
View File

@ -108,8 +108,7 @@ static bool translate_stat(CPUNios2State *env, target_ulong addr,
return true; return true;
} }
static void nios2_semi_return_u32(CPUNios2State *env, uint32_t ret, static void nios2_semi_return_u32(CPUNios2State *env, uint32_t ret, int err)
uint32_t err)
{ {
target_ulong args = env->regs[R_ARG1]; target_ulong args = env->regs[R_ARG1];
if (put_user_u32(ret, args) || if (put_user_u32(ret, args) ||
@ -124,8 +123,7 @@ static void nios2_semi_return_u32(CPUNios2State *env, uint32_t ret,
} }
} }
static void nios2_semi_return_u64(CPUNios2State *env, uint64_t ret, static void nios2_semi_return_u64(CPUNios2State *env, uint64_t ret, int err)
uint32_t err)
{ {
target_ulong args = env->regs[R_ARG1]; target_ulong args = env->regs[R_ARG1];
if (put_user_u32(ret >> 32, args) || if (put_user_u32(ret >> 32, args) ||
@ -139,7 +137,7 @@ static void nios2_semi_return_u64(CPUNios2State *env, uint64_t ret,
static int nios2_semi_is_lseek; static int nios2_semi_is_lseek;
static void nios2_semi_cb(CPUState *cs, target_ulong ret, target_ulong err) static void nios2_semi_cb(CPUState *cs, uint64_t ret, int err)
{ {
Nios2CPU *cpu = NIOS2_CPU(cs); Nios2CPU *cpu = NIOS2_CPU(cs);
CPUNios2State *env = &cpu->env; CPUNios2State *env = &cpu->env;