From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PATCH v2 48/74] target/m68k: Eliminate m68k_semi_is_fseek
Date: Tue, 3 May 2022 12:48:17 -0700 [thread overview]
Message-ID: <20220503194843.1379101-49-richard.henderson@linaro.org> (raw)
In-Reply-To: <20220503194843.1379101-1-richard.henderson@linaro.org>
Reorg m68k_semi_return_* to gdb_syscall_complete_cb.
Use the 32-bit version normally, and the 64-bit version
for HOSTED_LSEEK.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/m68k/m68k-semi.c | 55 +++++++++++++++++------------------------
1 file changed, 23 insertions(+), 32 deletions(-)
diff --git a/target/m68k/m68k-semi.c b/target/m68k/m68k-semi.c
index 94deebf09e..5b4c51957e 100644
--- a/target/m68k/m68k-semi.c
+++ b/target/m68k/m68k-semi.c
@@ -93,8 +93,11 @@ 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, int err)
+static void m68k_semi_u32_cb(CPUState *cs, uint64_t ret, int err)
{
+ M68kCPU *cpu = M68K_CPU(cs);
+ CPUM68KState *env = &cpu->env;
+
target_ulong args = env->dregs[1];
if (put_user_u32(ret, args) ||
put_user_u32(err, args + 4)) {
@@ -108,8 +111,11 @@ static void m68k_semi_return_u32(CPUM68KState *env, uint32_t ret, int err)
}
}
-static void m68k_semi_return_u64(CPUM68KState *env, uint64_t ret, int err)
+static void m68k_semi_u64_cb(CPUState *cs, uint64_t ret, int err)
{
+ M68kCPU *cpu = M68K_CPU(cs);
+ CPUM68KState *env = &cpu->env;
+
target_ulong args = env->dregs[1];
if (put_user_u32(ret >> 32, args) ||
put_user_u32(ret, args + 4) ||
@@ -120,21 +126,6 @@ static void m68k_semi_return_u64(CPUM68KState *env, uint64_t ret, int err)
}
}
-static int m68k_semi_is_fseek;
-
-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) {
- m68k_semi_return_u64(env, ret, err);
- m68k_semi_is_fseek = 0;
- } else {
- m68k_semi_return_u32(env, ret, err);
- }
-}
-
/*
* Read the input value from the argument block; fail the semihosting
* call if the memory read fails.
@@ -149,6 +140,7 @@ static void m68k_semi_cb(CPUState *cs, uint64_t ret, int err)
void do_m68k_semihosting(CPUM68KState *env, int nr)
{
+ CPUState *cs = env_cpu(env);
uint32_t args;
target_ulong arg0, arg1, arg2, arg3;
void *p;
@@ -167,7 +159,7 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
GET_ARG(2);
GET_ARG(3);
if (use_gdb_syscalls()) {
- gdb_do_syscall(m68k_semi_cb, "open,%s,%x,%x", arg0, (int)arg1,
+ gdb_do_syscall(m68k_semi_u32_cb, "open,%s,%x,%x", arg0, (int)arg1,
arg2, arg3);
return;
} else {
@@ -188,7 +180,7 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
int fd = arg0;
if (fd > 2) {
if (use_gdb_syscalls()) {
- gdb_do_syscall(m68k_semi_cb, "close,%x", arg0);
+ gdb_do_syscall(m68k_semi_u32_cb, "close,%x", arg0);
return;
} else {
result = close(fd);
@@ -204,7 +196,7 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
GET_ARG(2);
len = arg2;
if (use_gdb_syscalls()) {
- gdb_do_syscall(m68k_semi_cb, "read,%x,%x,%x",
+ gdb_do_syscall(m68k_semi_u32_cb, "read,%x,%x,%x",
arg0, arg1, len);
return;
} else {
@@ -224,7 +216,7 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
GET_ARG(2);
len = arg2;
if (use_gdb_syscalls()) {
- gdb_do_syscall(m68k_semi_cb, "write,%x,%x,%x",
+ gdb_do_syscall(m68k_semi_u32_cb, "write,%x,%x,%x",
arg0, arg1, len);
return;
} else {
@@ -247,12 +239,11 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
GET_ARG(3);
off = (uint32_t)arg2 | ((uint64_t)arg1 << 32);
if (use_gdb_syscalls()) {
- m68k_semi_is_fseek = 1;
- gdb_do_syscall(m68k_semi_cb, "fseek,%x,%lx,%x",
+ gdb_do_syscall(m68k_semi_u64_cb, "fseek,%x,%lx,%x",
arg0, off, arg3);
} else {
off = lseek(arg0, off, arg3);
- m68k_semi_return_u64(env, off, errno);
+ m68k_semi_u64_cb(cs, off, errno);
}
return;
}
@@ -262,7 +253,7 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
GET_ARG(2);
GET_ARG(3);
if (use_gdb_syscalls()) {
- gdb_do_syscall(m68k_semi_cb, "rename,%s,%s",
+ gdb_do_syscall(m68k_semi_u32_cb, "rename,%s,%s",
arg0, (int)arg1, arg2, (int)arg3);
return;
} else {
@@ -282,7 +273,7 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
GET_ARG(0);
GET_ARG(1);
if (use_gdb_syscalls()) {
- gdb_do_syscall(m68k_semi_cb, "unlink,%s",
+ gdb_do_syscall(m68k_semi_u32_cb, "unlink,%s",
arg0, (int)arg1);
return;
} else {
@@ -301,7 +292,7 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
GET_ARG(1);
GET_ARG(2);
if (use_gdb_syscalls()) {
- gdb_do_syscall(m68k_semi_cb, "stat,%s,%x",
+ gdb_do_syscall(m68k_semi_u32_cb, "stat,%s,%x",
arg0, (int)arg1, arg2);
return;
} else {
@@ -323,7 +314,7 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
GET_ARG(0);
GET_ARG(1);
if (use_gdb_syscalls()) {
- gdb_do_syscall(m68k_semi_cb, "fstat,%x,%x",
+ gdb_do_syscall(m68k_semi_u32_cb, "fstat,%x,%x",
arg0, arg1);
return;
} else {
@@ -338,7 +329,7 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
GET_ARG(0);
GET_ARG(1);
if (use_gdb_syscalls()) {
- gdb_do_syscall(m68k_semi_cb, "gettimeofday,%x,%x",
+ gdb_do_syscall(m68k_semi_u32_cb, "gettimeofday,%x,%x",
arg0, arg1);
return;
} else {
@@ -359,7 +350,7 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
case HOSTED_ISATTY:
GET_ARG(0);
if (use_gdb_syscalls()) {
- gdb_do_syscall(m68k_semi_cb, "isatty,%x", arg0);
+ gdb_do_syscall(m68k_semi_u32_cb, "isatty,%x", arg0);
return;
} else {
result = isatty(arg0);
@@ -369,7 +360,7 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
GET_ARG(0);
GET_ARG(1);
if (use_gdb_syscalls()) {
- gdb_do_syscall(m68k_semi_cb, "system,%s",
+ gdb_do_syscall(m68k_semi_u32_cb, "system,%s",
arg0, (int)arg1);
return;
} else {
@@ -427,5 +418,5 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
result = 0;
}
failed:
- m68k_semi_return_u32(env, result, errno);
+ m68k_semi_u32_cb(cs, result, errno);
}
--
2.34.1
next prev parent reply other threads:[~2022-05-03 20:40 UTC|newest]
Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-03 19:47 [PATCH v2 00/74] semihosting cleanup Richard Henderson
2022-05-03 19:47 ` [PATCH v2 01/74] semihosting: Move exec/softmmu-semi.h to semihosting/softmmu-uaccess.h Richard Henderson
2022-05-16 14:36 ` Peter Maydell
2022-05-03 19:47 ` [PATCH v2 02/74] semihosting: Return failure from softmmu-uaccess.h functions Richard Henderson
2022-05-16 14:42 ` Peter Maydell
2022-05-03 19:47 ` [PATCH v2 03/74] semihosting: Improve condition for config.c and console.c Richard Henderson
2022-05-16 15:00 ` Peter Maydell
2022-05-03 19:47 ` [PATCH v2 04/74] semihosting: Move softmmu-uaccess.h functions out of line Richard Henderson
2022-05-16 15:04 ` Peter Maydell
2022-05-03 19:47 ` [PATCH v2 05/74] semihosting: Add target_strlen for softmmu-uaccess.h Richard Henderson
2022-05-16 15:11 ` Peter Maydell
2022-05-17 1:33 ` Richard Henderson
2022-05-03 19:47 ` [PATCH v2 06/74] semihosting: Simplify softmmu_lock_user_string Richard Henderson
2022-05-16 15:12 ` Peter Maydell
2022-05-03 19:47 ` [PATCH v2 07/74] semihosting: Split out guestfd.c Richard Henderson
2022-05-16 15:14 ` Peter Maydell
2022-05-17 1:47 ` Richard Henderson
2022-05-03 19:47 ` [PATCH v2 08/74] semihosting: Generalize GuestFDFeatureFile Richard Henderson
2022-05-16 15:20 ` Peter Maydell
2022-05-03 19:47 ` [PATCH v2 09/74] semihosting: Return void from do_common_semihosting Richard Henderson
2022-05-16 15:31 ` Peter Maydell
2022-05-03 19:47 ` [PATCH v2 10/74] semihosting: Adjust error checking in common_semi_cb Richard Henderson
2022-05-03 19:47 ` [PATCH v2 11/74] semihosting: Move common-semi.h to include/semihosting/ Richard Henderson
2022-05-03 19:47 ` [PATCH v2 12/74] include/exec: Move gdb open flags to gdbstub.h Richard Henderson
2022-05-03 19:47 ` [PATCH v2 13/74] include/exec: Move gdb_stat and gdb_timeval " Richard Henderson
2022-05-03 19:47 ` [PATCH v2 14/74] include/exec: Define errno values in gdbstub.h Richard Henderson
2022-05-03 19:47 ` [PATCH v2 15/74] semihosting: Use struct gdb_stat in common_semi_flen_cb Richard Henderson
2022-05-03 19:47 ` [PATCH v2 16/74] semihosting: Split is_64bit_semihosting per target Richard Henderson
2022-05-04 8:58 ` Alistair Francis
2022-05-03 19:47 ` [PATCH v2 17/74] semihosting: Split common_semi_flen_buf " Richard Henderson
2022-05-04 8:59 ` Alistair Francis
2022-05-03 19:47 ` [PATCH v2 18/74] semihosting: Split out common_semi_has_synccache Richard Henderson
2022-05-04 9:01 ` Alistair Francis
2022-05-03 19:47 ` [PATCH v2 19/74] semihosting: Use env more often in do_common_semihosting Richard Henderson
2022-05-03 19:47 ` [PATCH v2 20/74] semihosting: Move GET_ARG/SET_ARG earlier in the file Richard Henderson
2022-05-03 19:47 ` [PATCH v2 21/74] semihosting: Split out semihost_sys_open Richard Henderson
2022-05-03 19:47 ` [PATCH v2 22/74] semihosting: Split out semihost_sys_close Richard Henderson
2022-05-03 19:47 ` [PATCH v2 23/74] semihosting: Split out semihost_sys_read Richard Henderson
2022-05-03 19:47 ` [PATCH v2 24/74] semihosting: Split out semihost_sys_write Richard Henderson
2022-05-03 19:47 ` [PATCH v2 25/74] semihosting: Bound length for semihost_sys_{read, write} Richard Henderson
2022-05-03 19:47 ` [PATCH v2 26/74] semihosting: Split out semihost_sys_lseek Richard Henderson
2022-05-03 19:47 ` [PATCH v2 27/74] semihosting: Split out semihost_sys_isatty Richard Henderson
2022-05-03 19:47 ` [PATCH v2 28/74] semihosting: Split out semihost_sys_flen Richard Henderson
2022-05-03 19:47 ` [PATCH v2 29/74] semihosting: Split out semihost_sys_remove Richard Henderson
2022-05-03 19:47 ` [PATCH v2 30/74] semihosting: Split out semihost_sys_rename Richard Henderson
2022-05-03 19:48 ` [PATCH v2 31/74] semihosting: Split out semihost_sys_system Richard Henderson
2022-05-03 19:48 ` [PATCH v2 32/74] semihosting: Create semihost_sys_{stat,fstat} Richard Henderson
2022-05-03 19:48 ` [PATCH v2 33/74] semihosting: Create semihost_sys_gettimeofday Richard Henderson
2022-05-03 19:48 ` [PATCH v2 34/74] gdbstub: Widen gdb_syscall_complete_cb return value Richard Henderson
2022-05-03 19:48 ` [PATCH v2 35/74] semihosting: Fix docs comment for qemu_semihosting_console_inc Richard Henderson
2022-05-03 19:48 ` [PATCH v2 36/74] semihosting: Pass CPUState to qemu_semihosting_console_inc Richard Henderson
2022-05-03 19:48 ` [PATCH v2 37/74] semihosting: Expand qemu_semihosting_console_inc to read Richard Henderson
2022-05-03 19:48 ` [PATCH v2 38/74] semihosting: Cleanup chardev init Richard Henderson
2022-05-03 19:48 ` [PATCH v2 39/74] semihosting: Create qemu_semihosting_console_write Richard Henderson
2022-05-03 19:48 ` [PATCH v2 40/74] semihosting: Add GuestFDConsole Richard Henderson
2022-05-03 19:48 ` [PATCH v2 41/74] semihosting: Create qemu_semihosting_guestfd_init Richard Henderson
2022-05-03 19:48 ` [PATCH v2 42/74] semihosting: Use console_in_gf for SYS_READC Richard Henderson
2022-05-03 19:48 ` [PATCH v2 43/74] semihosting: Use console_out_gf for SYS_WRITEC Richard Henderson
2022-05-03 19:48 ` [PATCH v2 44/74] semihosting: Remove qemu_semihosting_console_outc Richard Henderson
2022-05-03 19:48 ` [PATCH v2 45/74] semihosting: Use console_out_gf for SYS_WRITE0 Richard Henderson
2022-05-03 19:48 ` [PATCH v2 46/74] semihosting: Remove qemu_semihosting_console_outs Richard Henderson
2022-05-03 19:48 ` [PATCH v2 47/74] semihosting: Create semihost_sys_poll_one Richard Henderson
2022-05-03 19:48 ` Richard Henderson [this message]
2022-05-03 19:48 ` [PATCH v2 49/74] target/m68k: Make semihosting system only Richard Henderson
2022-05-03 19:48 ` [PATCH v2 50/74] target/m68k: Use semihosting/syscalls.h Richard Henderson
2022-05-03 19:48 ` [PATCH v2 51/74] target/nios2: Eliminate nios2_semi_is_lseek Richard Henderson
2022-05-03 19:48 ` [PATCH v2 52/74] target/nios2: Move nios2-semi.c to nios2_softmmu_ss Richard Henderson
2022-05-03 19:48 ` [PATCH v2 53/74] target/nios2: Use semihosting/syscalls.h Richard Henderson
2022-05-03 19:48 ` [PATCH v2 54/74] target/mips: Use an exception for semihosting Richard Henderson
2022-05-03 19:48 ` [PATCH v2 55/74] target/mips: Add UHI errno values Richard Henderson
2022-05-03 19:48 ` [PATCH v2 56/74] target/mips: Create report_fault for semihosting Richard Henderson
2022-05-03 19:48 ` [PATCH v2 57/74] target/mips: Drop link syscall from semihosting Richard Henderson
2022-05-03 19:48 ` [PATCH v2 58/74] target/mips: Drop pread and pwrite syscalls " Richard Henderson
2022-05-03 19:48 ` [PATCH v2 59/74] target/mips: Use semihosting/syscalls.h Richard Henderson
2022-05-03 19:48 ` [PATCH v2 60/74] target/mips: Avoid qemu_semihosting_log_out for UHI_plog Richard Henderson
2022-05-03 19:48 ` [PATCH v2 61/74] target/mips: Use error_report for UHI_assert Richard Henderson
2022-05-03 19:48 ` [PATCH v2 62/74] semihosting: Remove qemu_semihosting_log_out Richard Henderson
2022-05-03 19:48 ` [PATCH v2 63/74] target/mips: Simplify UHI_argnlen and UHI_argn Richard Henderson
2022-05-03 19:48 ` [PATCH v2 64/74] target/mips: Remove GET_TARGET_STRING and FREE_TARGET_STRING Richard Henderson
2022-05-03 19:48 ` [PATCH v2 65/74] target/xtensa: Use an exception for semihosting Richard Henderson
2022-05-03 19:48 ` [PATCH v2 66/74] target/xtensa: Use semihosting/syscalls.h Richard Henderson
2022-05-03 19:48 ` [PATCH v2 67/74] tests/docker: Add debian-rx-cross image Richard Henderson
2022-05-03 19:48 ` [PATCH v2 68/74] hw/rx: Handle a kernel file that is ELF Richard Henderson
2022-05-13 15:44 ` Peter Maydell
2022-05-13 15:48 ` Richard Henderson
2022-05-13 16:40 ` Richard Henderson
2022-05-03 19:48 ` [PATCH v2 69/74] target/rx: Fix the base of the fixed vector table Richard Henderson
2022-05-03 19:48 ` [PATCH v2 70/74] target/rx: Name the exceptions Richard Henderson
2022-05-03 19:48 ` [PATCH v2 71/74] target/rx: Consolidate exception helpers Richard Henderson
2022-05-03 19:48 ` [PATCH v2 72/74] target/rx: Cleanup rx_cpu_do_interrupt Richard Henderson
2022-05-03 19:48 ` [PATCH v2 73/74] target/rx: Implement libgloss semihosting Richard Henderson
2022-05-03 19:48 ` [PATCH v2 74/74] tests/tcg/rx: Enable semihosting multiarch tests 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=20220503194843.1379101-49-richard.henderson@linaro.org \
--to=richard.henderson@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).