From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, alex.bennee@linaro.org
Subject: [PATCH v3 36/49] gdbstub: Widen gdb_syscall_complete_cb return value
Date: Fri, 20 May 2022 17:03:47 -0700 [thread overview]
Message-ID: <20220521000400.454525-37-richard.henderson@linaro.org> (raw)
In-Reply-To: <20220521000400.454525-1-richard.henderson@linaro.org>
Always pass a uint64_t. This resolves a FIXME in the
m68k and nios2 semihosting that we've lost data.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/gdbstub.h | 3 +--
gdbstub.c | 7 ++++---
semihosting/arm-compat-semi.c | 9 ++++-----
semihosting/console.c | 7 +++----
semihosting/syscalls.c | 2 +-
target/m68k/m68k-semi.c | 10 +++-------
target/nios2/nios2-semi.c | 8 +++-----
7 files changed, 19 insertions(+), 27 deletions(-)
diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h
index 8e9cdcb1c1..63764a9766 100644
--- a/include/exec/gdbstub.h
+++ b/include/exec/gdbstub.h
@@ -77,8 +77,7 @@ struct gdb_timeval {
#ifdef NEED_CPU_H
#include "cpu.h"
-typedef void (*gdb_syscall_complete_cb)(CPUState *cpu,
- target_ulong ret, target_ulong err);
+typedef void (*gdb_syscall_complete_cb)(CPUState *cpu, uint64_t ret, int err);
/**
* gdb_do_syscall:
diff --git a/gdbstub.c b/gdbstub.c
index a3ff8702ce..5286253f8a 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -1870,11 +1870,12 @@ static void handle_read_all_regs(GArray *params, void *user_ctx)
static void handle_file_io(GArray *params, void *user_ctx)
{
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) {
- err = (target_ulong)get_param(params, 1)->val_ull;
+ err = get_param(params, 1)->val_ull;
} else {
err = 0;
}
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 9cfa8a421c..3eb9d1c049 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -215,7 +215,7 @@ static inline uint32_t get_swi_errno(CPUState *cs)
#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) {
#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.
* 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. */
CPUArchState *env G_GNUC_UNUSED = cs->env_ptr;
@@ -250,8 +250,7 @@ static void common_semi_rw_cb(CPUState *cs, target_ulong ret, target_ulong err)
/*
* SYS_SEEK returns 0 on success, not the resulting offset.
*/
-static void common_semi_seek_cb(CPUState *cs, target_ulong ret,
- target_ulong err)
+static void common_semi_seek_cb(CPUState *cs, uint64_t ret, int err)
{
if (!err) {
ret = 0;
@@ -272,7 +271,7 @@ static target_ulong common_semi_flen_buf(CPUState *cs)
}
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) {
/* The size is always stored in big-endian order, extract the value. */
diff --git a/semihosting/console.c b/semihosting/console.c
index ef6958d844..3dd0ac60e2 100644
--- a/semihosting/console.c
+++ b/semihosting/console.c
@@ -64,11 +64,10 @@ static GString *copy_user_string(CPUArchState *env, target_ulong addr)
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) {
- qemu_log("%s: gdb console output failed ("TARGET_FMT_ld")",
- __func__, err);
+ if (err) {
+ qemu_log("%s: gdb console output failed (%d)", __func__, err);
}
}
diff --git a/semihosting/syscalls.c b/semihosting/syscalls.c
index 269f750d98..4c934654cd 100644
--- a/semihosting/syscalls.c
+++ b/semihosting/syscalls.c
@@ -145,7 +145,7 @@ static int copy_stat_to_user(CPUState *cs, target_ulong addr,
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) {
int guestfd = alloc_guestfd();
diff --git a/target/m68k/m68k-semi.c b/target/m68k/m68k-semi.c
index da0186f3ef..94deebf09e 100644
--- a/target/m68k/m68k-semi.c
+++ b/target/m68k/m68k-semi.c
@@ -93,7 +93,7 @@ static void translate_stat(CPUM68KState *env, target_ulong addr, struct stat *s)
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];
if (put_user_u32(ret, args) ||
@@ -108,7 +108,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];
if (put_user_u32(ret >> 32, args) ||
@@ -122,16 +122,12 @@ static void m68k_semi_return_u64(CPUM68KState *env, uint64_t ret, uint32_t err)
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);
CPUM68KState *env = &cpu->env;
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_is_fseek = 0;
} else {
diff --git a/target/nios2/nios2-semi.c b/target/nios2/nios2-semi.c
index 3e504a6c5f..4d02789d26 100644
--- a/target/nios2/nios2-semi.c
+++ b/target/nios2/nios2-semi.c
@@ -108,8 +108,7 @@ static bool translate_stat(CPUNios2State *env, target_ulong addr,
return true;
}
-static void nios2_semi_return_u32(CPUNios2State *env, uint32_t ret,
- uint32_t err)
+static void nios2_semi_return_u32(CPUNios2State *env, uint32_t ret, int err)
{
target_ulong args = env->regs[R_ARG1];
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,
- uint32_t err)
+static void nios2_semi_return_u64(CPUNios2State *env, uint64_t ret, int err)
{
target_ulong args = env->regs[R_ARG1];
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 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);
CPUNios2State *env = &cpu->env;
--
2.34.1
next prev parent reply other threads:[~2022-05-21 0:27 UTC|newest]
Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
2022-05-21 0:03 ` [PATCH v3 01/49] semihosting: Move exec/softmmu-semi.h to semihosting/softmmu-uaccess.h Richard Henderson
2022-05-21 0:03 ` [PATCH v3 02/49] semihosting: Return failure from softmmu-uaccess.h functions Richard Henderson
2022-05-21 0:03 ` [PATCH v3 03/49] semihosting: Improve condition for config.c and console.c Richard Henderson
2022-05-21 0:03 ` [PATCH v3 04/49] semihosting: Move softmmu-uaccess.h functions out of line Richard Henderson
2022-05-21 0:03 ` [PATCH v3 05/49] semihosting: Add target_strlen for softmmu-uaccess.h Richard Henderson
2022-05-21 4:51 ` Richard Henderson
2022-05-23 10:55 ` Peter Maydell
2022-05-21 0:03 ` [PATCH v3 06/49] semihosting: Simplify softmmu_lock_user_string Richard Henderson
2022-05-21 0:03 ` [PATCH v3 07/49] semihosting: Split out guestfd.c Richard Henderson
2022-05-21 0:03 ` [PATCH v3 08/49] semihosting: Inline set_swi_errno into common_semi_cb Richard Henderson
2022-05-23 10:58 ` Peter Maydell
2022-05-23 14:58 ` Richard Henderson
2022-05-23 16:58 ` Peter Maydell
2022-05-21 0:03 ` [PATCH v3 09/49] semihosting: Adjust error checking in common_semi_cb Richard Henderson
2022-05-23 12:13 ` Peter Maydell
2022-05-23 15:35 ` Richard Henderson
2022-05-23 15:44 ` Peter Maydell
2022-06-07 17:41 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 10/49] semihosting: Clean up common_semi_flen_cb Richard Henderson
2022-06-07 9:05 ` Alex Bennée
2022-05-21 0:03 ` [PATCH v3 11/49] semihosting: Clean up common_semi_open_cb Richard Henderson
2022-06-07 11:30 ` Alex Bennée
2022-05-21 0:03 ` [PATCH v3 12/49] semihosting: Return void from do_common_semihosting Richard Henderson
2022-05-21 0:03 ` [PATCH v3 13/49] semihosting: Move common-semi.h to include/semihosting/ Richard Henderson
2022-05-23 12:14 ` Peter Maydell
2022-05-21 0:03 ` [PATCH v3 14/49] include/exec: Move gdb open flags to gdbstub.h Richard Henderson
2022-05-23 12:26 ` Peter Maydell
2022-06-07 13:58 ` Alex Bennée
2022-05-21 0:03 ` [PATCH v3 15/49] include/exec: Move gdb_stat and gdb_timeval " Richard Henderson
2022-05-23 12:42 ` Peter Maydell
2022-06-07 13:59 ` Alex Bennée
2022-05-21 0:03 ` [PATCH v3 16/49] include/exec: Define errno values in gdbstub.h Richard Henderson
2022-05-23 12:44 ` Peter Maydell
2022-05-21 0:03 ` [PATCH v3 17/49] semihosting: Use struct gdb_stat in common_semi_flen_cb Richard Henderson
2022-05-23 12:47 ` Peter Maydell
2022-05-21 0:03 ` [PATCH v3 18/49] semihosting: Split is_64bit_semihosting per target Richard Henderson
2022-05-23 12:48 ` Peter Maydell
2022-05-21 0:03 ` [PATCH v3 19/49] semihosting: Split common_semi_flen_buf " Richard Henderson
2022-05-23 12:50 ` Peter Maydell
2022-05-21 0:03 ` [PATCH v3 20/49] semihosting: Split out common_semi_has_synccache Richard Henderson
2022-05-23 12:51 ` Peter Maydell
2022-05-23 15:40 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 21/49] semihosting: Use env more often in do_common_semihosting Richard Henderson
2022-05-23 12:53 ` Peter Maydell
2022-05-23 15:41 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 22/49] semihosting: Move GET_ARG/SET_ARG earlier in the file Richard Henderson
2022-05-23 12:53 ` Peter Maydell
2022-05-21 0:03 ` [PATCH v3 23/49] semihosting: Split out semihost_sys_open Richard Henderson
2022-05-23 13:30 ` Peter Maydell
2022-05-23 15:46 ` Richard Henderson
2022-05-23 16:54 ` Peter Maydell
2022-05-23 18:21 ` Richard Henderson
2022-06-07 18:23 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 24/49] semihosting: Split out semihost_sys_close Richard Henderson
2022-05-21 0:03 ` [PATCH v3 25/49] semihosting: Split out semihost_sys_read Richard Henderson
2022-05-21 0:03 ` [PATCH v3 26/49] semihosting: Split out semihost_sys_write Richard Henderson
2022-05-21 0:03 ` [PATCH v3 27/49] semihosting: Bound length for semihost_sys_{read, write} Richard Henderson
2022-05-21 0:03 ` [PATCH v3 28/49] semihosting: Split out semihost_sys_lseek Richard Henderson
2022-05-21 0:03 ` [PATCH v3 29/49] semihosting: Split out semihost_sys_isatty Richard Henderson
2022-05-21 0:03 ` [PATCH v3 30/49] semihosting: Split out semihost_sys_flen Richard Henderson
2022-05-21 0:03 ` [PATCH v3 31/49] semihosting: Split out semihost_sys_remove Richard Henderson
2022-05-21 0:03 ` [PATCH v3 32/49] semihosting: Split out semihost_sys_rename Richard Henderson
2022-05-21 0:03 ` [PATCH v3 33/49] semihosting: Split out semihost_sys_system Richard Henderson
2022-05-21 0:03 ` [PATCH v3 34/49] semihosting: Create semihost_sys_{stat,fstat} Richard Henderson
2022-05-21 0:03 ` [PATCH v3 35/49] semihosting: Create semihost_sys_gettimeofday Richard Henderson
2022-05-21 0:03 ` Richard Henderson [this message]
2022-05-23 13:32 ` [PATCH v3 36/49] gdbstub: Widen gdb_syscall_complete_cb return value Peter Maydell
2022-05-21 0:03 ` [PATCH v3 37/49] semihosting: Fix docs comment for qemu_semihosting_console_inc Richard Henderson
2022-05-23 13:38 ` Peter Maydell
2022-05-21 0:03 ` [PATCH v3 38/49] semihosting: Pass CPUState to qemu_semihosting_console_inc Richard Henderson
2022-05-23 13:39 ` Peter Maydell
2022-05-21 0:03 ` [PATCH v3 39/49] semihosting: Expand qemu_semihosting_console_inc to read Richard Henderson
2022-05-21 0:03 ` [PATCH v3 40/49] semihosting: Cleanup chardev init Richard Henderson
2022-05-21 0:03 ` [PATCH v3 41/49] semihosting: Create qemu_semihosting_console_write Richard Henderson
2022-05-21 0:03 ` [PATCH v3 42/49] semihosting: Add GuestFDConsole Richard Henderson
2022-05-21 0:03 ` [PATCH v3 43/49] semihosting: Create qemu_semihosting_guestfd_init Richard Henderson
2022-05-21 0:03 ` [PATCH v3 44/49] semihosting: Use console_in_gf for SYS_READC Richard Henderson
2022-05-21 0:03 ` [PATCH v3 45/49] semihosting: Use console_out_gf for SYS_WRITEC Richard Henderson
2022-05-21 0:03 ` [PATCH v3 46/49] semihosting: Remove qemu_semihosting_console_outc Richard Henderson
2022-05-21 0:03 ` [PATCH v3 47/49] semihosting: Use console_out_gf for SYS_WRITE0 Richard Henderson
2022-05-21 0:03 ` [PATCH v3 48/49] semihosting: Remove qemu_semihosting_console_outs Richard Henderson
2022-05-21 0:04 ` [PATCH v3 49/49] semihosting: Create semihost_sys_poll_one Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220521000400.454525-37-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).