* [PATCH 00/43] semihosting cleanup
@ 2022-04-30 13:28 Richard Henderson
2022-04-30 13:28 ` [PATCH 01/43] semihosting: Move exec/softmmu-semi.h to semihosting/softmmu-uaccess.h Richard Henderson
` (43 more replies)
0 siblings, 44 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:28 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
I had whipped up an rx-elf cross toolchain to test something
recently, and since I had built it, thought it would be easy
to use libgloss to run the multiarch hello and memory tests.
But we haven't implemented libgloss-style semihosting for rx.
I had forgotten how much boilerplate there is currently for
implementing semihosting for an architecture. And we have 3
implementations that really could share much more code.
So: split out semihosting syscalls to individual functions,
and allow them to be wired up with a minimum of fuss. Fix a
few bugs and to-do items on the way.
Still to do:
* Merge semihosting console.c into GuestFD.
The ARM semihosting spec has separate syscalls for console output,
and expects the read/write syscalls to only apply to files.
But the other semihosting implementations assume stdin/stdout,
and we should be able to wire those up via the same mechanism.
* Errno. The ARM spec punts this entirely. But we aren't even
self-consistant, some paths returning host <errno.h> values,
and anything going through gdbstub using the gdb remote
file-io errno values. The arm and nios2 specs explicitly
call for the gdb values, which we are not doing.
* tests/tcg/m68k semihosting implementation.
* target/rx semihosting implementation.
r~
Richard Henderson (43):
semihosting: Move exec/softmmu-semi.h to semihosting/softmmu-uaccess.h
semihosting: Return failure from softmmu-uaccess.h functions
semihosting: Improve condition for config.c and console.c
semihosting: Move softmmu-uaccess functions out of line
semihosting: Add target_strlen for softmmu-uaccess.h
semihosting: Simplify softmmu_lock_user_string
semihosting: Split out guestfd.c
semihosting: Generalize GuestFDFeatureFile
semihosting: Return void from do_common_semihosting
semihosting: Adjust error checking in common_semi_cb
semihosting: Move common-semi.h to include/semihosting/
include/exec: Move gdb open flags to gdbstub.h
include/exec: Move gdb_stat and gdb_timeval to gdbstub.h
semihosting: Use struct gdb_stat in common_semi_flen_cb
semihosting: Split is_64bit_semihosting per target
semihosting: Split common_semi_flen_buf per target
semihosting: Split out common_semi_has_synccache
semihosting: Use env more often in do_common_semihosting
semihosting: Move GET_ARG/SET_ARG earlier in the file
semihosting: Split out semihost_sys_open
semihosting: Split out semihost_sys_close
semihosting: Split out semihost_sys_read
semihosting: Split out semihost_sys_write
semihosting: Bound length for semihost_sys_{read,write}
semihosting: Split out semihost_sys_lseek
semihosting: Split out semihost_sys_isatty
semihosting: Split out semihost_sys_flen
semihosting: Split out semihost_sys_remove
semihosting: Split out semihost_sys_rename
semihosting: Split out semihost_sys_system
semihosting: Create semihost_sys_{stat,fstat}
semihosting: Create semihost_sys_gettimeofday
gdbstub: Widen gdb_syscall_complete_cb return value
target/m68k: Eliminate m68k_semi_is_fseek
target/m68k: Make semihosting system only
target/m68k: Use guestfd.h to implement syscalls.
target/m68k: Do semihosting call as a normal helper
target/m68k: Enable semihosting for non-coldfire
target/m68k: Remove EXCP_HALT_INSN
target/nios2: Eliminate nios2_semi_is_lseek
target/nios2: Move nios2-semi.c to nios2_softmmu_ss
target/nios2: Use guestfd.h to implement syscalls.
target/nios2: Do semihosting call as a normal helper
configs/targets/aarch64-linux-user.mak | 1 +
configs/targets/aarch64_be-linux-user.mak | 1 +
configs/targets/arm-linux-user.mak | 1 +
configs/targets/armeb-linux-user.mak | 1 +
configs/targets/riscv32-linux-user.mak | 1 +
configs/targets/riscv64-linux-user.mak | 1 +
include/exec/gdbstub.h | 43 +-
include/exec/softmmu-semi.h | 101 --
.../semihosting}/common-semi.h | 2 +-
include/semihosting/guestfd.h | 95 ++
include/semihosting/softmmu-uaccess.h | 59 ++
target/arm/common-semi-target.h | 62 ++
target/m68k/cpu.h | 3 -
target/m68k/helper.h | 1 +
target/nios2/cpu.h | 3 -
target/nios2/helper.h | 1 +
target/riscv/common-semi-target.h | 50 +
gdbstub.c | 7 +-
linux-user/aarch64/cpu_loop.c | 2 +-
linux-user/arm/cpu_loop.c | 2 +-
linux-user/m68k/cpu_loop.c | 5 -
linux-user/riscv/cpu_loop.c | 2 +-
semihosting/arm-compat-semi.c | 955 ++++--------------
semihosting/console.c | 7 +-
semihosting/guestfd.c | 935 +++++++++++++++++
semihosting/uaccess.c | 71 ++
target/arm/helper.c | 4 +-
target/arm/m_helper.c | 2 +-
target/m68k/m68k-semi.c | 374 +------
target/m68k/op_helper.c | 15 -
target/m68k/translate.c | 38 +-
target/mips/tcg/sysemu/mips-semi.c | 2 +-
target/nios2/helper.c | 7 -
target/nios2/nios2-semi.c | 357 +------
target/nios2/translate.c | 2 +-
target/riscv/cpu_helper.c | 2 +-
semihosting/meson.build | 5 +
target/m68k/meson.build | 6 +-
target/nios2/meson.build | 4 +-
39 files changed, 1686 insertions(+), 1544 deletions(-)
delete mode 100644 include/exec/softmmu-semi.h
rename {semihosting => include/semihosting}/common-semi.h (96%)
create mode 100644 include/semihosting/guestfd.h
create mode 100644 include/semihosting/softmmu-uaccess.h
create mode 100644 target/arm/common-semi-target.h
create mode 100644 target/riscv/common-semi-target.h
create mode 100644 semihosting/guestfd.c
create mode 100644 semihosting/uaccess.c
--
2.34.1
^ permalink raw reply [flat|nested] 45+ messages in thread
* [PATCH 01/43] semihosting: Move exec/softmmu-semi.h to semihosting/softmmu-uaccess.h
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
@ 2022-04-30 13:28 ` Richard Henderson
2022-04-30 13:28 ` [PATCH 02/43] semihosting: Return failure from softmmu-uaccess.h functions Richard Henderson
` (42 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:28 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
We have a subdirectory for semihosting; move this file out of exec.
Rename to emphasize the contents are a replacement for the functions
in linux-user/bsd-user uaccess.c.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
.../{exec/softmmu-semi.h => semihosting/softmmu-uaccess.h} | 6 +++---
semihosting/arm-compat-semi.c | 2 +-
target/m68k/m68k-semi.c | 2 +-
target/mips/tcg/sysemu/mips-semi.c | 2 +-
target/nios2/nios2-semi.c | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
rename include/{exec/softmmu-semi.h => semihosting/softmmu-uaccess.h} (95%)
diff --git a/include/exec/softmmu-semi.h b/include/semihosting/softmmu-uaccess.h
similarity index 95%
rename from include/exec/softmmu-semi.h
rename to include/semihosting/softmmu-uaccess.h
index fbcae88f4b..e69e3c8548 100644
--- a/include/exec/softmmu-semi.h
+++ b/include/semihosting/softmmu-uaccess.h
@@ -7,8 +7,8 @@
* This code is licensed under the GPL
*/
-#ifndef SOFTMMU_SEMI_H
-#define SOFTMMU_SEMI_H
+#ifndef SEMIHOSTING_SOFTMMU_UACCESS_H
+#define SEMIHOSTING_SOFTMMU_UACCESS_H
#include "cpu.h"
@@ -98,4 +98,4 @@ static void softmmu_unlock_user(CPUArchState *env, void *p, target_ulong addr,
}
#define unlock_user(s, args, len) softmmu_unlock_user(env, s, args, len)
-#endif
+#endif /* SEMIHOSTING_SOFTMMU_UACCESS_H */
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 7a51fd0737..dbef280b87 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -370,7 +370,7 @@ static GuestFD *get_guestfd(int guestfd)
#ifndef CONFIG_USER_ONLY
static target_ulong syscall_err;
-#include "exec/softmmu-semi.h"
+#include "semihosting/softmmu-uaccess.h"
#endif
static inline uint32_t set_swi_errno(CPUState *cs, uint32_t code)
diff --git a/target/m68k/m68k-semi.c b/target/m68k/m68k-semi.c
index 37343d47e2..a31db38fc3 100644
--- a/target/m68k/m68k-semi.c
+++ b/target/m68k/m68k-semi.c
@@ -25,7 +25,7 @@
#include "qemu.h"
#define SEMIHOSTING_HEAP_SIZE (128 * 1024 * 1024)
#else
-#include "exec/softmmu-semi.h"
+#include "semihosting/softmmu-uaccess.h"
#include "hw/boards.h"
#endif
#include "qemu/log.h"
diff --git a/target/mips/tcg/sysemu/mips-semi.c b/target/mips/tcg/sysemu/mips-semi.c
index b4a383ae90..6d6296e709 100644
--- a/target/mips/tcg/sysemu/mips-semi.c
+++ b/target/mips/tcg/sysemu/mips-semi.c
@@ -21,7 +21,7 @@
#include "cpu.h"
#include "qemu/log.h"
#include "exec/helper-proto.h"
-#include "exec/softmmu-semi.h"
+#include "semihosting/softmmu-uaccess.h"
#include "semihosting/semihost.h"
#include "semihosting/console.h"
diff --git a/target/nios2/nios2-semi.c b/target/nios2/nios2-semi.c
index ec88474a73..373e6b9436 100644
--- a/target/nios2/nios2-semi.c
+++ b/target/nios2/nios2-semi.c
@@ -28,7 +28,7 @@
#if defined(CONFIG_USER_ONLY)
#include "qemu.h"
#else
-#include "exec/softmmu-semi.h"
+#include "semihosting/softmmu-uaccess.h"
#endif
#include "qemu/log.h"
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 02/43] semihosting: Return failure from softmmu-uaccess.h functions
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
2022-04-30 13:28 ` [PATCH 01/43] semihosting: Move exec/softmmu-semi.h to semihosting/softmmu-uaccess.h Richard Henderson
@ 2022-04-30 13:28 ` Richard Henderson
2022-04-30 13:28 ` [PATCH 03/43] semihosting: Improve condition for config.c and console.c Richard Henderson
` (41 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:28 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
We were reporting unconditional success for these functions;
pass on any failure from cpu_memory_rw_debug.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/softmmu-uaccess.h | 91 ++++++++++++---------------
1 file changed, 39 insertions(+), 52 deletions(-)
diff --git a/include/semihosting/softmmu-uaccess.h b/include/semihosting/softmmu-uaccess.h
index e69e3c8548..5246a91570 100644
--- a/include/semihosting/softmmu-uaccess.h
+++ b/include/semihosting/softmmu-uaccess.h
@@ -12,82 +12,69 @@
#include "cpu.h"
-static inline uint64_t softmmu_tget64(CPUArchState *env, target_ulong addr)
-{
- uint64_t val;
+#define get_user_u64(val, addr) \
+ ({ uint64_t val_ = 0; \
+ int ret_ = cpu_memory_rw_debug(env_cpu(env), (addr), \
+ &val_, sizeof(val_), 0); \
+ (val) = tswap64(val_); ret_; })
- cpu_memory_rw_debug(env_cpu(env), addr, (uint8_t *)&val, 8, 0);
- return tswap64(val);
-}
+#define get_user_u32(val, addr) \
+ ({ uint32_t val_ = 0; \
+ int ret_ = cpu_memory_rw_debug(env_cpu(env), (addr), \
+ &val_, sizeof(val_), 0); \
+ (val) = tswap32(val_); ret_; })
-static inline uint32_t softmmu_tget32(CPUArchState *env, target_ulong addr)
-{
- uint32_t val;
+#define get_user_u8(val, addr) \
+ ({ uint8_t val_ = 0; \
+ int ret_ = cpu_memory_rw_debug(env_cpu(env), (addr), \
+ &val_, sizeof(val_), 0); \
+ (val) = val_; ret_; })
- cpu_memory_rw_debug(env_cpu(env), addr, (uint8_t *)&val, 4, 0);
- return tswap32(val);
-}
-
-static inline uint32_t softmmu_tget8(CPUArchState *env, target_ulong addr)
-{
- uint8_t val;
-
- cpu_memory_rw_debug(env_cpu(env), addr, &val, 1, 0);
- return val;
-}
-
-#define get_user_u64(arg, p) ({ arg = softmmu_tget64(env, p); 0; })
-#define get_user_u32(arg, p) ({ arg = softmmu_tget32(env, p) ; 0; })
-#define get_user_u8(arg, p) ({ arg = softmmu_tget8(env, p) ; 0; })
#define get_user_ual(arg, p) get_user_u32(arg, p)
-static inline void softmmu_tput64(CPUArchState *env,
- target_ulong addr, uint64_t val)
-{
- val = tswap64(val);
- cpu_memory_rw_debug(env_cpu(env), addr, (uint8_t *)&val, 8, 1);
-}
+#define put_user_u64(val, addr) \
+ ({ uint64_t val_ = tswap64(val); \
+ cpu_memory_rw_debug(env_cpu(env), (addr), &val_, sizeof(val_), 1); })
+
+#define put_user_u32(val, addr) \
+ ({ uint32_t val_ = tswap32(val); \
+ cpu_memory_rw_debug(env_cpu(env), (addr), &val_, sizeof(val_), 1); })
-static inline void softmmu_tput32(CPUArchState *env,
- target_ulong addr, uint32_t val)
-{
- val = tswap32(val);
- cpu_memory_rw_debug(env_cpu(env), addr, (uint8_t *)&val, 4, 1);
-}
-#define put_user_u64(arg, p) ({ softmmu_tput64(env, p, arg) ; 0; })
-#define put_user_u32(arg, p) ({ softmmu_tput32(env, p, arg) ; 0; })
#define put_user_ual(arg, p) put_user_u32(arg, p)
-static void *softmmu_lock_user(CPUArchState *env,
- target_ulong addr, target_ulong len, int copy)
+static void *softmmu_lock_user(CPUArchState *env, target_ulong addr,
+ target_ulong len, bool copy)
{
- uint8_t *p;
- /* TODO: Make this something that isn't fixed size. */
- p = malloc(len);
+ void *p = malloc(len);
if (p && copy) {
- cpu_memory_rw_debug(env_cpu(env), addr, p, len, 0);
+ if (cpu_memory_rw_debug(env_cpu(env), addr, p, len, 0)) {
+ free(p);
+ p = NULL;
+ }
}
return p;
}
#define lock_user(type, p, len, copy) softmmu_lock_user(env, p, len, copy)
+
static char *softmmu_lock_user_string(CPUArchState *env, target_ulong addr)
{
- char *p;
- char *s;
- uint8_t c;
/* TODO: Make this something that isn't fixed size. */
- s = p = malloc(1024);
+ char *s = malloc(1024);
+ size_t len = 0;
+
if (!s) {
return NULL;
}
do {
- cpu_memory_rw_debug(env_cpu(env), addr, &c, 1, 0);
- addr++;
- *(p++) = c;
- } while (c);
+ if (cpu_memory_rw_debug(env_cpu(env), addr++, s + len, 1, 0)) {
+ free(s);
+ return NULL;
+ }
+ } while (s[len++]);
return s;
}
#define lock_user_string(p) softmmu_lock_user_string(env, p)
+
static void softmmu_unlock_user(CPUArchState *env, void *p, target_ulong addr,
target_ulong len)
{
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 03/43] semihosting: Improve condition for config.c and console.c
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
2022-04-30 13:28 ` [PATCH 01/43] semihosting: Move exec/softmmu-semi.h to semihosting/softmmu-uaccess.h Richard Henderson
2022-04-30 13:28 ` [PATCH 02/43] semihosting: Return failure from softmmu-uaccess.h functions Richard Henderson
@ 2022-04-30 13:28 ` Richard Henderson
2022-04-30 13:28 ` [PATCH 04/43] semihosting: Move softmmu-uaccess functions out of line Richard Henderson
` (40 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:28 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
While CONFIG_SEMIHOSTING is currently only set for softmmu,
this will not continue to be true.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
semihosting/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/semihosting/meson.build b/semihosting/meson.build
index ea8090abe3..4344e43fb9 100644
--- a/semihosting/meson.build
+++ b/semihosting/meson.build
@@ -1,4 +1,4 @@
-specific_ss.add(when: 'CONFIG_SEMIHOSTING', if_true: files(
+specific_ss.add(when: ['CONFIG_SEMIHOSTING', 'CONFIG_SOFTMMU'], if_true: files(
'config.c',
'console.c',
))
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 04/43] semihosting: Move softmmu-uaccess functions out of line
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (2 preceding siblings ...)
2022-04-30 13:28 ` [PATCH 03/43] semihosting: Improve condition for config.c and console.c Richard Henderson
@ 2022-04-30 13:28 ` Richard Henderson
2022-04-30 13:28 ` [PATCH 05/43] semihosting: Add target_strlen for softmmu-uaccess.h Richard Henderson
` (39 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:28 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
Rather that static (and not even inline) functions within a
header, move the functions to semihosting/uaccess.c.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/softmmu-uaccess.h | 42 +++-------------------
semihosting/uaccess.c | 51 +++++++++++++++++++++++++++
semihosting/meson.build | 1 +
3 files changed, 57 insertions(+), 37 deletions(-)
create mode 100644 semihosting/uaccess.c
diff --git a/include/semihosting/softmmu-uaccess.h b/include/semihosting/softmmu-uaccess.h
index 5246a91570..03300376d3 100644
--- a/include/semihosting/softmmu-uaccess.h
+++ b/include/semihosting/softmmu-uaccess.h
@@ -42,47 +42,15 @@
#define put_user_ual(arg, p) put_user_u32(arg, p)
-static void *softmmu_lock_user(CPUArchState *env, target_ulong addr,
- target_ulong len, bool copy)
-{
- void *p = malloc(len);
- if (p && copy) {
- if (cpu_memory_rw_debug(env_cpu(env), addr, p, len, 0)) {
- free(p);
- p = NULL;
- }
- }
- return p;
-}
+void *softmmu_lock_user(CPUArchState *env, target_ulong addr,
+ target_ulong len, bool copy);
#define lock_user(type, p, len, copy) softmmu_lock_user(env, p, len, copy)
-static char *softmmu_lock_user_string(CPUArchState *env, target_ulong addr)
-{
- /* TODO: Make this something that isn't fixed size. */
- char *s = malloc(1024);
- size_t len = 0;
-
- if (!s) {
- return NULL;
- }
- do {
- if (cpu_memory_rw_debug(env_cpu(env), addr++, s + len, 1, 0)) {
- free(s);
- return NULL;
- }
- } while (s[len++]);
- return s;
-}
+char *softmmu_lock_user_string(CPUArchState *env, target_ulong addr);
#define lock_user_string(p) softmmu_lock_user_string(env, p)
-static void softmmu_unlock_user(CPUArchState *env, void *p, target_ulong addr,
- target_ulong len)
-{
- if (len) {
- cpu_memory_rw_debug(env_cpu(env), addr, p, len, 1);
- }
- free(p);
-}
+void softmmu_unlock_user(CPUArchState *env, void *p,
+ target_ulong addr, target_ulong len);
#define unlock_user(s, args, len) softmmu_unlock_user(env, s, args, len)
#endif /* SEMIHOSTING_SOFTMMU_UACCESS_H */
diff --git a/semihosting/uaccess.c b/semihosting/uaccess.c
new file mode 100644
index 0000000000..0d3b32b75d
--- /dev/null
+++ b/semihosting/uaccess.c
@@ -0,0 +1,51 @@
+/*
+ * Helper routines to provide target memory access for semihosting
+ * syscalls in system emulation mode.
+ *
+ * Copyright (c) 2007 CodeSourcery.
+ *
+ * This code is licensed under the GPL
+ */
+
+#include "qemu/osdep.h"
+#include "semihosting/softmmu-uaccess.h"
+
+void *softmmu_lock_user(CPUArchState *env, target_ulong addr,
+ target_ulong len, bool copy)
+{
+ void *p = malloc(len);
+ if (p && copy) {
+ if (cpu_memory_rw_debug(env_cpu(env), addr, p, len, 0)) {
+ free(p);
+ p = NULL;
+ }
+ }
+ return p;
+}
+
+char *softmmu_lock_user_string(CPUArchState *env, target_ulong addr)
+{
+ /* TODO: Make this something that isn't fixed size. */
+ char *s = malloc(1024);
+ size_t len = 0;
+
+ if (!s) {
+ return NULL;
+ }
+ do {
+ if (cpu_memory_rw_debug(env_cpu(env), addr++, s + len, 1, 0)) {
+ free(s);
+ return NULL;
+ }
+ } while (s[len++]);
+ return s;
+}
+
+void softmmu_unlock_user(CPUArchState *env, void *p,
+ target_ulong addr, target_ulong len)
+{
+ if (len) {
+ cpu_memory_rw_debug(env_cpu(env), addr, p, len, 1);
+ }
+ free(p);
+}
diff --git a/semihosting/meson.build b/semihosting/meson.build
index 4344e43fb9..10b3b99921 100644
--- a/semihosting/meson.build
+++ b/semihosting/meson.build
@@ -1,6 +1,7 @@
specific_ss.add(when: ['CONFIG_SEMIHOSTING', 'CONFIG_SOFTMMU'], if_true: files(
'config.c',
'console.c',
+ 'uaccess.c',
))
specific_ss.add(when: ['CONFIG_ARM_COMPATIBLE_SEMIHOSTING'],
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 05/43] semihosting: Add target_strlen for softmmu-uaccess.h
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (3 preceding siblings ...)
2022-04-30 13:28 ` [PATCH 04/43] semihosting: Move softmmu-uaccess functions out of line Richard Henderson
@ 2022-04-30 13:28 ` Richard Henderson
2022-04-30 13:28 ` [PATCH 06/43] semihosting: Simplify softmmu_lock_user_string Richard Henderson
` (38 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:28 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
Mirror the user-only function of the same name.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/softmmu-uaccess.h | 3 +++
semihosting/uaccess.c | 29 +++++++++++++++++++++++++++
2 files changed, 32 insertions(+)
diff --git a/include/semihosting/softmmu-uaccess.h b/include/semihosting/softmmu-uaccess.h
index 03300376d3..4f08dfc098 100644
--- a/include/semihosting/softmmu-uaccess.h
+++ b/include/semihosting/softmmu-uaccess.h
@@ -53,4 +53,7 @@ void softmmu_unlock_user(CPUArchState *env, void *p,
target_ulong addr, target_ulong len);
#define unlock_user(s, args, len) softmmu_unlock_user(env, s, args, len)
+ssize_t softmmu_strlen_user(CPUArchState *env, target_ulong addr);
+#define target_strlen(p) softmmu_strlen_user(env, p)
+
#endif /* SEMIHOSTING_SOFTMMU_UACCESS_H */
diff --git a/semihosting/uaccess.c b/semihosting/uaccess.c
index 0d3b32b75d..3cd809122c 100644
--- a/semihosting/uaccess.c
+++ b/semihosting/uaccess.c
@@ -23,6 +23,35 @@ void *softmmu_lock_user(CPUArchState *env, target_ulong addr,
return p;
}
+ssize_t softmmu_strlen_user(CPUArchState *env, target_ulong addr)
+{
+ char buf[256];
+ size_t len = 0;
+
+ while (1) {
+ size_t chunk;
+ char *p;
+
+ chunk = -(addr | TARGET_PAGE_MASK);
+ chunk = MIN(chunk, sizeof(buf));
+
+ if (cpu_memory_rw_debug(env_cpu(env), addr, buf, chunk, 0)) {
+ return -1;
+ }
+ p = memchr(buf, 0, chunk);
+ if (p) {
+ len += p - buf;
+ return len <= INT32_MAX ? (ssize_t)len : -1;
+ }
+
+ len += chunk;
+ addr += chunk;
+ if (len > INT32_MAX) {
+ return -1;
+ }
+ }
+}
+
char *softmmu_lock_user_string(CPUArchState *env, target_ulong addr)
{
/* TODO: Make this something that isn't fixed size. */
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 06/43] semihosting: Simplify softmmu_lock_user_string
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (4 preceding siblings ...)
2022-04-30 13:28 ` [PATCH 05/43] semihosting: Add target_strlen for softmmu-uaccess.h Richard Henderson
@ 2022-04-30 13:28 ` Richard Henderson
2022-04-30 13:28 ` [PATCH 07/43] semihosting: Split out guestfd.c Richard Henderson
` (37 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:28 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
We are not currently bounding the search to the 1024 bytes
that we allocated, possibly overrunning the buffer.
Use softmmu_strlen_user to find the length and allocate the
correct size from the beginning.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
semihosting/uaccess.c | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/semihosting/uaccess.c b/semihosting/uaccess.c
index 3cd809122c..f5fc94c401 100644
--- a/semihosting/uaccess.c
+++ b/semihosting/uaccess.c
@@ -54,20 +54,11 @@ ssize_t softmmu_strlen_user(CPUArchState *env, target_ulong addr)
char *softmmu_lock_user_string(CPUArchState *env, target_ulong addr)
{
- /* TODO: Make this something that isn't fixed size. */
- char *s = malloc(1024);
- size_t len = 0;
-
- if (!s) {
+ ssize_t len = softmmu_strlen_user(env, addr);
+ if (len < 0) {
return NULL;
}
- do {
- if (cpu_memory_rw_debug(env_cpu(env), addr++, s + len, 1, 0)) {
- free(s);
- return NULL;
- }
- } while (s[len++]);
- return s;
+ return softmmu_lock_user(env, addr, len + 1, true);
}
void softmmu_unlock_user(CPUArchState *env, void *p,
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 07/43] semihosting: Split out guestfd.c
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (5 preceding siblings ...)
2022-04-30 13:28 ` [PATCH 06/43] semihosting: Simplify softmmu_lock_user_string Richard Henderson
@ 2022-04-30 13:28 ` Richard Henderson
2022-04-30 13:28 ` [PATCH 08/43] semihosting: Generalize GuestFDFeatureFile Richard Henderson
` (36 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:28 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
In arm-compat-semi.c, we have more advanced treatment of
guest file descriptors than we do in other implementations.
Split out GuestFD and related functions to a new file so
that they can be shared.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
configs/targets/aarch64-linux-user.mak | 1 +
configs/targets/aarch64_be-linux-user.mak | 1 +
configs/targets/arm-linux-user.mak | 1 +
configs/targets/armeb-linux-user.mak | 1 +
configs/targets/riscv32-linux-user.mak | 1 +
configs/targets/riscv64-linux-user.mak | 1 +
include/semihosting/guestfd.h | 40 +++++++
semihosting/arm-compat-semi.c | 125 +---------------------
semihosting/guestfd.c | 116 ++++++++++++++++++++
semihosting/meson.build | 4 +
10 files changed, 168 insertions(+), 123 deletions(-)
create mode 100644 include/semihosting/guestfd.h
create mode 100644 semihosting/guestfd.c
diff --git a/configs/targets/aarch64-linux-user.mak b/configs/targets/aarch64-linux-user.mak
index d0c603c54e..db552f1839 100644
--- a/configs/targets/aarch64-linux-user.mak
+++ b/configs/targets/aarch64-linux-user.mak
@@ -2,4 +2,5 @@ TARGET_ARCH=aarch64
TARGET_BASE_ARCH=arm
TARGET_XML_FILES= gdb-xml/aarch64-core.xml gdb-xml/aarch64-fpu.xml
TARGET_HAS_BFLT=y
+CONFIG_SEMIHOSTING=y
CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
diff --git a/configs/targets/aarch64_be-linux-user.mak b/configs/targets/aarch64_be-linux-user.mak
index 7794424745..dc78044fb1 100644
--- a/configs/targets/aarch64_be-linux-user.mak
+++ b/configs/targets/aarch64_be-linux-user.mak
@@ -3,4 +3,5 @@ TARGET_BASE_ARCH=arm
TARGET_BIG_ENDIAN=y
TARGET_XML_FILES= gdb-xml/aarch64-core.xml gdb-xml/aarch64-fpu.xml
TARGET_HAS_BFLT=y
+CONFIG_SEMIHOSTING=y
CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
diff --git a/configs/targets/arm-linux-user.mak b/configs/targets/arm-linux-user.mak
index 3e10d6b15d..7f5d65794c 100644
--- a/configs/targets/arm-linux-user.mak
+++ b/configs/targets/arm-linux-user.mak
@@ -3,4 +3,5 @@ TARGET_SYSTBL_ABI=common,oabi
TARGET_SYSTBL=syscall.tbl
TARGET_XML_FILES= gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml gdb-xml/arm-vfp-sysregs.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-profile.xml gdb-xml/arm-m-profile-mve.xml
TARGET_HAS_BFLT=y
+CONFIG_SEMIHOSTING=y
CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
diff --git a/configs/targets/armeb-linux-user.mak b/configs/targets/armeb-linux-user.mak
index a249cc2e29..943d0d87bf 100644
--- a/configs/targets/armeb-linux-user.mak
+++ b/configs/targets/armeb-linux-user.mak
@@ -4,4 +4,5 @@ TARGET_SYSTBL=syscall.tbl
TARGET_BIG_ENDIAN=y
TARGET_XML_FILES= gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml gdb-xml/arm-vfp-sysregs.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-profile.xml gdb-xml/arm-m-profile-mve.xml
TARGET_HAS_BFLT=y
+CONFIG_SEMIHOSTING=y
CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
diff --git a/configs/targets/riscv32-linux-user.mak b/configs/targets/riscv32-linux-user.mak
index bd2f1fd497..9761618e67 100644
--- a/configs/targets/riscv32-linux-user.mak
+++ b/configs/targets/riscv32-linux-user.mak
@@ -2,4 +2,5 @@ TARGET_ARCH=riscv32
TARGET_BASE_ARCH=riscv
TARGET_ABI_DIR=riscv
TARGET_XML_FILES= gdb-xml/riscv-32bit-cpu.xml gdb-xml/riscv-32bit-fpu.xml gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-32bit-virtual.xml
+CONFIG_SEMIHOSTING=y
CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
diff --git a/configs/targets/riscv64-linux-user.mak b/configs/targets/riscv64-linux-user.mak
index 4aca7662ce..cfd1fd382f 100644
--- a/configs/targets/riscv64-linux-user.mak
+++ b/configs/targets/riscv64-linux-user.mak
@@ -2,4 +2,5 @@ TARGET_ARCH=riscv64
TARGET_BASE_ARCH=riscv
TARGET_ABI_DIR=riscv
TARGET_XML_FILES= gdb-xml/riscv-64bit-cpu.xml gdb-xml/riscv-32bit-fpu.xml gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-64bit-virtual.xml
+CONFIG_SEMIHOSTING=y
CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
diff --git a/include/semihosting/guestfd.h b/include/semihosting/guestfd.h
new file mode 100644
index 0000000000..5d6e744305
--- /dev/null
+++ b/include/semihosting/guestfd.h
@@ -0,0 +1,40 @@
+/*
+ * Hosted file support for semihosting syscalls.
+ *
+ * Copyright (c) 2005, 2007 CodeSourcery.
+ * Copyright (c) 2019 Linaro
+ * Copyright © 2020 by Keith Packard <keithp@keithp.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#ifndef SEMIHOSTING_GUESTFD_H
+#define SEMIHOSTING_GUESTFD_H
+
+typedef enum GuestFDType {
+ GuestFDUnused = 0,
+ GuestFDHost = 1,
+ GuestFDGDB = 2,
+ GuestFDFeatureFile = 3,
+} GuestFDType;
+
+/*
+ * Guest file descriptors are integer indexes into an array of
+ * these structures (we will dynamically resize as necessary).
+ */
+typedef struct GuestFD {
+ GuestFDType type;
+ union {
+ int hostfd;
+ unsigned featurefile_offset;
+ };
+} GuestFD;
+
+int alloc_guestfd(void);
+void dealloc_guestfd(int guestfd);
+GuestFD *get_guestfd(int guestfd);
+
+void associate_guestfd(int guestfd, int hostfd);
+void init_featurefile_guestfd(int guestfd);
+
+#endif /* SEMIHOSTING_GUESTFD_H */
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index dbef280b87..c092138031 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -32,12 +32,13 @@
*/
#include "qemu/osdep.h"
-
#include "semihosting/semihost.h"
#include "semihosting/console.h"
#include "semihosting/common-semi.h"
+#include "semihosting/guestfd.h"
#include "qemu/timer.h"
#include "exec/gdbstub.h"
+
#ifdef CONFIG_USER_ONLY
#include "qemu.h"
@@ -123,27 +124,6 @@ static int open_modeflags[12] = {
O_RDWR | O_CREAT | O_APPEND | O_BINARY
};
-typedef enum GuestFDType {
- GuestFDUnused = 0,
- GuestFDHost = 1,
- GuestFDGDB = 2,
- GuestFDFeatureFile = 3,
-} GuestFDType;
-
-/*
- * Guest file descriptors are integer indexes into an array of
- * these structures (we will dynamically resize as necessary).
- */
-typedef struct GuestFD {
- GuestFDType type;
- union {
- int hostfd;
- target_ulong featurefile_offset;
- };
-} GuestFD;
-
-static GArray *guestfd_array;
-
#ifndef CONFIG_USER_ONLY
/**
@@ -268,98 +248,6 @@ common_semi_sys_exit_extended(CPUState *cs, int nr)
#endif
-/*
- * Allocate a new guest file descriptor and return it; if we
- * couldn't allocate a new fd then return -1.
- * This is a fairly simplistic implementation because we don't
- * expect that most semihosting guest programs will make very
- * heavy use of opening and closing fds.
- */
-static int alloc_guestfd(void)
-{
- guint i;
-
- if (!guestfd_array) {
- /* New entries zero-initialized, i.e. type GuestFDUnused */
- guestfd_array = g_array_new(FALSE, TRUE, sizeof(GuestFD));
- }
-
- /* SYS_OPEN should return nonzero handle on success. Start guestfd from 1 */
- for (i = 1; i < guestfd_array->len; i++) {
- GuestFD *gf = &g_array_index(guestfd_array, GuestFD, i);
-
- if (gf->type == GuestFDUnused) {
- return i;
- }
- }
-
- /* All elements already in use: expand the array */
- g_array_set_size(guestfd_array, i + 1);
- return i;
-}
-
-/*
- * Look up the guestfd in the data structure; return NULL
- * for out of bounds, but don't check whether the slot is unused.
- * This is used internally by the other guestfd functions.
- */
-static GuestFD *do_get_guestfd(int guestfd)
-{
- if (!guestfd_array) {
- return NULL;
- }
-
- if (guestfd <= 0 || guestfd >= guestfd_array->len) {
- return NULL;
- }
-
- return &g_array_index(guestfd_array, GuestFD, guestfd);
-}
-
-/*
- * Associate the specified guest fd (which must have been
- * allocated via alloc_fd() and not previously used) with
- * the specified host/gdb fd.
- */
-static void associate_guestfd(int guestfd, int hostfd)
-{
- GuestFD *gf = do_get_guestfd(guestfd);
-
- assert(gf);
- gf->type = use_gdb_syscalls() ? GuestFDGDB : GuestFDHost;
- gf->hostfd = hostfd;
-}
-
-/*
- * Deallocate the specified guest file descriptor. This doesn't
- * close the host fd, it merely undoes the work of alloc_fd().
- */
-static void dealloc_guestfd(int guestfd)
-{
- GuestFD *gf = do_get_guestfd(guestfd);
-
- assert(gf);
- gf->type = GuestFDUnused;
-}
-
-/*
- * Given a guest file descriptor, get the associated struct.
- * If the fd is not valid, return NULL. This is the function
- * used by the various semihosting calls to validate a handle
- * from the guest.
- * Note: calling alloc_guestfd() or dealloc_guestfd() will
- * invalidate any GuestFD* obtained by calling this function.
- */
-static GuestFD *get_guestfd(int guestfd)
-{
- GuestFD *gf = do_get_guestfd(guestfd);
-
- if (!gf || gf->type == GuestFDUnused) {
- return NULL;
- }
- return gf;
-}
-
/*
* The semihosting API has no concept of its errno being thread-safe,
* as the API design predates SMP CPUs and was intended as a simple
@@ -665,15 +553,6 @@ static const uint8_t featurefile_data[] = {
SH_EXT_EXIT_EXTENDED | SH_EXT_STDOUT_STDERR, /* Feature byte 0 */
};
-static void init_featurefile_guestfd(int guestfd)
-{
- GuestFD *gf = do_get_guestfd(guestfd);
-
- assert(gf);
- gf->type = GuestFDFeatureFile;
- gf->featurefile_offset = 0;
-}
-
static uint32_t featurefile_closefn(CPUState *cs, GuestFD *gf)
{
/* Nothing to do */
diff --git a/semihosting/guestfd.c b/semihosting/guestfd.c
new file mode 100644
index 0000000000..e77265db0f
--- /dev/null
+++ b/semihosting/guestfd.c
@@ -0,0 +1,116 @@
+/*
+ * Hosted file support for semihosting syscalls.
+ *
+ * Copyright (c) 2005, 2007 CodeSourcery.
+ * Copyright (c) 2019 Linaro
+ * Copyright © 2020 by Keith Packard <keithp@keithp.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "qemu/osdep.h"
+#include "exec/gdbstub.h"
+#include "semihosting/guestfd.h"
+
+static GArray *guestfd_array;
+
+/*
+ * Allocate a new guest file descriptor and return it; if we
+ * couldn't allocate a new fd then return -1.
+ * This is a fairly simplistic implementation because we don't
+ * expect that most semihosting guest programs will make very
+ * heavy use of opening and closing fds.
+ */
+int alloc_guestfd(void)
+{
+ guint i;
+
+ if (!guestfd_array) {
+ /* New entries zero-initialized, i.e. type GuestFDUnused */
+ guestfd_array = g_array_new(FALSE, TRUE, sizeof(GuestFD));
+ }
+
+ /* SYS_OPEN should return nonzero handle on success. Start guestfd from 1 */
+ for (i = 1; i < guestfd_array->len; i++) {
+ GuestFD *gf = &g_array_index(guestfd_array, GuestFD, i);
+
+ if (gf->type == GuestFDUnused) {
+ return i;
+ }
+ }
+
+ /* All elements already in use: expand the array */
+ g_array_set_size(guestfd_array, i + 1);
+ return i;
+}
+
+/*
+ * Look up the guestfd in the data structure; return NULL
+ * for out of bounds, but don't check whether the slot is unused.
+ * This is used internally by the other guestfd functions.
+ */
+static GuestFD *do_get_guestfd(int guestfd)
+{
+ if (!guestfd_array) {
+ return NULL;
+ }
+
+ if (guestfd <= 0 || guestfd >= guestfd_array->len) {
+ return NULL;
+ }
+
+ return &g_array_index(guestfd_array, GuestFD, guestfd);
+}
+
+/*
+ * Given a guest file descriptor, get the associated struct.
+ * If the fd is not valid, return NULL. This is the function
+ * used by the various semihosting calls to validate a handle
+ * from the guest.
+ * Note: calling alloc_guestfd() or dealloc_guestfd() will
+ * invalidate any GuestFD* obtained by calling this function.
+ */
+GuestFD *get_guestfd(int guestfd)
+{
+ GuestFD *gf = do_get_guestfd(guestfd);
+
+ if (!gf || gf->type == GuestFDUnused) {
+ return NULL;
+ }
+ return gf;
+}
+
+/*
+ * Associate the specified guest fd (which must have been
+ * allocated via alloc_fd() and not previously used) with
+ * the specified host/gdb fd.
+ */
+void associate_guestfd(int guestfd, int hostfd)
+{
+ GuestFD *gf = do_get_guestfd(guestfd);
+
+ assert(gf);
+ gf->type = use_gdb_syscalls() ? GuestFDGDB : GuestFDHost;
+ gf->hostfd = hostfd;
+}
+
+void init_featurefile_guestfd(int guestfd)
+{
+ GuestFD *gf = do_get_guestfd(guestfd);
+
+ assert(gf);
+ gf->type = GuestFDFeatureFile;
+ gf->featurefile_offset = 0;
+}
+
+/*
+ * Deallocate the specified guest file descriptor. This doesn't
+ * close the host fd, it merely undoes the work of alloc_fd().
+ */
+void dealloc_guestfd(int guestfd)
+{
+ GuestFD *gf = do_get_guestfd(guestfd);
+
+ assert(gf);
+ gf->type = GuestFDUnused;
+}
diff --git a/semihosting/meson.build b/semihosting/meson.build
index 10b3b99921..d2c1c37bfd 100644
--- a/semihosting/meson.build
+++ b/semihosting/meson.build
@@ -1,3 +1,7 @@
+specific_ss.add(when: 'CONFIG_SEMIHOSTING', if_true: files(
+ 'guestfd.c',
+))
+
specific_ss.add(when: ['CONFIG_SEMIHOSTING', 'CONFIG_SOFTMMU'], if_true: files(
'config.c',
'console.c',
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 08/43] semihosting: Generalize GuestFDFeatureFile
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (6 preceding siblings ...)
2022-04-30 13:28 ` [PATCH 07/43] semihosting: Split out guestfd.c Richard Henderson
@ 2022-04-30 13:28 ` Richard Henderson
2022-04-30 13:28 ` [PATCH 09/43] semihosting: Return void from do_common_semihosting Richard Henderson
` (35 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:28 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
Rather than hard-coding the buffer from which we deliver data,
pass it in on initialization. This decouples the feature from
ARM semihosting.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/guestfd.h | 10 ++++++---
semihosting/arm-compat-semi.c | 39 ++++++++++++++++++-----------------
semihosting/guestfd.c | 8 ++++---
3 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/include/semihosting/guestfd.h b/include/semihosting/guestfd.h
index 5d6e744305..5aa2722cb2 100644
--- a/include/semihosting/guestfd.h
+++ b/include/semihosting/guestfd.h
@@ -15,7 +15,7 @@ typedef enum GuestFDType {
GuestFDUnused = 0,
GuestFDHost = 1,
GuestFDGDB = 2,
- GuestFDFeatureFile = 3,
+ GuestFDStatic = 3,
} GuestFDType;
/*
@@ -26,7 +26,11 @@ typedef struct GuestFD {
GuestFDType type;
union {
int hostfd;
- unsigned featurefile_offset;
+ struct {
+ const uint8_t *data;
+ size_t len;
+ size_t off;
+ } staticfile;
};
} GuestFD;
@@ -35,6 +39,6 @@ void dealloc_guestfd(int guestfd);
GuestFD *get_guestfd(int guestfd);
void associate_guestfd(int guestfd, int hostfd);
-void init_featurefile_guestfd(int guestfd);
+void staticfile_guestfd(int guestfd, const uint8_t *data, size_t len);
#endif /* SEMIHOSTING_GUESTFD_H */
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index c092138031..c6bfd4d1ba 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -553,13 +553,13 @@ static const uint8_t featurefile_data[] = {
SH_EXT_EXIT_EXTENDED | SH_EXT_STDOUT_STDERR, /* Feature byte 0 */
};
-static uint32_t featurefile_closefn(CPUState *cs, GuestFD *gf)
+static uint32_t staticfile_closefn(CPUState *cs, GuestFD *gf)
{
/* Nothing to do */
return 0;
}
-static uint32_t featurefile_writefn(CPUState *cs, GuestFD *gf,
+static uint32_t staticfile_writefn(CPUState *cs, GuestFD *gf,
target_ulong buf, uint32_t len)
{
/* This fd can never be open for writing */
@@ -568,7 +568,7 @@ static uint32_t featurefile_writefn(CPUState *cs, GuestFD *gf,
return set_swi_errno(cs, -1);
}
-static uint32_t featurefile_readfn(CPUState *cs, GuestFD *gf,
+static uint32_t staticfile_readfn(CPUState *cs, GuestFD *gf,
target_ulong buf, uint32_t len)
{
CPUArchState *env = cs->env_ptr;
@@ -582,11 +582,11 @@ static uint32_t featurefile_readfn(CPUState *cs, GuestFD *gf,
}
for (i = 0; i < len; i++) {
- if (gf->featurefile_offset >= sizeof(featurefile_data)) {
+ if (gf->staticfile.off >= gf->staticfile.len) {
break;
}
- s[i] = featurefile_data[gf->featurefile_offset];
- gf->featurefile_offset++;
+ s[i] = gf->staticfile.data[gf->staticfile.off];
+ gf->staticfile.off++;
}
unlock_user(s, buf, len);
@@ -595,21 +595,21 @@ static uint32_t featurefile_readfn(CPUState *cs, GuestFD *gf,
return len - i;
}
-static uint32_t featurefile_isattyfn(CPUState *cs, GuestFD *gf)
+static uint32_t staticfile_isattyfn(CPUState *cs, GuestFD *gf)
{
return 0;
}
-static uint32_t featurefile_seekfn(CPUState *cs, GuestFD *gf,
+static uint32_t staticfile_seekfn(CPUState *cs, GuestFD *gf,
target_ulong offset)
{
- gf->featurefile_offset = offset;
+ gf->staticfile.off = offset;
return 0;
}
-static uint32_t featurefile_flenfn(CPUState *cs, GuestFD *gf)
+static uint32_t staticfile_flenfn(CPUState *cs, GuestFD *gf)
{
- return sizeof(featurefile_data);
+ return gf->staticfile.len;
}
typedef struct GuestFDFunctions {
@@ -638,13 +638,13 @@ static const GuestFDFunctions guestfd_fns[] = {
.seekfn = gdb_seekfn,
.flenfn = gdb_flenfn,
},
- [GuestFDFeatureFile] = {
- .closefn = featurefile_closefn,
- .writefn = featurefile_writefn,
- .readfn = featurefile_readfn,
- .isattyfn = featurefile_isattyfn,
- .seekfn = featurefile_seekfn,
- .flenfn = featurefile_flenfn,
+ [GuestFDStatic] = {
+ .closefn = staticfile_closefn,
+ .writefn = staticfile_writefn,
+ .readfn = staticfile_readfn,
+ .isattyfn = staticfile_isattyfn,
+ .seekfn = staticfile_seekfn,
+ .flenfn = staticfile_flenfn,
},
};
@@ -765,7 +765,8 @@ target_ulong do_common_semihosting(CPUState *cs)
errno = EACCES;
return set_swi_errno(cs, -1);
}
- init_featurefile_guestfd(guestfd);
+ staticfile_guestfd(guestfd, featurefile_data,
+ sizeof(featurefile_data));
return guestfd;
}
diff --git a/semihosting/guestfd.c b/semihosting/guestfd.c
index e77265db0f..b6405f5663 100644
--- a/semihosting/guestfd.c
+++ b/semihosting/guestfd.c
@@ -94,13 +94,15 @@ void associate_guestfd(int guestfd, int hostfd)
gf->hostfd = hostfd;
}
-void init_featurefile_guestfd(int guestfd)
+void staticfile_guestfd(int guestfd, const uint8_t *data, size_t len)
{
GuestFD *gf = do_get_guestfd(guestfd);
assert(gf);
- gf->type = GuestFDFeatureFile;
- gf->featurefile_offset = 0;
+ gf->type = GuestFDStatic;
+ gf->staticfile.data = data;
+ gf->staticfile.len = len;
+ gf->staticfile.off = 0;
}
/*
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 09/43] semihosting: Return void from do_common_semihosting
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (7 preceding siblings ...)
2022-04-30 13:28 ` [PATCH 08/43] semihosting: Generalize GuestFDFeatureFile Richard Henderson
@ 2022-04-30 13:28 ` Richard Henderson
2022-04-30 13:28 ` [PATCH 10/43] semihosting: Adjust error checking in common_semi_cb Richard Henderson
` (34 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:28 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
Perform the cleanup in the FIXME comment in common_semi_gdb_syscall.
Do not modify guest registers until the syscall is complete,
which in the gdbstub case is asynchronous.
In the synchronous non-gdbstub case, use common_semi_set_ret
to set the result. Merge set_swi_errno into common_semi_cb.
Rely on the latter for combined return value / errno setting.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
semihosting/common-semi.h | 2 +-
linux-user/aarch64/cpu_loop.c | 2 +-
linux-user/arm/cpu_loop.c | 2 +-
linux-user/riscv/cpu_loop.c | 2 +-
semihosting/arm-compat-semi.c | 571 ++++++++++++++++------------------
target/arm/helper.c | 4 +-
target/arm/m_helper.c | 2 +-
target/riscv/cpu_helper.c | 2 +-
8 files changed, 278 insertions(+), 309 deletions(-)
diff --git a/semihosting/common-semi.h b/semihosting/common-semi.h
index 0bfab1c669..0a91db7c41 100644
--- a/semihosting/common-semi.h
+++ b/semihosting/common-semi.h
@@ -34,6 +34,6 @@
#ifndef COMMON_SEMI_H
#define COMMON_SEMI_H
-target_ulong do_common_semihosting(CPUState *cs);
+void do_common_semihosting(CPUState *cs);
#endif /* COMMON_SEMI_H */
diff --git a/linux-user/aarch64/cpu_loop.c b/linux-user/aarch64/cpu_loop.c
index 3b273f6299..f7ef36cd9f 100644
--- a/linux-user/aarch64/cpu_loop.c
+++ b/linux-user/aarch64/cpu_loop.c
@@ -154,7 +154,7 @@ void cpu_loop(CPUARMState *env)
force_sig_fault(TARGET_SIGTRAP, TARGET_TRAP_BRKPT, env->pc);
break;
case EXCP_SEMIHOST:
- env->xregs[0] = do_common_semihosting(cs);
+ do_common_semihosting(cs);
env->pc += 4;
break;
case EXCP_YIELD:
diff --git a/linux-user/arm/cpu_loop.c b/linux-user/arm/cpu_loop.c
index d950409d5b..c0790f3246 100644
--- a/linux-user/arm/cpu_loop.c
+++ b/linux-user/arm/cpu_loop.c
@@ -449,7 +449,7 @@ void cpu_loop(CPUARMState *env)
}
break;
case EXCP_SEMIHOST:
- env->regs[0] = do_common_semihosting(cs);
+ do_common_semihosting(cs);
env->regs[15] += env->thumb ? 2 : 4;
break;
case EXCP_INTERRUPT:
diff --git a/linux-user/riscv/cpu_loop.c b/linux-user/riscv/cpu_loop.c
index 29084c1421..bffca7db12 100644
--- a/linux-user/riscv/cpu_loop.c
+++ b/linux-user/riscv/cpu_loop.c
@@ -81,7 +81,7 @@ void cpu_loop(CPURISCVState *env)
force_sig_fault(TARGET_SIGTRAP, TARGET_TRAP_BRKPT, env->pc);
break;
case RISCV_EXCP_SEMIHOST:
- env->gpr[xA0] = do_common_semihosting(cs);
+ do_common_semihosting(cs);
env->pc += 4;
break;
default:
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index c6bfd4d1ba..7030dfd587 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -261,20 +261,6 @@ static target_ulong syscall_err;
#include "semihosting/softmmu-uaccess.h"
#endif
-static inline uint32_t set_swi_errno(CPUState *cs, uint32_t code)
-{
- if (code == (uint32_t)-1) {
-#ifdef CONFIG_USER_ONLY
- TaskState *ts = cs->opaque;
-
- ts->swi_errno = errno;
-#else
- syscall_err = errno;
-#endif
- }
- return code;
-}
-
static inline uint32_t get_swi_errno(CPUState *cs)
{
#ifdef CONFIG_USER_ONLY
@@ -290,28 +276,29 @@ static target_ulong common_semi_syscall_len;
static void common_semi_cb(CPUState *cs, target_ulong ret, target_ulong err)
{
- target_ulong reg0 = common_semi_arg(cs, 0);
-
if (ret == (target_ulong)-1) {
- errno = err;
- set_swi_errno(cs, -1);
- reg0 = ret;
+#ifdef CONFIG_USER_ONLY
+ TaskState *ts = cs->opaque;
+ ts->swi_errno = err;
+#else
+ syscall_err = err;
+#endif
} else {
/* Fixup syscalls that use nonstardard return conventions. */
+ target_ulong reg0 = common_semi_arg(cs, 0);
switch (reg0) {
case TARGET_SYS_WRITE:
case TARGET_SYS_READ:
- reg0 = common_semi_syscall_len - ret;
+ ret = common_semi_syscall_len - ret;
break;
case TARGET_SYS_SEEK:
- reg0 = 0;
+ ret = 0;
break;
default:
- reg0 = ret;
break;
}
}
- common_semi_set_ret(cs, reg0);
+ common_semi_set_ret(cs, ret);
}
static target_ulong common_semi_flen_buf(CPUState *cs)
@@ -351,9 +338,8 @@ common_semi_flen_cb(CPUState *cs, target_ulong ret, target_ulong err)
cpu_memory_rw_debug(cs, common_semi_flen_buf(cs) + 32,
(uint8_t *)&size, 4, 0);
size = be32_to_cpu(size);
+ common_semi_cb(cs, -1, err);
common_semi_set_ret(cs, size);
- errno = err;
- set_swi_errno(cs, -1);
}
static int common_semi_open_guestfd;
@@ -362,64 +348,32 @@ static void
common_semi_open_cb(CPUState *cs, target_ulong ret, target_ulong err)
{
if (ret == (target_ulong)-1) {
- errno = err;
- set_swi_errno(cs, -1);
dealloc_guestfd(common_semi_open_guestfd);
} else {
associate_guestfd(common_semi_open_guestfd, ret);
ret = common_semi_open_guestfd;
}
- common_semi_set_ret(cs, ret);
-}
-
-static target_ulong
-common_semi_gdb_syscall(CPUState *cs, gdb_syscall_complete_cb cb,
- const char *fmt, ...)
-{
- va_list va;
-
- va_start(va, fmt);
- gdb_do_syscallv(cb, fmt, va);
- va_end(va);
-
- /*
- * FIXME: in softmmu mode, the gdbstub will schedule our callback
- * to occur, but will not actually call it to complete the syscall
- * until after this function has returned and we are back in the
- * CPU main loop. Therefore callers to this function must not
- * do anything with its return value, because it is not necessarily
- * the result of the syscall, but could just be the old value of X0.
- * The only thing safe to do with this is that the callers of
- * do_common_semihosting() will write it straight back into X0.
- * (In linux-user mode, the callback will have happened before
- * gdb_do_syscallv() returns.)
- *
- * We should tidy this up so neither this function nor
- * do_common_semihosting() return a value, so the mistake of
- * doing something with the return value is not possible to make.
- */
-
- return common_semi_arg(cs, 0);
+ common_semi_cb(cs, ret, err);
}
/*
* Types for functions implementing various semihosting calls
* for specific types of guest file descriptor. These must all
- * do the work and return the required return value for the guest,
- * setting the guest errno if appropriate.
+ * do the work and return the required return value to the guest
+ * via common_semi_cb.
*/
-typedef uint32_t sys_closefn(CPUState *cs, GuestFD *gf);
-typedef uint32_t sys_writefn(CPUState *cs, GuestFD *gf,
- target_ulong buf, uint32_t len);
-typedef uint32_t sys_readfn(CPUState *cs, GuestFD *gf,
- target_ulong buf, uint32_t len);
-typedef uint32_t sys_isattyfn(CPUState *cs, GuestFD *gf);
-typedef uint32_t sys_seekfn(CPUState *cs, GuestFD *gf,
- target_ulong offset);
-typedef uint32_t sys_flenfn(CPUState *cs, GuestFD *gf);
+typedef void sys_closefn(CPUState *cs, GuestFD *gf);
+typedef void sys_writefn(CPUState *cs, GuestFD *gf,
+ target_ulong buf, uint32_t len);
+typedef void sys_readfn(CPUState *cs, GuestFD *gf,
+ target_ulong buf, uint32_t len);
+typedef void sys_isattyfn(CPUState *cs, GuestFD *gf);
+typedef void sys_seekfn(CPUState *cs, GuestFD *gf, target_ulong offset);
+typedef void sys_flenfn(CPUState *cs, GuestFD *gf);
-static uint32_t host_closefn(CPUState *cs, GuestFD *gf)
+static void host_closefn(CPUState *cs, GuestFD *gf)
{
+ int ret;
/*
* Only close the underlying host fd if it's one we opened on behalf
* of the guest in SYS_OPEN.
@@ -427,113 +381,106 @@ static uint32_t host_closefn(CPUState *cs, GuestFD *gf)
if (gf->hostfd == STDIN_FILENO ||
gf->hostfd == STDOUT_FILENO ||
gf->hostfd == STDERR_FILENO) {
- return 0;
+ ret = 0;
+ } else {
+ ret = close(gf->hostfd);
}
- return set_swi_errno(cs, close(gf->hostfd));
+ common_semi_cb(cs, ret, ret ? errno : 0);
}
-static uint32_t host_writefn(CPUState *cs, GuestFD *gf,
- target_ulong buf, uint32_t len)
+static void host_writefn(CPUState *cs, GuestFD *gf,
+ target_ulong buf, uint32_t len)
{
CPUArchState *env = cs->env_ptr;
- uint32_t ret;
+ uint32_t ret = 0;
char *s = lock_user(VERIFY_READ, buf, len, 1);
(void) env; /* Used in arm softmmu lock_user implicitly */
- if (!s) {
- /* Return bytes not written on error */
- return len;
+ if (s) {
+ ret = write(gf->hostfd, s, len);
+ unlock_user(s, buf, 0);
+ if (ret == (uint32_t)-1) {
+ ret = 0;
+ }
}
- ret = set_swi_errno(cs, write(gf->hostfd, s, len));
- unlock_user(s, buf, 0);
- if (ret == (uint32_t)-1) {
- ret = 0;
- }
- /* Return bytes not written */
- return len - ret;
+ /* Return bytes not written, on error as well. */
+ common_semi_cb(cs, len - ret, 0);
}
-static uint32_t host_readfn(CPUState *cs, GuestFD *gf,
- target_ulong buf, uint32_t len)
+static void host_readfn(CPUState *cs, GuestFD *gf,
+ target_ulong buf, uint32_t len)
{
CPUArchState *env = cs->env_ptr;
- uint32_t ret;
+ uint32_t ret = 0;
char *s = lock_user(VERIFY_WRITE, buf, len, 0);
(void) env; /* Used in arm softmmu lock_user implicitly */
- if (!s) {
- /* return bytes not read */
- return len;
+ if (s) {
+ do {
+ ret = read(gf->hostfd, s, len);
+ } while (ret == -1 && errno == EINTR);
+ unlock_user(s, buf, len);
+ if (ret == (uint32_t)-1) {
+ ret = 0;
+ }
}
- do {
- ret = set_swi_errno(cs, read(gf->hostfd, s, len));
- } while (ret == -1 && errno == EINTR);
- unlock_user(s, buf, len);
- if (ret == (uint32_t)-1) {
- ret = 0;
- }
- /* Return bytes not read */
- return len - ret;
+ /* Return bytes not read, on error as well. */
+ common_semi_cb(cs, len - ret, 0);
}
-static uint32_t host_isattyfn(CPUState *cs, GuestFD *gf)
+static void host_isattyfn(CPUState *cs, GuestFD *gf)
{
- return isatty(gf->hostfd);
+ common_semi_cb(cs, isatty(gf->hostfd), 0);
}
-static uint32_t host_seekfn(CPUState *cs, GuestFD *gf, target_ulong offset)
+static void host_seekfn(CPUState *cs, GuestFD *gf, target_ulong offset)
{
- uint32_t ret = set_swi_errno(cs, lseek(gf->hostfd, offset, SEEK_SET));
- if (ret == (uint32_t)-1) {
- return -1;
- }
- return 0;
+ off_t ret = lseek(gf->hostfd, offset, SEEK_SET);
+ common_semi_cb(cs, ret, ret == -1 ? errno : 0);
}
-static uint32_t host_flenfn(CPUState *cs, GuestFD *gf)
+static void host_flenfn(CPUState *cs, GuestFD *gf)
{
struct stat buf;
- uint32_t ret = set_swi_errno(cs, fstat(gf->hostfd, &buf));
- if (ret == (uint32_t)-1) {
- return -1;
+
+ if (fstat(gf->hostfd, &buf)) {
+ common_semi_cb(cs, -1, errno);
+ } else {
+ common_semi_cb(cs, buf.st_size, 0);
}
- return buf.st_size;
}
-static uint32_t gdb_closefn(CPUState *cs, GuestFD *gf)
+static void gdb_closefn(CPUState *cs, GuestFD *gf)
{
- return common_semi_gdb_syscall(cs, common_semi_cb, "close,%x", gf->hostfd);
+ gdb_do_syscall(common_semi_cb, "close,%x", gf->hostfd);
}
-static uint32_t gdb_writefn(CPUState *cs, GuestFD *gf,
- target_ulong buf, uint32_t len)
+static void gdb_writefn(CPUState *cs, GuestFD *gf,
+ target_ulong buf, uint32_t len)
{
common_semi_syscall_len = len;
- return common_semi_gdb_syscall(cs, common_semi_cb, "write,%x,%x,%x",
- gf->hostfd, buf, len);
+ gdb_do_syscall(common_semi_cb, "write,%x,%x,%x", gf->hostfd, buf, len);
}
-static uint32_t gdb_readfn(CPUState *cs, GuestFD *gf,
- target_ulong buf, uint32_t len)
+static void gdb_readfn(CPUState *cs, GuestFD *gf,
+ target_ulong buf, uint32_t len)
{
common_semi_syscall_len = len;
- return common_semi_gdb_syscall(cs, common_semi_cb, "read,%x,%x,%x",
- gf->hostfd, buf, len);
+ gdb_do_syscall(common_semi_cb, "read,%x,%x,%x", gf->hostfd, buf, len);
}
-static uint32_t gdb_isattyfn(CPUState *cs, GuestFD *gf)
+static void gdb_isattyfn(CPUState *cs, GuestFD *gf)
{
- return common_semi_gdb_syscall(cs, common_semi_cb, "isatty,%x", gf->hostfd);
+ gdb_do_syscall(common_semi_cb, "isatty,%x", gf->hostfd);
}
-static uint32_t gdb_seekfn(CPUState *cs, GuestFD *gf, target_ulong offset)
+static void gdb_seekfn(CPUState *cs, GuestFD *gf, target_ulong offset)
{
- return common_semi_gdb_syscall(cs, common_semi_cb, "lseek,%x,%x,0",
- gf->hostfd, offset);
+ gdb_do_syscall(common_semi_cb, "lseek,%x,%x,0", gf->hostfd, offset);
}
-static uint32_t gdb_flenfn(CPUState *cs, GuestFD *gf)
+static void gdb_flenfn(CPUState *cs, GuestFD *gf)
{
- return common_semi_gdb_syscall(cs, common_semi_flen_cb, "fstat,%x,%x",
- gf->hostfd, common_semi_flen_buf(cs));
+ gdb_do_syscall(common_semi_flen_cb, "fstat,%x,%x",
+ gf->hostfd, common_semi_flen_buf(cs));
}
#define SHFB_MAGIC_0 0x53
@@ -553,63 +500,57 @@ static const uint8_t featurefile_data[] = {
SH_EXT_EXIT_EXTENDED | SH_EXT_STDOUT_STDERR, /* Feature byte 0 */
};
-static uint32_t staticfile_closefn(CPUState *cs, GuestFD *gf)
+static void staticfile_closefn(CPUState *cs, GuestFD *gf)
{
/* Nothing to do */
- return 0;
+ common_semi_cb(cs, 0, 0);
}
-static uint32_t staticfile_writefn(CPUState *cs, GuestFD *gf,
- target_ulong buf, uint32_t len)
+static void staticfile_writefn(CPUState *cs, GuestFD *gf,
+ target_ulong buf, uint32_t len)
{
/* This fd can never be open for writing */
-
- errno = EBADF;
- return set_swi_errno(cs, -1);
+ common_semi_cb(cs, -1, EBADF);
}
-static uint32_t staticfile_readfn(CPUState *cs, GuestFD *gf,
- target_ulong buf, uint32_t len)
+static void staticfile_readfn(CPUState *cs, GuestFD *gf,
+ target_ulong buf, uint32_t len)
{
CPUArchState *env = cs->env_ptr;
- uint32_t i;
+ uint32_t i = 0;
char *s;
(void) env; /* Used in arm softmmu lock_user implicitly */
s = lock_user(VERIFY_WRITE, buf, len, 0);
- if (!s) {
- return len;
- }
-
- for (i = 0; i < len; i++) {
- if (gf->staticfile.off >= gf->staticfile.len) {
- break;
+ if (s) {
+ for (i = 0; i < len; i++) {
+ if (gf->staticfile.off >= gf->staticfile.len) {
+ break;
+ }
+ s[i] = gf->staticfile.data[gf->staticfile.off];
+ gf->staticfile.off++;
}
- s[i] = gf->staticfile.data[gf->staticfile.off];
- gf->staticfile.off++;
+ unlock_user(s, buf, len);
}
- unlock_user(s, buf, len);
-
/* Return number of bytes not read */
- return len - i;
+ common_semi_cb(cs, len - i, 0);
}
-static uint32_t staticfile_isattyfn(CPUState *cs, GuestFD *gf)
+static void staticfile_isattyfn(CPUState *cs, GuestFD *gf)
{
- return 0;
+ common_semi_cb(cs, 0, 0);
}
-static uint32_t staticfile_seekfn(CPUState *cs, GuestFD *gf,
- target_ulong offset)
+static void staticfile_seekfn(CPUState *cs, GuestFD *gf, target_ulong offset)
{
gf->staticfile.off = offset;
- return 0;
+ common_semi_cb(cs, 0, 0);
}
-static uint32_t staticfile_flenfn(CPUState *cs, GuestFD *gf)
+static void staticfile_flenfn(CPUState *cs, GuestFD *gf)
{
- return gf->staticfile.len;
+ common_semi_cb(cs, gf->staticfile.len, 0);
}
typedef struct GuestFDFunctions {
@@ -668,13 +609,13 @@ static inline bool is_64bit_semihosting(CPUArchState *env)
#define GET_ARG(n) do { \
if (is_64bit_semihosting(env)) { \
if (get_user_u64(arg ## n, args + (n) * 8)) { \
- errno = EFAULT; \
- return set_swi_errno(cs, -1); \
+ common_semi_cb(cs, -1, EFAULT); \
+ return; \
} \
} else { \
if (get_user_u32(arg ## n, args + (n) * 4)) { \
- errno = EFAULT; \
- return set_swi_errno(cs, -1); \
+ common_semi_cb(cs, -1, EFAULT); \
+ return; \
} \
} \
} while (0)
@@ -694,7 +635,7 @@ static inline bool is_64bit_semihosting(CPUArchState *env)
* leave the register unchanged. We use 0xdeadbeef as the return value
* when there isn't a defined return value for the call.
*/
-target_ulong do_common_semihosting(CPUState *cs)
+void do_common_semihosting(CPUState *cs)
{
CPUArchState *env = cs->env_ptr;
target_ulong args;
@@ -714,32 +655,23 @@ target_ulong do_common_semihosting(CPUState *cs)
switch (nr) {
case TARGET_SYS_OPEN:
{
- int guestfd;
+ int ret, err = 0;
+ int hostfd;
GET_ARG(0);
GET_ARG(1);
GET_ARG(2);
s = lock_user_string(arg0);
if (!s) {
- errno = EFAULT;
- return set_swi_errno(cs, -1);
+ goto do_fault;
}
if (arg1 >= 12) {
unlock_user(s, arg0, 0);
- errno = EINVAL;
- return set_swi_errno(cs, -1);
- }
-
- guestfd = alloc_guestfd();
- if (guestfd < 0) {
- unlock_user(s, arg0, 0);
- errno = EMFILE;
- return set_swi_errno(cs, -1);
+ common_semi_cb(cs, -1, EINVAL);
+ break;
}
if (strcmp(s, ":tt") == 0) {
- int result_fileno;
-
/*
* We implement SH_EXT_STDOUT_STDERR, so:
* open for read == stdin
@@ -747,63 +679,67 @@ target_ulong do_common_semihosting(CPUState *cs)
* open for append == stderr
*/
if (arg1 < 4) {
- result_fileno = STDIN_FILENO;
+ hostfd = STDIN_FILENO;
} else if (arg1 < 8) {
- result_fileno = STDOUT_FILENO;
+ hostfd = STDOUT_FILENO;
} else {
- result_fileno = STDERR_FILENO;
+ hostfd = STDERR_FILENO;
}
- associate_guestfd(guestfd, result_fileno);
- unlock_user(s, arg0, 0);
- return guestfd;
- }
- if (strcmp(s, ":semihosting-features") == 0) {
- unlock_user(s, arg0, 0);
+ ret = alloc_guestfd();
+ associate_guestfd(ret, hostfd);
+ } else if (strcmp(s, ":semihosting-features") == 0) {
/* We must fail opens for modes other than 0 ('r') or 1 ('rb') */
if (arg1 != 0 && arg1 != 1) {
- dealloc_guestfd(guestfd);
- errno = EACCES;
- return set_swi_errno(cs, -1);
- }
- staticfile_guestfd(guestfd, featurefile_data,
- sizeof(featurefile_data));
- return guestfd;
- }
-
- if (use_gdb_syscalls()) {
- common_semi_open_guestfd = guestfd;
- ret = common_semi_gdb_syscall(cs, common_semi_open_cb,
- "open,%s,%x,1a4", arg0, (int)arg2 + 1,
- gdb_open_modeflags[arg1]);
- } else {
- ret = set_swi_errno(cs, open(s, open_modeflags[arg1], 0644));
- if (ret == (uint32_t)-1) {
- dealloc_guestfd(guestfd);
+ ret = -1;
+ err = EACCES;
} else {
- associate_guestfd(guestfd, ret);
- ret = guestfd;
+ ret = alloc_guestfd();
+ staticfile_guestfd(ret, featurefile_data,
+ sizeof(featurefile_data));
+ }
+ } else if (use_gdb_syscalls()) {
+ unlock_user(s, arg0, 0);
+ common_semi_open_guestfd = alloc_guestfd();
+ gdb_do_syscall(common_semi_open_cb,
+ "open,%s,%x,1a4", arg0, (int)arg2 + 1,
+ gdb_open_modeflags[arg1]);
+ break;
+ } else {
+ hostfd = open(s, open_modeflags[arg1], 0644);
+ if (hostfd < 0) {
+ ret = -1;
+ err = errno;
+ } else {
+ ret = alloc_guestfd();
+ associate_guestfd(ret, hostfd);
}
}
unlock_user(s, arg0, 0);
- return ret;
+ common_semi_cb(cs, ret, err);
+ break;
}
+
case TARGET_SYS_CLOSE:
GET_ARG(0);
gf = get_guestfd(arg0);
if (!gf) {
- errno = EBADF;
- return set_swi_errno(cs, -1);
+ goto do_badf;
}
-
- ret = guestfd_fns[gf->type].closefn(cs, gf);
+ guestfd_fns[gf->type].closefn(cs, gf);
dealloc_guestfd(arg0);
- return ret;
+ break;
+
case TARGET_SYS_WRITEC:
qemu_semihosting_console_outc(cs->env_ptr, args);
- return 0xdeadbeef;
+ common_semi_set_ret(cs, 0xdeadbeef);
+ break;
+
case TARGET_SYS_WRITE0:
- return qemu_semihosting_console_outs(cs->env_ptr, args);
+ ret = qemu_semihosting_console_outs(cs->env_ptr, args);
+ common_semi_set_ret(cs, ret);
+ break;
+
case TARGET_SYS_WRITE:
GET_ARG(0);
GET_ARG(1);
@@ -812,11 +748,11 @@ target_ulong do_common_semihosting(CPUState *cs)
gf = get_guestfd(arg0);
if (!gf) {
- errno = EBADF;
- return set_swi_errno(cs, -1);
+ goto do_badf;
}
+ guestfd_fns[gf->type].writefn(cs, gf, arg1, len);
+ break;
- return guestfd_fns[gf->type].writefn(cs, gf, arg1, len);
case TARGET_SYS_READ:
GET_ARG(0);
GET_ARG(1);
@@ -825,129 +761,150 @@ target_ulong do_common_semihosting(CPUState *cs)
gf = get_guestfd(arg0);
if (!gf) {
- errno = EBADF;
- return set_swi_errno(cs, -1);
+ goto do_badf;
}
+ guestfd_fns[gf->type].readfn(cs, gf, arg1, len);
+ break;
- return guestfd_fns[gf->type].readfn(cs, gf, arg1, len);
case TARGET_SYS_READC:
- return qemu_semihosting_console_inc(cs->env_ptr);
+ ret = qemu_semihosting_console_inc(cs->env_ptr);
+ common_semi_set_ret(cs, ret);
+ break;
+
case TARGET_SYS_ISERROR:
GET_ARG(0);
- return (target_long) arg0 < 0 ? 1 : 0;
+ common_semi_set_ret(cs, (target_long)arg0 < 0);
+ break;
+
case TARGET_SYS_ISTTY:
GET_ARG(0);
gf = get_guestfd(arg0);
if (!gf) {
- errno = EBADF;
- return set_swi_errno(cs, -1);
+ goto do_badf;
}
+ guestfd_fns[gf->type].isattyfn(cs, gf);
+ break;
- return guestfd_fns[gf->type].isattyfn(cs, gf);
case TARGET_SYS_SEEK:
GET_ARG(0);
GET_ARG(1);
gf = get_guestfd(arg0);
if (!gf) {
- errno = EBADF;
- return set_swi_errno(cs, -1);
+ goto do_badf;
}
+ guestfd_fns[gf->type].seekfn(cs, gf, arg1);
+ break;
- return guestfd_fns[gf->type].seekfn(cs, gf, arg1);
case TARGET_SYS_FLEN:
GET_ARG(0);
gf = get_guestfd(arg0);
if (!gf) {
- errno = EBADF;
- return set_swi_errno(cs, -1);
+ goto do_badf;
}
+ guestfd_fns[gf->type].flenfn(cs, gf);
+ break;
- return guestfd_fns[gf->type].flenfn(cs, gf);
case TARGET_SYS_TMPNAM:
+ {
+ int len;
+ char *p;
+
GET_ARG(0);
GET_ARG(1);
GET_ARG(2);
- if (asprintf(&s, "/tmp/qemu-%x%02x", getpid(),
- (int) (arg1 & 0xff)) < 0) {
- return -1;
- }
- ul_ret = (target_ulong) -1;
-
+ len = asprintf(&s, "/tmp/qemu-%x%02x", getpid(), (int)arg1 & 0xff);
/* Make sure there's enough space in the buffer */
- if (strlen(s) < arg2) {
- char *output = lock_user(VERIFY_WRITE, arg0, arg2, 0);
- strcpy(output, s);
- unlock_user(output, arg0, arg2);
- ul_ret = 0;
+ if (len < 0 || len >= arg2) {
+ common_semi_set_ret(cs, -1);
+ break;
}
+ p = lock_user(VERIFY_WRITE, arg0, len, 0);
+ if (!p) {
+ goto do_fault;
+ }
+ memcpy(p, s, len + 1);
+ unlock_user(p, arg0, len);
free(s);
- return ul_ret;
+ common_semi_set_ret(cs, 0);
+ break;
+ }
+
case TARGET_SYS_REMOVE:
GET_ARG(0);
GET_ARG(1);
if (use_gdb_syscalls()) {
- ret = common_semi_gdb_syscall(cs, common_semi_cb, "unlink,%s",
- arg0, (int)arg1 + 1);
- } else {
- s = lock_user_string(arg0);
- if (!s) {
- errno = EFAULT;
- return set_swi_errno(cs, -1);
- }
- ret = set_swi_errno(cs, remove(s));
- unlock_user(s, arg0, 0);
+ gdb_do_syscall(common_semi_cb, "unlink,%s",
+ arg0, (int)arg1 + 1);
+ break;
}
- return ret;
+ s = lock_user_string(arg0);
+ if (!s) {
+ goto do_fault;
+ }
+ ret = remove(s);
+ unlock_user(s, arg0, 0);
+ common_semi_cb(cs, ret, ret ? errno : 0);
+ break;
+
case TARGET_SYS_RENAME:
GET_ARG(0);
GET_ARG(1);
GET_ARG(2);
GET_ARG(3);
if (use_gdb_syscalls()) {
- return common_semi_gdb_syscall(cs, common_semi_cb, "rename,%s,%s",
- arg0, (int)arg1 + 1, arg2,
- (int)arg3 + 1);
+ gdb_do_syscall(common_semi_cb, "rename,%s,%s",
+ arg0, (int)arg1 + 1, arg2, (int)arg3 + 1);
} else {
char *s2;
+
s = lock_user_string(arg0);
- s2 = lock_user_string(arg2);
- if (!s || !s2) {
- errno = EFAULT;
- ret = set_swi_errno(cs, -1);
- } else {
- ret = set_swi_errno(cs, rename(s, s2));
+ if (!s) {
+ goto do_fault;
}
- if (s2)
- unlock_user(s2, arg2, 0);
- if (s)
+ s2 = lock_user_string(arg2);
+ if (!s2) {
unlock_user(s, arg0, 0);
- return ret;
+ goto do_fault;
+ }
+ ret = rename(s, s2);
+ unlock_user(s2, arg2, 0);
+ unlock_user(s, arg0, 0);
+ common_semi_cb(cs, ret, ret ? errno : 0);
}
+ break;
+
case TARGET_SYS_CLOCK:
- return clock() / (CLOCKS_PER_SEC / 100);
+ common_semi_set_ret(cs, clock() / (CLOCKS_PER_SEC / 100));
+ break;
+
case TARGET_SYS_TIME:
- return set_swi_errno(cs, time(NULL));
+ ul_ret = time(NULL);
+ common_semi_cb(cs, ul_ret, ul_ret == -1 ? errno : 0);
+ break;
+
case TARGET_SYS_SYSTEM:
GET_ARG(0);
GET_ARG(1);
if (use_gdb_syscalls()) {
- return common_semi_gdb_syscall(cs, common_semi_cb, "system,%s",
- arg0, (int)arg1 + 1);
- } else {
- s = lock_user_string(arg0);
- if (!s) {
- errno = EFAULT;
- return set_swi_errno(cs, -1);
- }
- ret = set_swi_errno(cs, system(s));
- unlock_user(s, arg0, 0);
- return ret;
+ gdb_do_syscall(common_semi_cb, "system,%s", arg0, (int)arg1 + 1);
+ break;
}
+ s = lock_user_string(arg0);
+ if (!s) {
+ goto do_fault;
+ }
+ ret = system(s);
+ unlock_user(s, arg0, 0);
+ common_semi_cb(cs, ret, ret == -1 ? errno : 0);
+ break;
+
case TARGET_SYS_ERRNO:
- return get_swi_errno(cs);
+ common_semi_set_ret(cs, get_swi_errno(cs));
+ break;
+
case TARGET_SYS_GET_CMDLINE:
{
/* Build a command-line from the original argv.
@@ -998,22 +955,20 @@ target_ulong do_common_semihosting(CPUState *cs)
if (output_size > input_size) {
/* Not enough space to store command-line arguments. */
- errno = E2BIG;
- return set_swi_errno(cs, -1);
+ common_semi_cb(cs, -1, E2BIG);
+ break;
}
/* Adjust the command-line length. */
if (SET_ARG(1, output_size - 1)) {
/* Couldn't write back to argument block */
- errno = EFAULT;
- return set_swi_errno(cs, -1);
+ goto do_fault;
}
/* Lock the buffer on the ARM side. */
output_buffer = lock_user(VERIFY_WRITE, arg0, output_size, 0);
if (!output_buffer) {
- errno = EFAULT;
- return set_swi_errno(cs, -1);
+ goto do_fault;
}
/* Copy the command-line arguments. */
@@ -1028,9 +983,8 @@ target_ulong do_common_semihosting(CPUState *cs)
if (copy_from_user(output_buffer, ts->info->arg_start,
output_size)) {
- errno = EFAULT;
- status = set_swi_errno(cs, -1);
- goto out;
+ unlock_user(output_buffer, arg0, 0);
+ goto do_fault;
}
/* Separate arguments by white spaces. */
@@ -1043,9 +997,10 @@ target_ulong do_common_semihosting(CPUState *cs)
#endif
/* Unlock the buffer on the ARM side. */
unlock_user(output_buffer, arg0, output_size);
-
- return status;
+ common_semi_cb(cs, status, 0);
}
+ break;
+
case TARGET_SYS_HEAPINFO:
{
target_ulong retvals[4];
@@ -1102,12 +1057,13 @@ target_ulong do_common_semihosting(CPUState *cs)
if (fail) {
/* Couldn't write back to argument block */
- errno = EFAULT;
- return set_swi_errno(cs, -1);
+ goto do_fault;
}
}
- return 0;
+ common_semi_set_ret(cs, 0);
}
+ break;
+
case TARGET_SYS_EXIT:
case TARGET_SYS_EXIT_EXTENDED:
if (common_semi_sys_exit_extended(cs, nr)) {
@@ -1137,6 +1093,7 @@ target_ulong do_common_semihosting(CPUState *cs)
}
gdb_exit(ret);
exit(ret);
+
case TARGET_SYS_ELAPSED:
elapsed = get_clock() - clock_start;
if (sizeof(target_ulong) == 8) {
@@ -1145,10 +1102,14 @@ target_ulong do_common_semihosting(CPUState *cs)
SET_ARG(0, (uint32_t) elapsed);
SET_ARG(1, (uint32_t) (elapsed >> 32));
}
- return 0;
+ common_semi_set_ret(cs, 0);
+ break;
+
case TARGET_SYS_TICKFREQ:
/* qemu always uses nsec */
- return 1000000000;
+ common_semi_set_ret(cs, 1000000000);
+ break;
+
case TARGET_SYS_SYNCCACHE:
/*
* Clean the D-cache and invalidate the I-cache for the specified
@@ -1157,16 +1118,24 @@ target_ulong do_common_semihosting(CPUState *cs)
*/
#ifdef TARGET_ARM
if (is_a64(cs->env_ptr)) {
- return 0;
+ common_semi_set_ret(cs, 0);
+ break;
}
#endif
#ifdef TARGET_RISCV
- return 0;
+ common_semi_set_ret(cs, 0);
#endif
/* fall through -- invalid for A32/T32 */
default:
fprintf(stderr, "qemu: Unsupported SemiHosting SWI 0x%02x\n", nr);
cpu_dump_state(cs, stderr, 0);
abort();
+
+ do_badf:
+ common_semi_cb(cs, -1, EBADF);
+ break;
+ do_fault:
+ common_semi_cb(cs, -1, EFAULT);
+ break;
}
}
diff --git a/target/arm/helper.c b/target/arm/helper.c
index 63397bbac1..748bb843e5 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -10195,13 +10195,13 @@ static void handle_semihosting(CPUState *cs)
qemu_log_mask(CPU_LOG_INT,
"...handling as semihosting call 0x%" PRIx64 "\n",
env->xregs[0]);
- env->xregs[0] = do_common_semihosting(cs);
+ do_common_semihosting(cs);
env->pc += 4;
} else {
qemu_log_mask(CPU_LOG_INT,
"...handling as semihosting call 0x%x\n",
env->regs[0]);
- env->regs[0] = do_common_semihosting(cs);
+ do_common_semihosting(cs);
env->regs[15] += env->thumb ? 2 : 4;
}
}
diff --git a/target/arm/m_helper.c b/target/arm/m_helper.c
index a740c3e160..308610f6b4 100644
--- a/target/arm/m_helper.c
+++ b/target/arm/m_helper.c
@@ -2373,7 +2373,7 @@ void arm_v7m_cpu_do_interrupt(CPUState *cs)
"...handling as semihosting call 0x%x\n",
env->regs[0]);
#ifdef CONFIG_TCG
- env->regs[0] = do_common_semihosting(cs);
+ do_common_semihosting(cs);
#else
g_assert_not_reached();
#endif
diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c
index e1aa4f2097..55105cb0cc 100644
--- a/target/riscv/cpu_helper.c
+++ b/target/riscv/cpu_helper.c
@@ -1345,7 +1345,7 @@ void riscv_cpu_do_interrupt(CPUState *cs)
if (cause == RISCV_EXCP_SEMIHOST) {
if (env->priv >= PRV_S) {
- env->gpr[xA0] = do_common_semihosting(cs);
+ do_common_semihosting(cs);
env->pc += 4;
return;
}
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 10/43] semihosting: Adjust error checking in common_semi_cb
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (8 preceding siblings ...)
2022-04-30 13:28 ` [PATCH 09/43] semihosting: Return void from do_common_semihosting Richard Henderson
@ 2022-04-30 13:28 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 11/43] semihosting: Move common-semi.h to include/semihosting/ Richard Henderson
` (33 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:28 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
The err parameter is non-zero if and only if an error occured.
Use this instead of ret == -1 for determining if we need to
update the saved errno.
This fixes the errno setting of SYS_ISTTY, which returns 0 on
error, not -1.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
semihosting/arm-compat-semi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 7030dfd587..18664b1c47 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -276,7 +276,7 @@ static target_ulong common_semi_syscall_len;
static void common_semi_cb(CPUState *cs, target_ulong ret, target_ulong err)
{
- if (ret == (target_ulong)-1) {
+ if (err) {
#ifdef CONFIG_USER_ONLY
TaskState *ts = cs->opaque;
ts->swi_errno = err;
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 11/43] semihosting: Move common-semi.h to include/semihosting/
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (9 preceding siblings ...)
2022-04-30 13:28 ` [PATCH 10/43] semihosting: Adjust error checking in common_semi_cb Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 12/43] include/exec: Move gdb open flags to gdbstub.h Richard Henderson
` (32 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
This header is not private to the top-level semihosting directory,
so place it in the public include directory.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
{semihosting => include/semihosting}/common-semi.h | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename {semihosting => include/semihosting}/common-semi.h (100%)
diff --git a/semihosting/common-semi.h b/include/semihosting/common-semi.h
similarity index 100%
rename from semihosting/common-semi.h
rename to include/semihosting/common-semi.h
--
2.34.1
^ permalink raw reply [flat|nested] 45+ messages in thread
* [PATCH 12/43] include/exec: Move gdb open flags to gdbstub.h
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (10 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 11/43] semihosting: Move common-semi.h to include/semihosting/ Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 13/43] include/exec: Move gdb_stat and gdb_timeval " Richard Henderson
` (31 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
There were 3 copies of these flags. Place them in the
file with gdb_do_syscall, with which they belong.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/gdbstub.h | 10 ++++++++++
semihosting/arm-compat-semi.c | 8 --------
target/m68k/m68k-semi.c | 8 --------
target/nios2/nios2-semi.c | 8 --------
4 files changed, 10 insertions(+), 24 deletions(-)
diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h
index c35d7334b4..2aaba9c723 100644
--- a/include/exec/gdbstub.h
+++ b/include/exec/gdbstub.h
@@ -10,6 +10,16 @@
#define GDB_WATCHPOINT_READ 3
#define GDB_WATCHPOINT_ACCESS 4
+/* For gdb file i/o remote protocol open flags. */
+#define GDB_O_BINARY 0
+#define GDB_O_RDONLY 0
+#define GDB_O_WRONLY 1
+#define GDB_O_RDWR 2
+#define GDB_O_APPEND 8
+#define GDB_O_CREAT 0x200
+#define GDB_O_TRUNC 0x400
+#define GDB_O_EXCL 0x800
+
#ifdef NEED_CPU_H
#include "cpu.h"
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 18664b1c47..a1fc4ea039 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -86,14 +86,6 @@
#define O_BINARY 0
#endif
-#define GDB_O_RDONLY 0x000
-#define GDB_O_WRONLY 0x001
-#define GDB_O_RDWR 0x002
-#define GDB_O_APPEND 0x008
-#define GDB_O_CREAT 0x200
-#define GDB_O_TRUNC 0x400
-#define GDB_O_BINARY 0
-
static int gdb_open_modeflags[12] = {
GDB_O_RDONLY,
GDB_O_RDONLY | GDB_O_BINARY,
diff --git a/target/m68k/m68k-semi.c b/target/m68k/m68k-semi.c
index a31db38fc3..475a6b13b7 100644
--- a/target/m68k/m68k-semi.c
+++ b/target/m68k/m68k-semi.c
@@ -69,14 +69,6 @@ struct gdb_timeval {
uint64_t tv_usec; /* microsecond */
} QEMU_PACKED;
-#define GDB_O_RDONLY 0x0
-#define GDB_O_WRONLY 0x1
-#define GDB_O_RDWR 0x2
-#define GDB_O_APPEND 0x8
-#define GDB_O_CREAT 0x200
-#define GDB_O_TRUNC 0x400
-#define GDB_O_EXCL 0x800
-
static int translate_openflags(int flags)
{
int hf;
diff --git a/target/nios2/nios2-semi.c b/target/nios2/nios2-semi.c
index 373e6b9436..0eec1f9a1c 100644
--- a/target/nios2/nios2-semi.c
+++ b/target/nios2/nios2-semi.c
@@ -71,14 +71,6 @@ struct gdb_timeval {
uint64_t tv_usec; /* microsecond */
} QEMU_PACKED;
-#define GDB_O_RDONLY 0x0
-#define GDB_O_WRONLY 0x1
-#define GDB_O_RDWR 0x2
-#define GDB_O_APPEND 0x8
-#define GDB_O_CREAT 0x200
-#define GDB_O_TRUNC 0x400
-#define GDB_O_EXCL 0x800
-
static int translate_openflags(int flags)
{
int hf;
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 13/43] include/exec: Move gdb_stat and gdb_timeval to gdbstub.h
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (11 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 12/43] include/exec: Move gdb open flags to gdbstub.h Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 14/43] semihosting: Use struct gdb_stat in common_semi_flen_cb Richard Henderson
` (30 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
We have two copies of these structures, and require them
in semihosting/ going forward.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/gdbstub.h | 25 +++++++++++++++++++++++++
target/m68k/m68k-semi.c | 30 +++---------------------------
target/nios2/nios2-semi.c | 30 +++---------------------------
3 files changed, 31 insertions(+), 54 deletions(-)
diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h
index 2aaba9c723..33a262a5a3 100644
--- a/include/exec/gdbstub.h
+++ b/include/exec/gdbstub.h
@@ -20,6 +20,31 @@
#define GDB_O_TRUNC 0x400
#define GDB_O_EXCL 0x800
+/* For gdb file i/o stat/fstat. */
+typedef uint32_t gdb_mode_t;
+typedef uint32_t gdb_time_t;
+
+struct gdb_stat {
+ uint32_t gdb_st_dev; /* device */
+ uint32_t gdb_st_ino; /* inode */
+ gdb_mode_t gdb_st_mode; /* protection */
+ uint32_t gdb_st_nlink; /* number of hard links */
+ uint32_t gdb_st_uid; /* user ID of owner */
+ uint32_t gdb_st_gid; /* group ID of owner */
+ uint32_t gdb_st_rdev; /* device type (if inode device) */
+ uint64_t gdb_st_size; /* total size, in bytes */
+ uint64_t gdb_st_blksize; /* blocksize for filesystem I/O */
+ uint64_t gdb_st_blocks; /* number of blocks allocated */
+ gdb_time_t gdb_st_atime; /* time of last access */
+ gdb_time_t gdb_st_mtime; /* time of last modification */
+ gdb_time_t gdb_st_ctime; /* time of last change */
+} QEMU_PACKED;
+
+struct gdb_timeval {
+ gdb_time_t tv_sec; /* second */
+ uint64_t tv_usec; /* microsecond */
+} QEMU_PACKED;
+
#ifdef NEED_CPU_H
#include "cpu.h"
diff --git a/target/m68k/m68k-semi.c b/target/m68k/m68k-semi.c
index 475a6b13b7..da0186f3ef 100644
--- a/target/m68k/m68k-semi.c
+++ b/target/m68k/m68k-semi.c
@@ -45,30 +45,6 @@
#define HOSTED_ISATTY 12
#define HOSTED_SYSTEM 13
-typedef uint32_t gdb_mode_t;
-typedef uint32_t gdb_time_t;
-
-struct m68k_gdb_stat {
- uint32_t gdb_st_dev; /* device */
- uint32_t gdb_st_ino; /* inode */
- gdb_mode_t gdb_st_mode; /* protection */
- uint32_t gdb_st_nlink; /* number of hard links */
- uint32_t gdb_st_uid; /* user ID of owner */
- uint32_t gdb_st_gid; /* group ID of owner */
- uint32_t gdb_st_rdev; /* device type (if inode device) */
- uint64_t gdb_st_size; /* total size, in bytes */
- uint64_t gdb_st_blksize; /* blocksize for filesystem I/O */
- uint64_t gdb_st_blocks; /* number of blocks allocated */
- gdb_time_t gdb_st_atime; /* time of last access */
- gdb_time_t gdb_st_mtime; /* time of last modification */
- gdb_time_t gdb_st_ctime; /* time of last change */
-} QEMU_PACKED;
-
-struct gdb_timeval {
- gdb_time_t tv_sec; /* second */
- uint64_t tv_usec; /* microsecond */
-} QEMU_PACKED;
-
static int translate_openflags(int flags)
{
int hf;
@@ -90,9 +66,9 @@ static int translate_openflags(int flags)
static void translate_stat(CPUM68KState *env, target_ulong addr, struct stat *s)
{
- struct m68k_gdb_stat *p;
+ struct gdb_stat *p;
- if (!(p = lock_user(VERIFY_WRITE, addr, sizeof(struct m68k_gdb_stat), 0)))
+ if (!(p = lock_user(VERIFY_WRITE, addr, sizeof(struct gdb_stat), 0)))
/* FIXME - should this return an error code? */
return;
p->gdb_st_dev = cpu_to_be32(s->st_dev);
@@ -114,7 +90,7 @@ static void translate_stat(CPUM68KState *env, target_ulong addr, struct stat *s)
p->gdb_st_atime = cpu_to_be32(s->st_atime);
p->gdb_st_mtime = cpu_to_be32(s->st_mtime);
p->gdb_st_ctime = cpu_to_be32(s->st_ctime);
- unlock_user(p, addr, sizeof(struct m68k_gdb_stat));
+ unlock_user(p, addr, sizeof(struct gdb_stat));
}
static void m68k_semi_return_u32(CPUM68KState *env, uint32_t ret, uint32_t err)
diff --git a/target/nios2/nios2-semi.c b/target/nios2/nios2-semi.c
index 0eec1f9a1c..3e504a6c5f 100644
--- a/target/nios2/nios2-semi.c
+++ b/target/nios2/nios2-semi.c
@@ -47,30 +47,6 @@
#define HOSTED_ISATTY 12
#define HOSTED_SYSTEM 13
-typedef uint32_t gdb_mode_t;
-typedef uint32_t gdb_time_t;
-
-struct nios2_gdb_stat {
- uint32_t gdb_st_dev; /* device */
- uint32_t gdb_st_ino; /* inode */
- gdb_mode_t gdb_st_mode; /* protection */
- uint32_t gdb_st_nlink; /* number of hard links */
- uint32_t gdb_st_uid; /* user ID of owner */
- uint32_t gdb_st_gid; /* group ID of owner */
- uint32_t gdb_st_rdev; /* device type (if inode device) */
- uint64_t gdb_st_size; /* total size, in bytes */
- uint64_t gdb_st_blksize; /* blocksize for filesystem I/O */
- uint64_t gdb_st_blocks; /* number of blocks allocated */
- gdb_time_t gdb_st_atime; /* time of last access */
- gdb_time_t gdb_st_mtime; /* time of last modification */
- gdb_time_t gdb_st_ctime; /* time of last change */
-} QEMU_PACKED;
-
-struct gdb_timeval {
- gdb_time_t tv_sec; /* second */
- uint64_t tv_usec; /* microsecond */
-} QEMU_PACKED;
-
static int translate_openflags(int flags)
{
int hf;
@@ -102,9 +78,9 @@ static int translate_openflags(int flags)
static bool translate_stat(CPUNios2State *env, target_ulong addr,
struct stat *s)
{
- struct nios2_gdb_stat *p;
+ struct gdb_stat *p;
- p = lock_user(VERIFY_WRITE, addr, sizeof(struct nios2_gdb_stat), 0);
+ p = lock_user(VERIFY_WRITE, addr, sizeof(struct gdb_stat), 0);
if (!p) {
return false;
@@ -128,7 +104,7 @@ static bool translate_stat(CPUNios2State *env, target_ulong addr,
p->gdb_st_atime = cpu_to_be32(s->st_atime);
p->gdb_st_mtime = cpu_to_be32(s->st_mtime);
p->gdb_st_ctime = cpu_to_be32(s->st_ctime);
- unlock_user(p, addr, sizeof(struct nios2_gdb_stat));
+ unlock_user(p, addr, sizeof(struct gdb_stat));
return true;
}
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 14/43] semihosting: Use struct gdb_stat in common_semi_flen_cb
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (12 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 13/43] include/exec: Move gdb_stat and gdb_timeval " Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 15/43] semihosting: Split is_64bit_semihosting per target Richard Henderson
` (29 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
Use offsetof instead of an integer constant.
Load the entire 64-bit size while we're at it.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
semihosting/arm-compat-semi.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index a1fc4ea039..a6c6e5baf6 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -324,12 +324,12 @@ static target_ulong common_semi_flen_buf(CPUState *cs)
static void
common_semi_flen_cb(CPUState *cs, target_ulong ret, target_ulong err)
{
- /* The size is always stored in big-endian order, extract
- the value. We assume the size always fit in 32 bits. */
- uint32_t size;
- cpu_memory_rw_debug(cs, common_semi_flen_buf(cs) + 32,
- (uint8_t *)&size, 4, 0);
- size = be32_to_cpu(size);
+ /* The size is always stored in big-endian order, extract the value. */
+ uint64_t size;
+ cpu_memory_rw_debug(cs, common_semi_flen_buf(cs) +
+ offsetof(struct gdb_stat, gdb_st_size),
+ &size, 8, 0);
+ size = be64_to_cpu(size);
common_semi_cb(cs, -1, err);
common_semi_set_ret(cs, size);
}
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 15/43] semihosting: Split is_64bit_semihosting per target
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (13 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 14/43] semihosting: Use struct gdb_stat in common_semi_flen_cb Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 16/43] semihosting: Split common_semi_flen_buf " Richard Henderson
` (28 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
We already have some larger ifdef blocks for ARM and RISCV;
split the function into multiple implementations per arch.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
semihosting/arm-compat-semi.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index a6c6e5baf6..7fc60e223a 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -213,6 +213,10 @@ common_semi_sys_exit_extended(CPUState *cs, int nr)
return (nr == TARGET_SYS_EXIT_EXTENDED || is_a64(cs->env_ptr));
}
+static inline bool is_64bit_semihosting(CPUArchState *env)
+{
+ return is_a64(env);
+}
#endif /* TARGET_ARM */
#ifdef TARGET_RISCV
@@ -238,6 +242,10 @@ common_semi_sys_exit_extended(CPUState *cs, int nr)
return (nr == TARGET_SYS_EXIT_EXTENDED || sizeof(target_ulong) == 8);
}
+static inline bool is_64bit_semihosting(CPUArchState *env)
+{
+ return riscv_cpu_mxl(env) != MXL_RV32;
+}
#endif
/*
@@ -586,17 +594,6 @@ static const GuestFDFunctions guestfd_fns[] = {
* call if the memory read fails. Eventually we could use a generic
* CPUState helper function here.
*/
-static inline bool is_64bit_semihosting(CPUArchState *env)
-{
-#if defined(TARGET_ARM)
- return is_a64(env);
-#elif defined(TARGET_RISCV)
- return riscv_cpu_mxl(env) != MXL_RV32;
-#else
-#error un-handled architecture
-#endif
-}
-
#define GET_ARG(n) do { \
if (is_64bit_semihosting(env)) { \
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 16/43] semihosting: Split common_semi_flen_buf per target
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (14 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 15/43] semihosting: Split is_64bit_semihosting per target Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 17/43] semihosting: Split out common_semi_has_synccache Richard Henderson
` (27 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
We already have some larger ifdef blocks for ARM and RISCV;
split out common_semi_stack_bottom per target.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
semihosting/arm-compat-semi.c | 44 +++++++++++++++++------------------
1 file changed, 21 insertions(+), 23 deletions(-)
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 7fc60e223a..b2816e9f66 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -217,6 +217,13 @@ static inline bool is_64bit_semihosting(CPUArchState *env)
{
return is_a64(env);
}
+
+static inline target_ulong common_semi_stack_bottom(CPUState *cs)
+{
+ ARMCPU *cpu = ARM_CPU(cs);
+ CPUARMState *env = &cpu->env;
+ return is_a64(env) ? env->xregs[31] : env->regs[13];
+}
#endif /* TARGET_ARM */
#ifdef TARGET_RISCV
@@ -246,6 +253,13 @@ static inline bool is_64bit_semihosting(CPUArchState *env)
{
return riscv_cpu_mxl(env) != MXL_RV32;
}
+
+static inline target_ulong common_semi_stack_bottom(CPUState *cs)
+{
+ RISCVCPU *cpu = RISCV_CPU(cs);
+ CPURISCVState *env = &cpu->env;
+ return env->gpr[xSP];
+}
#endif
/*
@@ -301,31 +315,15 @@ static void common_semi_cb(CPUState *cs, target_ulong ret, target_ulong err)
common_semi_set_ret(cs, ret);
}
+/*
+ * Return an address in target memory of 64 bytes where the remote
+ * gdb should write its stat struct. (The format of this structure
+ * is defined by GDB's remote protocol and is not target-specific.)
+ * We put this on the guest's stack just below SP.
+ */
static target_ulong common_semi_flen_buf(CPUState *cs)
{
- target_ulong sp;
-#ifdef TARGET_ARM
- /* Return an address in target memory of 64 bytes where the remote
- * gdb should write its stat struct. (The format of this structure
- * is defined by GDB's remote protocol and is not target-specific.)
- * We put this on the guest's stack just below SP.
- */
- ARMCPU *cpu = ARM_CPU(cs);
- CPUARMState *env = &cpu->env;
-
- if (is_a64(env)) {
- sp = env->xregs[31];
- } else {
- sp = env->regs[13];
- }
-#endif
-#ifdef TARGET_RISCV
- RISCVCPU *cpu = RISCV_CPU(cs);
- CPURISCVState *env = &cpu->env;
-
- sp = env->gpr[xSP];
-#endif
-
+ target_ulong sp = common_semi_stack_bottom(cs);
return sp - 64;
}
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 17/43] semihosting: Split out common_semi_has_synccache
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (15 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 16/43] semihosting: Split common_semi_flen_buf " Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 18/43] semihosting: Use env more often in do_common_semihosting Richard Henderson
` (26 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
We already have some larger ifdef blocks for ARM and RISCV;
split out a boolean test for SYS_SYNCCACHE.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
semihosting/arm-compat-semi.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index b2816e9f66..6149be404f 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -224,6 +224,12 @@ static inline target_ulong common_semi_stack_bottom(CPUState *cs)
CPUARMState *env = &cpu->env;
return is_a64(env) ? env->xregs[31] : env->regs[13];
}
+
+static inline bool common_semi_has_synccache(CPUArchState *env)
+{
+ /* Invalid for A32/T32. */
+ return !is_a64(env);
+}
#endif /* TARGET_ARM */
#ifdef TARGET_RISCV
@@ -260,6 +266,11 @@ static inline target_ulong common_semi_stack_bottom(CPUState *cs)
CPURISCVState *env = &cpu->env;
return env->gpr[xSP];
}
+
+static inline bool common_semi_has_synccache(CPUArchState *env)
+{
+ return true;
+}
#endif
/*
@@ -1103,16 +1114,11 @@ void do_common_semihosting(CPUState *cs)
* virtual address range. This is a nop for us since we don't
* implement caches. This is only present on A64.
*/
-#ifdef TARGET_ARM
- if (is_a64(cs->env_ptr)) {
+ if (common_semi_has_synccache(env)) {
common_semi_set_ret(cs, 0);
break;
}
-#endif
-#ifdef TARGET_RISCV
- common_semi_set_ret(cs, 0);
-#endif
- /* fall through -- invalid for A32/T32 */
+ /* fall through */
default:
fprintf(stderr, "qemu: Unsupported SemiHosting SWI 0x%02x\n", nr);
cpu_dump_state(cs, stderr, 0);
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 18/43] semihosting: Use env more often in do_common_semihosting
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (16 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 17/43] semihosting: Split out common_semi_has_synccache Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 19/43] semihosting: Move GET_ARG/SET_ARG earlier in the file Richard Henderson
` (25 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
We've already loaded cs->env_ptr into a local variable; use it.
Since env is unconditionally used, we don't need a dummy use.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/arm/common-semi-target.h | 62 ++++++++++++++++++
target/riscv/common-semi-target.h | 50 +++++++++++++++
semihosting/arm-compat-semi.c | 101 ++----------------------------
3 files changed, 116 insertions(+), 97 deletions(-)
create mode 100644 target/arm/common-semi-target.h
create mode 100644 target/riscv/common-semi-target.h
diff --git a/target/arm/common-semi-target.h b/target/arm/common-semi-target.h
new file mode 100644
index 0000000000..c20e1cca76
--- /dev/null
+++ b/target/arm/common-semi-target.h
@@ -0,0 +1,62 @@
+/*
+ * Target-specific parts of semihosting/arm-compat-semi.c.
+ *
+ * Copyright (c) 2005, 2007 CodeSourcery.
+ * Copyright (c) 2019, 2022 Linaro
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#ifndef TARGET_ARM_COMMON_SEMI_TARGET_H
+#define TARGET_ARM_COMMON_SEMI_TARGET_H
+
+#ifndef CONFIG_USER_ONLY
+#include "hw/arm/boot.h"
+#endif
+
+static inline target_ulong common_semi_arg(CPUState *cs, int argno)
+{
+ ARMCPU *cpu = ARM_CPU(cs);
+ CPUARMState *env = &cpu->env;
+ if (is_a64(env)) {
+ return env->xregs[argno];
+ } else {
+ return env->regs[argno];
+ }
+}
+
+static inline void common_semi_set_ret(CPUState *cs, target_ulong ret)
+{
+ ARMCPU *cpu = ARM_CPU(cs);
+ CPUARMState *env = &cpu->env;
+ if (is_a64(env)) {
+ env->xregs[0] = ret;
+ } else {
+ env->regs[0] = ret;
+ }
+}
+
+static inline bool common_semi_sys_exit_extended(CPUState *cs, int nr)
+{
+ return (nr == TARGET_SYS_EXIT_EXTENDED || is_a64(cs->env_ptr));
+}
+
+static inline bool is_64bit_semihosting(CPUArchState *env)
+{
+ return is_a64(env);
+}
+
+static inline target_ulong common_semi_stack_bottom(CPUState *cs)
+{
+ ARMCPU *cpu = ARM_CPU(cs);
+ CPUARMState *env = &cpu->env;
+ return is_a64(env) ? env->xregs[31] : env->regs[13];
+}
+
+static inline bool common_semi_has_synccache(CPUArchState *env)
+{
+ /* Invalid for A32/T32 */
+ return !is_a64(env);
+}
+
+#endif
diff --git a/target/riscv/common-semi-target.h b/target/riscv/common-semi-target.h
new file mode 100644
index 0000000000..7c8a59e0cc
--- /dev/null
+++ b/target/riscv/common-semi-target.h
@@ -0,0 +1,50 @@
+/*
+ * Target-specific parts of semihosting/arm-compat-semi.c.
+ *
+ * Copyright (c) 2005, 2007 CodeSourcery.
+ * Copyright (c) 2019, 2022 Linaro
+ * Copyright © 2020 by Keith Packard <keithp@keithp.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#ifndef TARGET_RISCV_COMMON_SEMI_TARGET_H
+#define TARGET_RISCV_COMMON_SEMI_TARGET_H
+
+static inline target_ulong common_semi_arg(CPUState *cs, int argno)
+{
+ RISCVCPU *cpu = RISCV_CPU(cs);
+ CPURISCVState *env = &cpu->env;
+ return env->gpr[xA0 + argno];
+}
+
+static inline void common_semi_set_ret(CPUState *cs, target_ulong ret)
+{
+ RISCVCPU *cpu = RISCV_CPU(cs);
+ CPURISCVState *env = &cpu->env;
+ env->gpr[xA0] = ret;
+}
+
+static inline bool common_semi_sys_exit_extended(CPUState *cs, int nr)
+{
+ return (nr == TARGET_SYS_EXIT_EXTENDED || sizeof(target_ulong) == 8);
+}
+
+static inline bool is_64bit_semihosting(CPUArchState *env)
+{
+ return riscv_cpu_mxl(env) != MXL_RV32;
+}
+
+static inline target_ulong common_semi_stack_bottom(CPUState *cs)
+{
+ RISCVCPU *cpu = RISCV_CPU(cs);
+ CPURISCVState *env = &cpu->env;
+ return env->gpr[xSP];
+}
+
+static inline bool common_semi_has_synccache(CPUArchState *env)
+{
+ return true;
+}
+
+#endif
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 6149be404f..3a740482f9 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -46,9 +46,6 @@
#else
#include "qemu/cutils.h"
#include "hw/loader.h"
-#ifdef TARGET_ARM
-#include "hw/arm/boot.h"
-#endif
#include "hw/boards.h"
#endif
@@ -182,96 +179,7 @@ static LayoutInfo common_semi_find_bases(CPUState *cs)
#endif
-#ifdef TARGET_ARM
-static inline target_ulong
-common_semi_arg(CPUState *cs, int argno)
-{
- ARMCPU *cpu = ARM_CPU(cs);
- CPUARMState *env = &cpu->env;
- if (is_a64(env)) {
- return env->xregs[argno];
- } else {
- return env->regs[argno];
- }
-}
-
-static inline void
-common_semi_set_ret(CPUState *cs, target_ulong ret)
-{
- ARMCPU *cpu = ARM_CPU(cs);
- CPUARMState *env = &cpu->env;
- if (is_a64(env)) {
- env->xregs[0] = ret;
- } else {
- env->regs[0] = ret;
- }
-}
-
-static inline bool
-common_semi_sys_exit_extended(CPUState *cs, int nr)
-{
- return (nr == TARGET_SYS_EXIT_EXTENDED || is_a64(cs->env_ptr));
-}
-
-static inline bool is_64bit_semihosting(CPUArchState *env)
-{
- return is_a64(env);
-}
-
-static inline target_ulong common_semi_stack_bottom(CPUState *cs)
-{
- ARMCPU *cpu = ARM_CPU(cs);
- CPUARMState *env = &cpu->env;
- return is_a64(env) ? env->xregs[31] : env->regs[13];
-}
-
-static inline bool common_semi_has_synccache(CPUArchState *env)
-{
- /* Invalid for A32/T32. */
- return !is_a64(env);
-}
-#endif /* TARGET_ARM */
-
-#ifdef TARGET_RISCV
-static inline target_ulong
-common_semi_arg(CPUState *cs, int argno)
-{
- RISCVCPU *cpu = RISCV_CPU(cs);
- CPURISCVState *env = &cpu->env;
- return env->gpr[xA0 + argno];
-}
-
-static inline void
-common_semi_set_ret(CPUState *cs, target_ulong ret)
-{
- RISCVCPU *cpu = RISCV_CPU(cs);
- CPURISCVState *env = &cpu->env;
- env->gpr[xA0] = ret;
-}
-
-static inline bool
-common_semi_sys_exit_extended(CPUState *cs, int nr)
-{
- return (nr == TARGET_SYS_EXIT_EXTENDED || sizeof(target_ulong) == 8);
-}
-
-static inline bool is_64bit_semihosting(CPUArchState *env)
-{
- return riscv_cpu_mxl(env) != MXL_RV32;
-}
-
-static inline target_ulong common_semi_stack_bottom(CPUState *cs)
-{
- RISCVCPU *cpu = RISCV_CPU(cs);
- CPURISCVState *env = &cpu->env;
- return env->gpr[xSP];
-}
-
-static inline bool common_semi_has_synccache(CPUArchState *env)
-{
- return true;
-}
-#endif
+#include "common-semi-target.h"
/*
* The semihosting API has no concept of its errno being thread-safe,
@@ -646,7 +554,6 @@ void do_common_semihosting(CPUState *cs)
GuestFD *gf;
int64_t elapsed;
- (void) env; /* Used implicitly by arm lock_user macro */
nr = common_semi_arg(cs, 0) & 0xffffffffU;
args = common_semi_arg(cs, 1);
@@ -729,12 +636,12 @@ void do_common_semihosting(CPUState *cs)
break;
case TARGET_SYS_WRITEC:
- qemu_semihosting_console_outc(cs->env_ptr, args);
+ qemu_semihosting_console_outc(env, args);
common_semi_set_ret(cs, 0xdeadbeef);
break;
case TARGET_SYS_WRITE0:
- ret = qemu_semihosting_console_outs(cs->env_ptr, args);
+ ret = qemu_semihosting_console_outs(env, args);
common_semi_set_ret(cs, ret);
break;
@@ -765,7 +672,7 @@ void do_common_semihosting(CPUState *cs)
break;
case TARGET_SYS_READC:
- ret = qemu_semihosting_console_inc(cs->env_ptr);
+ ret = qemu_semihosting_console_inc(env);
common_semi_set_ret(cs, ret);
break;
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 19/43] semihosting: Move GET_ARG/SET_ARG earlier in the file
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (17 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 18/43] semihosting: Use env more often in do_common_semihosting Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 20/43] semihosting: Split out semihost_sys_open Richard Henderson
` (24 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
Moving this to be useful for another function
besides do_common_semihosting.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
semihosting/arm-compat-semi.c | 52 +++++++++++++++++------------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 3a740482f9..49f976cbc5 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -181,6 +181,32 @@ static LayoutInfo common_semi_find_bases(CPUState *cs)
#include "common-semi-target.h"
+/*
+ * Read the input value from the argument block; fail the semihosting
+ * call if the memory read fails. Eventually we could use a generic
+ * CPUState helper function here.
+ */
+
+#define GET_ARG(n) do { \
+ if (is_64bit_semihosting(env)) { \
+ if (get_user_u64(arg ## n, args + (n) * 8)) { \
+ common_semi_cb(cs, -1, EFAULT); \
+ return; \
+ } \
+ } else { \
+ if (get_user_u32(arg ## n, args + (n) * 4)) { \
+ common_semi_cb(cs, -1, EFAULT); \
+ return; \
+ } \
+ } \
+} while (0)
+
+#define SET_ARG(n, val) \
+ (is_64bit_semihosting(env) ? \
+ put_user_u64(val, args + (n) * 8) : \
+ put_user_u32(val, args + (n) * 4))
+
+
/*
* The semihosting API has no concept of its errno being thread-safe,
* as the API design predates SMP CPUs and was intended as a simple
@@ -506,32 +532,6 @@ static const GuestFDFunctions guestfd_fns[] = {
},
};
-/*
- * Read the input value from the argument block; fail the semihosting
- * call if the memory read fails. Eventually we could use a generic
- * CPUState helper function here.
- */
-
-#define GET_ARG(n) do { \
- if (is_64bit_semihosting(env)) { \
- if (get_user_u64(arg ## n, args + (n) * 8)) { \
- common_semi_cb(cs, -1, EFAULT); \
- return; \
- } \
- } else { \
- if (get_user_u32(arg ## n, args + (n) * 4)) { \
- common_semi_cb(cs, -1, EFAULT); \
- return; \
- } \
- } \
-} while (0)
-
-#define SET_ARG(n, val) \
- (is_64bit_semihosting(env) ? \
- put_user_u64(val, args + (n) * 8) : \
- put_user_u32(val, args + (n) * 4))
-
-
/*
* Do a semihosting call.
*
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 20/43] semihosting: Split out semihost_sys_open
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (18 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 19/43] semihosting: Move GET_ARG/SET_ARG earlier in the file Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 21/43] semihosting: Split out semihost_sys_close Richard Henderson
` (23 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
Split out the non-ARM specific portions of SYS_OPEN to a
reusable function. This handles gdb and host file i/o.
Add helpers to validate the length of the filename string.
Prepare for usage by other semihosting by allowing the
filename length parameter to be 0, and calling strlen.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/guestfd.h | 13 ++++
semihosting/arm-compat-semi.c | 49 +-----------
semihosting/guestfd.c | 135 ++++++++++++++++++++++++++++++++++
3 files changed, 152 insertions(+), 45 deletions(-)
diff --git a/include/semihosting/guestfd.h b/include/semihosting/guestfd.h
index 5aa2722cb2..275b91b73a 100644
--- a/include/semihosting/guestfd.h
+++ b/include/semihosting/guestfd.h
@@ -41,4 +41,17 @@ GuestFD *get_guestfd(int guestfd);
void associate_guestfd(int guestfd, int hostfd);
void staticfile_guestfd(int guestfd, const uint8_t *data, size_t len);
+/*
+ * Syscall implementations for semi-hosting. Argument loading from
+ * the guest is performed by the caller; results are returned via
+ * the 'complete' callback. String operands are in address/len pairs.
+ * The len argument may be 0 (when the semihosting abi does not
+ * already provide the length), or non-zero (where it should include
+ * the terminating zero).
+ */
+
+void semihost_sys_open(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong fname, target_ulong fname_len,
+ int gdb_flags, int mode);
+
#endif /* SEMIHOSTING_GUESTFD_H */
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 49f976cbc5..e2decd54e4 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -35,9 +35,9 @@
#include "semihosting/semihost.h"
#include "semihosting/console.h"
#include "semihosting/common-semi.h"
-#include "semihosting/guestfd.h"
#include "qemu/timer.h"
#include "exec/gdbstub.h"
+#include "semihosting/guestfd.h"
#ifdef CONFIG_USER_ONLY
#include "qemu.h"
@@ -98,21 +98,6 @@ static int gdb_open_modeflags[12] = {
GDB_O_RDWR | GDB_O_CREAT | GDB_O_APPEND | GDB_O_BINARY
};
-static int open_modeflags[12] = {
- O_RDONLY,
- O_RDONLY | O_BINARY,
- O_RDWR,
- O_RDWR | O_BINARY,
- O_WRONLY | O_CREAT | O_TRUNC,
- O_WRONLY | O_CREAT | O_TRUNC | O_BINARY,
- O_RDWR | O_CREAT | O_TRUNC,
- O_RDWR | O_CREAT | O_TRUNC | O_BINARY,
- O_WRONLY | O_CREAT | O_APPEND,
- O_WRONLY | O_CREAT | O_APPEND | O_BINARY,
- O_RDWR | O_CREAT | O_APPEND,
- O_RDWR | O_CREAT | O_APPEND | O_BINARY
-};
-
#ifndef CONFIG_USER_ONLY
/**
@@ -285,20 +270,6 @@ common_semi_flen_cb(CPUState *cs, target_ulong ret, target_ulong err)
common_semi_set_ret(cs, size);
}
-static int common_semi_open_guestfd;
-
-static void
-common_semi_open_cb(CPUState *cs, target_ulong ret, target_ulong err)
-{
- if (ret == (target_ulong)-1) {
- dealloc_guestfd(common_semi_open_guestfd);
- } else {
- associate_guestfd(common_semi_open_guestfd, ret);
- ret = common_semi_open_guestfd;
- }
- common_semi_cb(cs, ret, err);
-}
-
/*
* Types for functions implementing various semihosting calls
* for specific types of guest file descriptor. These must all
@@ -602,22 +573,10 @@ void do_common_semihosting(CPUState *cs)
staticfile_guestfd(ret, featurefile_data,
sizeof(featurefile_data));
}
- } else if (use_gdb_syscalls()) {
- unlock_user(s, arg0, 0);
- common_semi_open_guestfd = alloc_guestfd();
- gdb_do_syscall(common_semi_open_cb,
- "open,%s,%x,1a4", arg0, (int)arg2 + 1,
- gdb_open_modeflags[arg1]);
- break;
} else {
- hostfd = open(s, open_modeflags[arg1], 0644);
- if (hostfd < 0) {
- ret = -1;
- err = errno;
- } else {
- ret = alloc_guestfd();
- associate_guestfd(ret, hostfd);
- }
+ semihost_sys_open(cs, common_semi_cb, arg0, arg2 + 1,
+ gdb_open_modeflags[arg1], 0644);
+ break;
}
unlock_user(s, arg0, 0);
common_semi_cb(cs, ret, err);
diff --git a/semihosting/guestfd.c b/semihosting/guestfd.c
index b6405f5663..1393279333 100644
--- a/semihosting/guestfd.c
+++ b/semihosting/guestfd.c
@@ -11,6 +11,11 @@
#include "qemu/osdep.h"
#include "exec/gdbstub.h"
#include "semihosting/guestfd.h"
+#ifdef CONFIG_USER_ONLY
+#include "qemu.h"
+#else
+#include "semihosting/softmmu-uaccess.h"
+#endif
static GArray *guestfd_array;
@@ -116,3 +121,133 @@ void dealloc_guestfd(int guestfd)
assert(gf);
gf->type = GuestFDUnused;
}
+
+/*
+ * Validate or compute the length of the string (including terminator).
+ */
+static int validate_strlen(CPUState *cs, target_ulong str, target_ulong tlen)
+{
+ CPUArchState *env G_GNUC_UNUSED = cs->env_ptr;
+ char c;
+
+ if (tlen == 0) {
+ ssize_t slen = target_strlen(str);
+
+ if (slen < 0) {
+ return -EFAULT;
+ }
+ if (slen >= INT32_MAX) {
+ return -ENAMETOOLONG;
+ }
+ return slen + 1;
+ }
+ if (tlen > INT32_MAX) {
+ return -ENAMETOOLONG;
+ }
+ if (get_user_u8(c, str + tlen - 1)) {
+ return -EFAULT;
+ }
+ if (c != 0) {
+ return -EINVAL;
+ }
+ return tlen;
+}
+
+static int validate_lock_user_string(char **pstr, CPUState *cs,
+ target_ulong tstr, target_ulong tlen)
+{
+ int ret = validate_strlen(cs, tstr, tlen);
+ CPUArchState *env G_GNUC_UNUSED = cs->env_ptr;
+ char *str = NULL;
+
+ if (ret > 0) {
+ str = lock_user(VERIFY_READ, tstr, ret, true);
+ ret = str ? 0 : -EFAULT;
+ }
+ *pstr = str;
+ return ret;
+}
+
+/*
+ * File-related semihosting syscall implementations.
+ */
+
+static gdb_syscall_complete_cb gdb_open_complete;
+
+static void gdb_open_cb(CPUState *cs, target_ulong ret, target_ulong err)
+{
+ if (!err) {
+ int guestfd = alloc_guestfd();
+ associate_guestfd(guestfd, ret);
+ ret = guestfd;
+ }
+ gdb_open_complete(cs, ret, err);
+}
+
+static void gdb_open(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong fname, target_ulong fname_len,
+ int gdb_flags, int mode)
+{
+ int len = validate_strlen(cs, fname, fname_len);
+ if (len < 0) {
+ complete(cs, -1, -len);
+ return;
+ }
+
+ gdb_open_complete = complete;
+ gdb_do_syscall(gdb_open_cb, "open,%s,%x,%x",
+ fname, len, (target_ulong)gdb_flags, (target_ulong)mode);
+}
+
+static void host_open(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong fname, target_ulong fname_len,
+ int gdb_flags, int mode)
+{
+ CPUArchState *env G_GNUC_UNUSED = cs->env_ptr;
+ char *p;
+ int ret, host_flags;
+
+ ret = validate_lock_user_string(&p, cs, fname, fname_len);
+ if (ret < 0) {
+ complete(cs, -1, -ret);
+ return;
+ }
+
+ if (gdb_flags & GDB_O_WRONLY) {
+ host_flags = O_WRONLY;
+ } else if (gdb_flags & GDB_O_RDWR) {
+ host_flags = O_RDWR;
+ } else {
+ host_flags = O_RDONLY;
+ }
+ if (gdb_flags & GDB_O_CREAT) {
+ host_flags |= O_CREAT;
+ }
+ if (gdb_flags & GDB_O_TRUNC) {
+ host_flags |= O_TRUNC;
+ }
+ if (gdb_flags & GDB_O_EXCL) {
+ host_flags |= O_EXCL;
+ }
+
+ ret = open(p, host_flags, mode);
+ if (ret < 0) {
+ complete(cs, -1, errno);
+ } else {
+ int guestfd = alloc_guestfd();
+ associate_guestfd(guestfd, ret);
+ complete(cs, guestfd, 0);
+ }
+ unlock_user(p, fname, 0);
+}
+
+void semihost_sys_open(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong fname, target_ulong fname_len,
+ int gdb_flags, int mode)
+{
+ if (use_gdb_syscalls()) {
+ gdb_open(cs, complete, fname, fname_len, gdb_flags, mode);
+ } else {
+ host_open(cs, complete, fname, fname_len, gdb_flags, mode);
+ }
+}
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 21/43] semihosting: Split out semihost_sys_close
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (19 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 20/43] semihosting: Split out semihost_sys_open Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 22/43] semihosting: Split out semihost_sys_read Richard Henderson
` (22 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
Split out the non-ARM specific portions of SYS_CLOSE to a
reusable function. This handles all GuestFD.
Note that gdb_do_syscall %x reads target_ulong, not int.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/guestfd.h | 2 ++
semihosting/arm-compat-semi.c | 41 +-------------------------
semihosting/guestfd.c | 54 ++++++++++++++++++++++++++++++++++-
3 files changed, 56 insertions(+), 41 deletions(-)
diff --git a/include/semihosting/guestfd.h b/include/semihosting/guestfd.h
index 275b91b73a..c38b1d3657 100644
--- a/include/semihosting/guestfd.h
+++ b/include/semihosting/guestfd.h
@@ -54,4 +54,6 @@ void semihost_sys_open(CPUState *cs, gdb_syscall_complete_cb complete,
target_ulong fname, target_ulong fname_len,
int gdb_flags, int mode);
+void semihost_sys_close(CPUState *cs, gdb_syscall_complete_cb complete, int fd);
+
#endif /* SEMIHOSTING_GUESTFD_H */
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index e2decd54e4..f20e84c4f0 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -276,7 +276,6 @@ common_semi_flen_cb(CPUState *cs, target_ulong ret, target_ulong err)
* do the work and return the required return value to the guest
* via common_semi_cb.
*/
-typedef void sys_closefn(CPUState *cs, GuestFD *gf);
typedef void sys_writefn(CPUState *cs, GuestFD *gf,
target_ulong buf, uint32_t len);
typedef void sys_readfn(CPUState *cs, GuestFD *gf,
@@ -285,23 +284,6 @@ typedef void sys_isattyfn(CPUState *cs, GuestFD *gf);
typedef void sys_seekfn(CPUState *cs, GuestFD *gf, target_ulong offset);
typedef void sys_flenfn(CPUState *cs, GuestFD *gf);
-static void host_closefn(CPUState *cs, GuestFD *gf)
-{
- int ret;
- /*
- * Only close the underlying host fd if it's one we opened on behalf
- * of the guest in SYS_OPEN.
- */
- if (gf->hostfd == STDIN_FILENO ||
- gf->hostfd == STDOUT_FILENO ||
- gf->hostfd == STDERR_FILENO) {
- ret = 0;
- } else {
- ret = close(gf->hostfd);
- }
- common_semi_cb(cs, ret, ret ? errno : 0);
-}
-
static void host_writefn(CPUState *cs, GuestFD *gf,
target_ulong buf, uint32_t len)
{
@@ -362,11 +344,6 @@ static void host_flenfn(CPUState *cs, GuestFD *gf)
}
}
-static void gdb_closefn(CPUState *cs, GuestFD *gf)
-{
- gdb_do_syscall(common_semi_cb, "close,%x", gf->hostfd);
-}
-
static void gdb_writefn(CPUState *cs, GuestFD *gf,
target_ulong buf, uint32_t len)
{
@@ -414,12 +391,6 @@ static const uint8_t featurefile_data[] = {
SH_EXT_EXIT_EXTENDED | SH_EXT_STDOUT_STDERR, /* Feature byte 0 */
};
-static void staticfile_closefn(CPUState *cs, GuestFD *gf)
-{
- /* Nothing to do */
- common_semi_cb(cs, 0, 0);
-}
-
static void staticfile_writefn(CPUState *cs, GuestFD *gf,
target_ulong buf, uint32_t len)
{
@@ -468,7 +439,6 @@ static void staticfile_flenfn(CPUState *cs, GuestFD *gf)
}
typedef struct GuestFDFunctions {
- sys_closefn *closefn;
sys_writefn *writefn;
sys_readfn *readfn;
sys_isattyfn *isattyfn;
@@ -478,7 +448,6 @@ typedef struct GuestFDFunctions {
static const GuestFDFunctions guestfd_fns[] = {
[GuestFDHost] = {
- .closefn = host_closefn,
.writefn = host_writefn,
.readfn = host_readfn,
.isattyfn = host_isattyfn,
@@ -486,7 +455,6 @@ static const GuestFDFunctions guestfd_fns[] = {
.flenfn = host_flenfn,
},
[GuestFDGDB] = {
- .closefn = gdb_closefn,
.writefn = gdb_writefn,
.readfn = gdb_readfn,
.isattyfn = gdb_isattyfn,
@@ -494,7 +462,6 @@ static const GuestFDFunctions guestfd_fns[] = {
.flenfn = gdb_flenfn,
},
[GuestFDStatic] = {
- .closefn = staticfile_closefn,
.writefn = staticfile_writefn,
.readfn = staticfile_readfn,
.isattyfn = staticfile_isattyfn,
@@ -585,13 +552,7 @@ void do_common_semihosting(CPUState *cs)
case TARGET_SYS_CLOSE:
GET_ARG(0);
-
- gf = get_guestfd(arg0);
- if (!gf) {
- goto do_badf;
- }
- guestfd_fns[gf->type].closefn(cs, gf);
- dealloc_guestfd(arg0);
+ semihost_sys_close(cs, common_semi_cb, arg0);
break;
case TARGET_SYS_WRITEC:
diff --git a/semihosting/guestfd.c b/semihosting/guestfd.c
index 1393279333..c26b1c677e 100644
--- a/semihosting/guestfd.c
+++ b/semihosting/guestfd.c
@@ -49,6 +49,11 @@ int alloc_guestfd(void)
return i;
}
+static void do_dealloc_guestfd(GuestFD *gf)
+{
+ gf->type = GuestFDUnused;
+}
+
/*
* Look up the guestfd in the data structure; return NULL
* for out of bounds, but don't check whether the slot is unused.
@@ -119,7 +124,7 @@ void dealloc_guestfd(int guestfd)
GuestFD *gf = do_get_guestfd(guestfd);
assert(gf);
- gf->type = GuestFDUnused;
+ do_dealloc_guestfd(gf);
}
/*
@@ -251,3 +256,50 @@ void semihost_sys_open(CPUState *cs, gdb_syscall_complete_cb complete,
host_open(cs, complete, fname, fname_len, gdb_flags, mode);
}
}
+
+static void gdb_close(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf)
+{
+ gdb_do_syscall(complete, "close,%x", (target_ulong)gf->hostfd);
+}
+
+static void host_close(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf)
+{
+ /*
+ * Only close the underlying host fd if it's one we opened on behalf
+ * of the guest in SYS_OPEN.
+ */
+ if (gf->hostfd != STDIN_FILENO &&
+ gf->hostfd != STDOUT_FILENO &&
+ gf->hostfd != STDERR_FILENO &&
+ close(gf->hostfd) < 0) {
+ complete(cs, -1, errno);
+ } else {
+ complete(cs, 0, 0);
+ }
+}
+
+void semihost_sys_close(CPUState *cs, gdb_syscall_complete_cb complete, int fd)
+{
+ GuestFD *gf = get_guestfd(fd);
+
+ if (!gf) {
+ complete(cs, -1, EBADF);
+ return;
+ }
+ switch (gf->type) {
+ case GuestFDGDB:
+ gdb_close(cs, complete, gf);
+ break;
+ case GuestFDHost:
+ host_close(cs, complete, gf);
+ break;
+ case GuestFDStatic:
+ complete(cs, 0, 0);
+ break;
+ default:
+ g_assert_not_reached();
+ }
+ do_dealloc_guestfd(gf);
+}
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 22/43] semihosting: Split out semihost_sys_read
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (20 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 21/43] semihosting: Split out semihost_sys_close Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 23/43] semihosting: Split out semihost_sys_write Richard Henderson
` (21 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
Split out the non-ARM specific portions of SYS_READ to a
reusable function. This handles all GuestFD. Isolate the
curious ARM-specific return value processing to a new
callback, common_semi_rw_cb.
Note that gdb_do_syscall %x reads target_ulong, not int.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/guestfd.h | 3 ++
semihosting/arm-compat-semi.c | 84 ++++++++---------------------------
semihosting/guestfd.c | 75 +++++++++++++++++++++++++++++++
3 files changed, 97 insertions(+), 65 deletions(-)
diff --git a/include/semihosting/guestfd.h b/include/semihosting/guestfd.h
index c38b1d3657..568d55fd32 100644
--- a/include/semihosting/guestfd.h
+++ b/include/semihosting/guestfd.h
@@ -56,4 +56,7 @@ void semihost_sys_open(CPUState *cs, gdb_syscall_complete_cb complete,
void semihost_sys_close(CPUState *cs, gdb_syscall_complete_cb complete, int fd);
+void semihost_sys_read(CPUState *cs, gdb_syscall_complete_cb complete,
+ int fd, target_ulong buf, target_ulong len);
+
#endif /* SEMIHOSTING_GUESTFD_H */
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index f20e84c4f0..2c6c2dd0d0 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -232,7 +232,6 @@ static void common_semi_cb(CPUState *cs, target_ulong ret, target_ulong err)
target_ulong reg0 = common_semi_arg(cs, 0);
switch (reg0) {
case TARGET_SYS_WRITE:
- case TARGET_SYS_READ:
ret = common_semi_syscall_len - ret;
break;
case TARGET_SYS_SEEK:
@@ -245,6 +244,24 @@ static void common_semi_cb(CPUState *cs, target_ulong ret, target_ulong err)
common_semi_set_ret(cs, ret);
}
+/*
+ * 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)
+{
+ /* Recover the original length from the third argument. */
+ CPUArchState *env G_GNUC_UNUSED = cs->env_ptr;
+ target_ulong args = common_semi_arg(cs, 1);
+ target_ulong arg2;
+ GET_ARG(2);
+
+ if (err) {
+ ret = 0; /* error: no bytes transmitted */
+ }
+ common_semi_set_ret(cs, arg2 - ret);
+}
+
/*
* Return an address in target memory of 64 bytes where the remote
* gdb should write its stat struct. (The format of this structure
@@ -278,8 +295,6 @@ common_semi_flen_cb(CPUState *cs, target_ulong ret, target_ulong err)
*/
typedef void sys_writefn(CPUState *cs, GuestFD *gf,
target_ulong buf, uint32_t len);
-typedef void sys_readfn(CPUState *cs, GuestFD *gf,
- target_ulong buf, uint32_t len);
typedef void sys_isattyfn(CPUState *cs, GuestFD *gf);
typedef void sys_seekfn(CPUState *cs, GuestFD *gf, target_ulong offset);
typedef void sys_flenfn(CPUState *cs, GuestFD *gf);
@@ -302,26 +317,6 @@ static void host_writefn(CPUState *cs, GuestFD *gf,
common_semi_cb(cs, len - ret, 0);
}
-static void host_readfn(CPUState *cs, GuestFD *gf,
- target_ulong buf, uint32_t len)
-{
- CPUArchState *env = cs->env_ptr;
- uint32_t ret = 0;
- char *s = lock_user(VERIFY_WRITE, buf, len, 0);
- (void) env; /* Used in arm softmmu lock_user implicitly */
- if (s) {
- do {
- ret = read(gf->hostfd, s, len);
- } while (ret == -1 && errno == EINTR);
- unlock_user(s, buf, len);
- if (ret == (uint32_t)-1) {
- ret = 0;
- }
- }
- /* Return bytes not read, on error as well. */
- common_semi_cb(cs, len - ret, 0);
-}
-
static void host_isattyfn(CPUState *cs, GuestFD *gf)
{
common_semi_cb(cs, isatty(gf->hostfd), 0);
@@ -351,13 +346,6 @@ static void gdb_writefn(CPUState *cs, GuestFD *gf,
gdb_do_syscall(common_semi_cb, "write,%x,%x,%x", gf->hostfd, buf, len);
}
-static void gdb_readfn(CPUState *cs, GuestFD *gf,
- target_ulong buf, uint32_t len)
-{
- common_semi_syscall_len = len;
- gdb_do_syscall(common_semi_cb, "read,%x,%x,%x", gf->hostfd, buf, len);
-}
-
static void gdb_isattyfn(CPUState *cs, GuestFD *gf)
{
gdb_do_syscall(common_semi_cb, "isatty,%x", gf->hostfd);
@@ -398,30 +386,6 @@ static void staticfile_writefn(CPUState *cs, GuestFD *gf,
common_semi_cb(cs, -1, EBADF);
}
-static void staticfile_readfn(CPUState *cs, GuestFD *gf,
- target_ulong buf, uint32_t len)
-{
- CPUArchState *env = cs->env_ptr;
- uint32_t i = 0;
- char *s;
-
- (void) env; /* Used in arm softmmu lock_user implicitly */
- s = lock_user(VERIFY_WRITE, buf, len, 0);
- if (s) {
- for (i = 0; i < len; i++) {
- if (gf->staticfile.off >= gf->staticfile.len) {
- break;
- }
- s[i] = gf->staticfile.data[gf->staticfile.off];
- gf->staticfile.off++;
- }
- unlock_user(s, buf, len);
- }
-
- /* Return number of bytes not read */
- common_semi_cb(cs, len - i, 0);
-}
-
static void staticfile_isattyfn(CPUState *cs, GuestFD *gf)
{
common_semi_cb(cs, 0, 0);
@@ -440,7 +404,6 @@ static void staticfile_flenfn(CPUState *cs, GuestFD *gf)
typedef struct GuestFDFunctions {
sys_writefn *writefn;
- sys_readfn *readfn;
sys_isattyfn *isattyfn;
sys_seekfn *seekfn;
sys_flenfn *flenfn;
@@ -449,21 +412,18 @@ typedef struct GuestFDFunctions {
static const GuestFDFunctions guestfd_fns[] = {
[GuestFDHost] = {
.writefn = host_writefn,
- .readfn = host_readfn,
.isattyfn = host_isattyfn,
.seekfn = host_seekfn,
.flenfn = host_flenfn,
},
[GuestFDGDB] = {
.writefn = gdb_writefn,
- .readfn = gdb_readfn,
.isattyfn = gdb_isattyfn,
.seekfn = gdb_seekfn,
.flenfn = gdb_flenfn,
},
[GuestFDStatic] = {
.writefn = staticfile_writefn,
- .readfn = staticfile_readfn,
.isattyfn = staticfile_isattyfn,
.seekfn = staticfile_seekfn,
.flenfn = staticfile_flenfn,
@@ -582,13 +542,7 @@ void do_common_semihosting(CPUState *cs)
GET_ARG(0);
GET_ARG(1);
GET_ARG(2);
- len = arg2;
-
- gf = get_guestfd(arg0);
- if (!gf) {
- goto do_badf;
- }
- guestfd_fns[gf->type].readfn(cs, gf, arg1, len);
+ semihost_sys_read(cs, common_semi_rw_cb, arg0, arg1, arg2);
break;
case TARGET_SYS_READC:
diff --git a/semihosting/guestfd.c b/semihosting/guestfd.c
index c26b1c677e..057e384d65 100644
--- a/semihosting/guestfd.c
+++ b/semihosting/guestfd.c
@@ -303,3 +303,78 @@ void semihost_sys_close(CPUState *cs, gdb_syscall_complete_cb complete, int fd)
}
do_dealloc_guestfd(gf);
}
+
+static void gdb_read(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf, target_ulong buf, target_ulong len)
+{
+ gdb_do_syscall(complete, "read,%x,%x,%x",
+ (target_ulong)gf->hostfd, buf, len);
+}
+
+static void host_read(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf, target_ulong buf, target_ulong len)
+{
+ CPUArchState *env G_GNUC_UNUSED = cs->env_ptr;
+ void *ptr = lock_user(VERIFY_WRITE, buf, len, 0);
+ ssize_t ret;
+
+ if (!ptr) {
+ complete(cs, -1, EFAULT);
+ return;
+ }
+ do {
+ ret = read(gf->hostfd, ptr, len);
+ } while (ret == -1 && errno == EINTR);
+ if (ret == -1) {
+ complete(cs, -1, errno);
+ unlock_user(ptr, buf, 0);
+ } else {
+ complete(cs, ret, 0);
+ unlock_user(ptr, buf, ret);
+ }
+}
+
+static void staticfile_read(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf, target_ulong buf, target_ulong len)
+{
+ CPUArchState *env G_GNUC_UNUSED = cs->env_ptr;
+ target_ulong rest = gf->staticfile.len - gf->staticfile.off;
+ void *ptr;
+
+ if (len > rest) {
+ len = rest;
+ }
+ ptr = lock_user(VERIFY_WRITE, buf, len, 0);
+ if (!ptr) {
+ complete(cs, -1, EFAULT);
+ return;
+ }
+ memcpy(ptr, gf->staticfile.data + gf->staticfile.off, len);
+ gf->staticfile.off += len;
+ complete(cs, len, 0);
+ unlock_user(ptr, buf, len);
+}
+
+void semihost_sys_read(CPUState *cs, gdb_syscall_complete_cb complete,
+ int fd, target_ulong buf, target_ulong len)
+{
+ GuestFD *gf = get_guestfd(fd);
+
+ if (!gf) {
+ complete(cs, -1, EBADF);
+ return;
+ }
+ switch (gf->type) {
+ case GuestFDGDB:
+ gdb_read(cs, complete, gf, buf, len);
+ break;
+ case GuestFDHost:
+ host_read(cs, complete, gf, buf, len);
+ break;
+ case GuestFDStatic:
+ staticfile_read(cs, complete, gf, buf, len);
+ break;
+ default:
+ g_assert_not_reached();
+ }
+}
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 23/43] semihosting: Split out semihost_sys_write
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (21 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 22/43] semihosting: Split out semihost_sys_read Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 24/43] semihosting: Bound length for semihost_sys_{read, write} Richard Henderson
` (20 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
Split out the non-ARM specific portions of SYS_WRITE to a
reusable function. This handles all GuestFD. This removes
the last use of common_semi_syscall_len.
Note that gdb_do_syscall %x reads target_ulong, not int.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/guestfd.h | 3 ++
semihosting/arm-compat-semi.c | 52 +----------------------------------
semihosting/guestfd.c | 48 ++++++++++++++++++++++++++++++++
3 files changed, 52 insertions(+), 51 deletions(-)
diff --git a/include/semihosting/guestfd.h b/include/semihosting/guestfd.h
index 568d55fd32..5780ea2f13 100644
--- a/include/semihosting/guestfd.h
+++ b/include/semihosting/guestfd.h
@@ -59,4 +59,7 @@ void semihost_sys_close(CPUState *cs, gdb_syscall_complete_cb complete, int fd);
void semihost_sys_read(CPUState *cs, gdb_syscall_complete_cb complete,
int fd, target_ulong buf, target_ulong len);
+void semihost_sys_write(CPUState *cs, gdb_syscall_complete_cb complete,
+ int fd, target_ulong buf, target_ulong len);
+
#endif /* SEMIHOSTING_GUESTFD_H */
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 2c6c2dd0d0..6568d205eb 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -216,8 +216,6 @@ static inline uint32_t get_swi_errno(CPUState *cs)
#endif
}
-static target_ulong common_semi_syscall_len;
-
static void common_semi_cb(CPUState *cs, target_ulong ret, target_ulong err)
{
if (err) {
@@ -231,9 +229,6 @@ static void common_semi_cb(CPUState *cs, target_ulong ret, target_ulong err)
/* Fixup syscalls that use nonstardard return conventions. */
target_ulong reg0 = common_semi_arg(cs, 0);
switch (reg0) {
- case TARGET_SYS_WRITE:
- ret = common_semi_syscall_len - ret;
- break;
case TARGET_SYS_SEEK:
ret = 0;
break;
@@ -293,30 +288,10 @@ common_semi_flen_cb(CPUState *cs, target_ulong ret, target_ulong err)
* do the work and return the required return value to the guest
* via common_semi_cb.
*/
-typedef void sys_writefn(CPUState *cs, GuestFD *gf,
- target_ulong buf, uint32_t len);
typedef void sys_isattyfn(CPUState *cs, GuestFD *gf);
typedef void sys_seekfn(CPUState *cs, GuestFD *gf, target_ulong offset);
typedef void sys_flenfn(CPUState *cs, GuestFD *gf);
-static void host_writefn(CPUState *cs, GuestFD *gf,
- target_ulong buf, uint32_t len)
-{
- CPUArchState *env = cs->env_ptr;
- uint32_t ret = 0;
- char *s = lock_user(VERIFY_READ, buf, len, 1);
- (void) env; /* Used in arm softmmu lock_user implicitly */
- if (s) {
- ret = write(gf->hostfd, s, len);
- unlock_user(s, buf, 0);
- if (ret == (uint32_t)-1) {
- ret = 0;
- }
- }
- /* Return bytes not written, on error as well. */
- common_semi_cb(cs, len - ret, 0);
-}
-
static void host_isattyfn(CPUState *cs, GuestFD *gf)
{
common_semi_cb(cs, isatty(gf->hostfd), 0);
@@ -339,13 +314,6 @@ static void host_flenfn(CPUState *cs, GuestFD *gf)
}
}
-static void gdb_writefn(CPUState *cs, GuestFD *gf,
- target_ulong buf, uint32_t len)
-{
- common_semi_syscall_len = len;
- gdb_do_syscall(common_semi_cb, "write,%x,%x,%x", gf->hostfd, buf, len);
-}
-
static void gdb_isattyfn(CPUState *cs, GuestFD *gf)
{
gdb_do_syscall(common_semi_cb, "isatty,%x", gf->hostfd);
@@ -379,13 +347,6 @@ static const uint8_t featurefile_data[] = {
SH_EXT_EXIT_EXTENDED | SH_EXT_STDOUT_STDERR, /* Feature byte 0 */
};
-static void staticfile_writefn(CPUState *cs, GuestFD *gf,
- target_ulong buf, uint32_t len)
-{
- /* This fd can never be open for writing */
- common_semi_cb(cs, -1, EBADF);
-}
-
static void staticfile_isattyfn(CPUState *cs, GuestFD *gf)
{
common_semi_cb(cs, 0, 0);
@@ -403,7 +364,6 @@ static void staticfile_flenfn(CPUState *cs, GuestFD *gf)
}
typedef struct GuestFDFunctions {
- sys_writefn *writefn;
sys_isattyfn *isattyfn;
sys_seekfn *seekfn;
sys_flenfn *flenfn;
@@ -411,19 +371,16 @@ typedef struct GuestFDFunctions {
static const GuestFDFunctions guestfd_fns[] = {
[GuestFDHost] = {
- .writefn = host_writefn,
.isattyfn = host_isattyfn,
.seekfn = host_seekfn,
.flenfn = host_flenfn,
},
[GuestFDGDB] = {
- .writefn = gdb_writefn,
.isattyfn = gdb_isattyfn,
.seekfn = gdb_seekfn,
.flenfn = gdb_flenfn,
},
[GuestFDStatic] = {
- .writefn = staticfile_writefn,
.isattyfn = staticfile_isattyfn,
.seekfn = staticfile_seekfn,
.flenfn = staticfile_flenfn,
@@ -448,7 +405,6 @@ void do_common_semihosting(CPUState *cs)
char * s;
int nr;
uint32_t ret;
- uint32_t len;
GuestFD *gf;
int64_t elapsed;
@@ -529,13 +485,7 @@ void do_common_semihosting(CPUState *cs)
GET_ARG(0);
GET_ARG(1);
GET_ARG(2);
- len = arg2;
-
- gf = get_guestfd(arg0);
- if (!gf) {
- goto do_badf;
- }
- guestfd_fns[gf->type].writefn(cs, gf, arg1, len);
+ semihost_sys_write(cs, common_semi_rw_cb, arg0, arg1, arg2);
break;
case TARGET_SYS_READ:
diff --git a/semihosting/guestfd.c b/semihosting/guestfd.c
index 057e384d65..42efd2c558 100644
--- a/semihosting/guestfd.c
+++ b/semihosting/guestfd.c
@@ -378,3 +378,51 @@ void semihost_sys_read(CPUState *cs, gdb_syscall_complete_cb complete,
g_assert_not_reached();
}
}
+
+static void gdb_write(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf, target_ulong buf, target_ulong len)
+{
+ gdb_do_syscall(complete, "write,%x,%x,%x",
+ (target_ulong)gf->hostfd, buf, len);
+}
+
+static void host_write(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf, target_ulong buf, target_ulong len)
+{
+ CPUArchState *env G_GNUC_UNUSED = cs->env_ptr;
+ void *ptr = lock_user(VERIFY_READ, buf, len, 1);
+ ssize_t ret;
+
+ if (!ptr) {
+ complete(cs, -1, EFAULT);
+ return;
+ }
+ ret = write(gf->hostfd, ptr, len);
+ complete(cs, ret, ret == -1 ? errno : 0);
+ unlock_user(ptr, buf, 0);
+}
+
+void semihost_sys_write(CPUState *cs, gdb_syscall_complete_cb complete,
+ int fd, target_ulong buf, target_ulong len)
+{
+ GuestFD *gf = get_guestfd(fd);
+
+ if (!gf) {
+ goto ebadf;
+ }
+ switch (gf->type) {
+ case GuestFDGDB:
+ gdb_write(cs, complete, gf, buf, len);
+ break;
+ case GuestFDHost:
+ host_write(cs, complete, gf, buf, len);
+ break;
+ case GuestFDStatic:
+ ebadf:
+ /* Static files are never open for writing: EBADF. */
+ complete(cs, -1, EBADF);
+ break;
+ default:
+ g_assert_not_reached();
+ }
+}
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 24/43] semihosting: Bound length for semihost_sys_{read, write}
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (22 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 23/43] semihosting: Split out semihost_sys_write Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 25/43] semihosting: Split out semihost_sys_lseek Richard Henderson
` (19 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
Fixes a minor bug in which a 64-bit guest on a 32-bit host could
truncate the length. This would only ever cause a problem if
there were no bits set in the low 32, so that it truncates to 0.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
semihosting/guestfd.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/semihosting/guestfd.c b/semihosting/guestfd.c
index 42efd2c558..356b87453c 100644
--- a/semihosting/guestfd.c
+++ b/semihosting/guestfd.c
@@ -364,6 +364,14 @@ void semihost_sys_read(CPUState *cs, gdb_syscall_complete_cb complete,
complete(cs, -1, EBADF);
return;
}
+ /*
+ * Bound length for 64-bit guests on 32-bit hosts, not overlowing ssize_t.
+ * Note the Linux kernel does this with MAX_RW_COUNT, so it's not a bad
+ * idea to do this unconditionally.
+ */
+ if (len > INT32_MAX) {
+ len = INT32_MAX;
+ }
switch (gf->type) {
case GuestFDGDB:
gdb_read(cs, complete, gf, buf, len);
@@ -410,6 +418,14 @@ void semihost_sys_write(CPUState *cs, gdb_syscall_complete_cb complete,
if (!gf) {
goto ebadf;
}
+ /*
+ * Bound length for 64-bit guests on 32-bit hosts, not overlowing ssize_t.
+ * Note the Linux kernel does this with MAX_RW_COUNT, so it's not a bad
+ * idea to do this unconditionally.
+ */
+ if (len > INT32_MAX) {
+ len = INT32_MAX;
+ }
switch (gf->type) {
case GuestFDGDB:
gdb_write(cs, complete, gf, buf, len);
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 25/43] semihosting: Split out semihost_sys_lseek
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (23 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 24/43] semihosting: Bound length for semihost_sys_{read, write} Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 26/43] semihosting: Split out semihost_sys_isatty Richard Henderson
` (18 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
Split out the non-ARM specific portions of SYS_SEEK to a
reusable function. This handles all GuestFD. Isolate the
curious ARM-specific return value processing to a new
callback, common_semi_seek_cb.
Expand the internal type of the offset to int64_t, and
provide the whence argument, which will be required by m68k
and nios2 semihosting.
Note that gdb_do_syscall %x reads target_ulong, not int.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/gdbstub.h | 5 +++
include/semihosting/guestfd.h | 3 ++
semihosting/arm-compat-semi.c | 51 ++++++----------------
semihosting/guestfd.c | 81 +++++++++++++++++++++++++++++++++++
4 files changed, 102 insertions(+), 38 deletions(-)
diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h
index 33a262a5a3..a7d3bfd5d4 100644
--- a/include/exec/gdbstub.h
+++ b/include/exec/gdbstub.h
@@ -20,6 +20,11 @@
#define GDB_O_TRUNC 0x400
#define GDB_O_EXCL 0x800
+/* For gdb file i/o remote protocol lseek whence. */
+#define GDB_SEEK_SET 0
+#define GDB_SEEK_CUR 1
+#define GDB_SEEK_END 2
+
/* For gdb file i/o stat/fstat. */
typedef uint32_t gdb_mode_t;
typedef uint32_t gdb_time_t;
diff --git a/include/semihosting/guestfd.h b/include/semihosting/guestfd.h
index 5780ea2f13..9c6967ac53 100644
--- a/include/semihosting/guestfd.h
+++ b/include/semihosting/guestfd.h
@@ -62,4 +62,7 @@ void semihost_sys_read(CPUState *cs, gdb_syscall_complete_cb complete,
void semihost_sys_write(CPUState *cs, gdb_syscall_complete_cb complete,
int fd, target_ulong buf, target_ulong len);
+void semihost_sys_lseek(CPUState *cs, gdb_syscall_complete_cb complete,
+ int fd, int64_t off, int gdb_whence);
+
#endif /* SEMIHOSTING_GUESTFD_H */
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 6568d205eb..0cab721a50 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -225,16 +225,6 @@ static void common_semi_cb(CPUState *cs, target_ulong ret, target_ulong err)
#else
syscall_err = err;
#endif
- } else {
- /* Fixup syscalls that use nonstardard return conventions. */
- target_ulong reg0 = common_semi_arg(cs, 0);
- switch (reg0) {
- case TARGET_SYS_SEEK:
- ret = 0;
- break;
- default:
- break;
- }
}
common_semi_set_ret(cs, ret);
}
@@ -257,6 +247,18 @@ static void common_semi_rw_cb(CPUState *cs, target_ulong ret, target_ulong err)
common_semi_set_ret(cs, arg2 - ret);
}
+/*
+ * SYS_SEEK returns 0 on success, not the resulting offset.
+ */
+static void common_semi_seek_cb(CPUState *cs, target_ulong ret,
+ target_ulong err)
+{
+ if (!err) {
+ ret = 0;
+ }
+ common_semi_cb(cs, ret, err);
+}
+
/*
* Return an address in target memory of 64 bytes where the remote
* gdb should write its stat struct. (The format of this structure
@@ -289,7 +291,6 @@ common_semi_flen_cb(CPUState *cs, target_ulong ret, target_ulong err)
* via common_semi_cb.
*/
typedef void sys_isattyfn(CPUState *cs, GuestFD *gf);
-typedef void sys_seekfn(CPUState *cs, GuestFD *gf, target_ulong offset);
typedef void sys_flenfn(CPUState *cs, GuestFD *gf);
static void host_isattyfn(CPUState *cs, GuestFD *gf)
@@ -297,12 +298,6 @@ static void host_isattyfn(CPUState *cs, GuestFD *gf)
common_semi_cb(cs, isatty(gf->hostfd), 0);
}
-static void host_seekfn(CPUState *cs, GuestFD *gf, target_ulong offset)
-{
- off_t ret = lseek(gf->hostfd, offset, SEEK_SET);
- common_semi_cb(cs, ret, ret == -1 ? errno : 0);
-}
-
static void host_flenfn(CPUState *cs, GuestFD *gf)
{
struct stat buf;
@@ -319,11 +314,6 @@ static void gdb_isattyfn(CPUState *cs, GuestFD *gf)
gdb_do_syscall(common_semi_cb, "isatty,%x", gf->hostfd);
}
-static void gdb_seekfn(CPUState *cs, GuestFD *gf, target_ulong offset)
-{
- gdb_do_syscall(common_semi_cb, "lseek,%x,%x,0", gf->hostfd, offset);
-}
-
static void gdb_flenfn(CPUState *cs, GuestFD *gf)
{
gdb_do_syscall(common_semi_flen_cb, "fstat,%x,%x",
@@ -352,12 +342,6 @@ static void staticfile_isattyfn(CPUState *cs, GuestFD *gf)
common_semi_cb(cs, 0, 0);
}
-static void staticfile_seekfn(CPUState *cs, GuestFD *gf, target_ulong offset)
-{
- gf->staticfile.off = offset;
- common_semi_cb(cs, 0, 0);
-}
-
static void staticfile_flenfn(CPUState *cs, GuestFD *gf)
{
common_semi_cb(cs, gf->staticfile.len, 0);
@@ -365,24 +349,20 @@ static void staticfile_flenfn(CPUState *cs, GuestFD *gf)
typedef struct GuestFDFunctions {
sys_isattyfn *isattyfn;
- sys_seekfn *seekfn;
sys_flenfn *flenfn;
} GuestFDFunctions;
static const GuestFDFunctions guestfd_fns[] = {
[GuestFDHost] = {
.isattyfn = host_isattyfn,
- .seekfn = host_seekfn,
.flenfn = host_flenfn,
},
[GuestFDGDB] = {
.isattyfn = gdb_isattyfn,
- .seekfn = gdb_seekfn,
.flenfn = gdb_flenfn,
},
[GuestFDStatic] = {
.isattyfn = staticfile_isattyfn,
- .seekfn = staticfile_seekfn,
.flenfn = staticfile_flenfn,
},
};
@@ -518,12 +498,7 @@ void do_common_semihosting(CPUState *cs)
case TARGET_SYS_SEEK:
GET_ARG(0);
GET_ARG(1);
-
- gf = get_guestfd(arg0);
- if (!gf) {
- goto do_badf;
- }
- guestfd_fns[gf->type].seekfn(cs, gf, arg1);
+ semihost_sys_lseek(cs, common_semi_seek_cb, arg0, arg1, GDB_SEEK_SET);
break;
case TARGET_SYS_FLEN:
diff --git a/semihosting/guestfd.c b/semihosting/guestfd.c
index 356b87453c..e33d226534 100644
--- a/semihosting/guestfd.c
+++ b/semihosting/guestfd.c
@@ -442,3 +442,84 @@ void semihost_sys_write(CPUState *cs, gdb_syscall_complete_cb complete,
g_assert_not_reached();
}
}
+
+static void gdb_lseek(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf, int64_t off, int gdb_whence)
+{
+ gdb_do_syscall(complete, "lseek,%x,%lx,%x",
+ (target_ulong)gf->hostfd, off, (target_ulong)gdb_whence);
+}
+
+static void host_lseek(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf, int64_t off, int whence)
+{
+ /* So far, all hosts use the same values. */
+ QEMU_BUILD_BUG_ON(GDB_SEEK_SET != SEEK_SET);
+ QEMU_BUILD_BUG_ON(GDB_SEEK_CUR != SEEK_CUR);
+ QEMU_BUILD_BUG_ON(GDB_SEEK_END != SEEK_END);
+
+ off_t ret = off;
+ int err = 0;
+
+ if (ret == off) {
+ ret = lseek(gf->hostfd, ret, whence);
+ if (ret == -1) {
+ err = errno;
+ }
+ } else {
+ ret = -1;
+ err = EOVERFLOW;
+ }
+ complete(cs, ret, err);
+}
+
+static void staticfile_lseek(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf, int64_t off, int gdb_whence)
+{
+ int64_t ret;
+
+ switch (gdb_whence) {
+ case GDB_SEEK_SET:
+ ret = off;
+ break;
+ case GDB_SEEK_CUR:
+ ret = gf->staticfile.off + off;
+ break;
+ case GDB_SEEK_END:
+ ret = gf->staticfile.len - off;
+ break;
+ default:
+ ret = -1;
+ break;
+ }
+ if (ret >= 0 && ret <= gf->staticfile.len) {
+ gf->staticfile.off = ret;
+ complete(cs, ret, 0);
+ } else {
+ complete(cs, -1, EINVAL);
+ }
+}
+
+void semihost_sys_lseek(CPUState *cs, gdb_syscall_complete_cb complete,
+ int fd, int64_t off, int gdb_whence)
+{
+ GuestFD *gf = get_guestfd(fd);
+
+ if (!gf) {
+ complete(cs, -1, EBADF);
+ return;
+ }
+ switch (gf->type) {
+ case GuestFDGDB:
+ gdb_lseek(cs, complete, gf, off, gdb_whence);
+ return;
+ case GuestFDHost:
+ host_lseek(cs, complete, gf, off, gdb_whence);
+ break;
+ case GuestFDStatic:
+ staticfile_lseek(cs, complete, gf, off, gdb_whence);
+ break;
+ default:
+ g_assert_not_reached();
+ }
+}
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 26/43] semihosting: Split out semihost_sys_isatty
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (24 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 25/43] semihosting: Split out semihost_sys_lseek Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 27/43] semihosting: Split out semihost_sys_flen Richard Henderson
` (17 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
Split out the non-ARM specific portions of SYS_ISTTY to a
reusable function. This handles all GuestFD.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/guestfd.h | 3 +++
semihosting/arm-compat-semi.c | 27 +-----------------------
semihosting/guestfd.c | 39 +++++++++++++++++++++++++++++++++++
3 files changed, 43 insertions(+), 26 deletions(-)
diff --git a/include/semihosting/guestfd.h b/include/semihosting/guestfd.h
index 9c6967ac53..d3dd081e81 100644
--- a/include/semihosting/guestfd.h
+++ b/include/semihosting/guestfd.h
@@ -65,4 +65,7 @@ void semihost_sys_write(CPUState *cs, gdb_syscall_complete_cb complete,
void semihost_sys_lseek(CPUState *cs, gdb_syscall_complete_cb complete,
int fd, int64_t off, int gdb_whence);
+void semihost_sys_isatty(CPUState *cs, gdb_syscall_complete_cb complete,
+ int fd);
+
#endif /* SEMIHOSTING_GUESTFD_H */
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 0cab721a50..3844d0e376 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -290,14 +290,8 @@ common_semi_flen_cb(CPUState *cs, target_ulong ret, target_ulong err)
* do the work and return the required return value to the guest
* via common_semi_cb.
*/
-typedef void sys_isattyfn(CPUState *cs, GuestFD *gf);
typedef void sys_flenfn(CPUState *cs, GuestFD *gf);
-static void host_isattyfn(CPUState *cs, GuestFD *gf)
-{
- common_semi_cb(cs, isatty(gf->hostfd), 0);
-}
-
static void host_flenfn(CPUState *cs, GuestFD *gf)
{
struct stat buf;
@@ -309,11 +303,6 @@ static void host_flenfn(CPUState *cs, GuestFD *gf)
}
}
-static void gdb_isattyfn(CPUState *cs, GuestFD *gf)
-{
- gdb_do_syscall(common_semi_cb, "isatty,%x", gf->hostfd);
-}
-
static void gdb_flenfn(CPUState *cs, GuestFD *gf)
{
gdb_do_syscall(common_semi_flen_cb, "fstat,%x,%x",
@@ -337,32 +326,23 @@ static const uint8_t featurefile_data[] = {
SH_EXT_EXIT_EXTENDED | SH_EXT_STDOUT_STDERR, /* Feature byte 0 */
};
-static void staticfile_isattyfn(CPUState *cs, GuestFD *gf)
-{
- common_semi_cb(cs, 0, 0);
-}
-
static void staticfile_flenfn(CPUState *cs, GuestFD *gf)
{
common_semi_cb(cs, gf->staticfile.len, 0);
}
typedef struct GuestFDFunctions {
- sys_isattyfn *isattyfn;
sys_flenfn *flenfn;
} GuestFDFunctions;
static const GuestFDFunctions guestfd_fns[] = {
[GuestFDHost] = {
- .isattyfn = host_isattyfn,
.flenfn = host_flenfn,
},
[GuestFDGDB] = {
- .isattyfn = gdb_isattyfn,
.flenfn = gdb_flenfn,
},
[GuestFDStatic] = {
- .isattyfn = staticfile_isattyfn,
.flenfn = staticfile_flenfn,
},
};
@@ -487,12 +467,7 @@ void do_common_semihosting(CPUState *cs)
case TARGET_SYS_ISTTY:
GET_ARG(0);
-
- gf = get_guestfd(arg0);
- if (!gf) {
- goto do_badf;
- }
- guestfd_fns[gf->type].isattyfn(cs, gf);
+ semihost_sys_isatty(cs, common_semi_cb, arg0);
break;
case TARGET_SYS_SEEK:
diff --git a/semihosting/guestfd.c b/semihosting/guestfd.c
index e33d226534..6ed4a9162d 100644
--- a/semihosting/guestfd.c
+++ b/semihosting/guestfd.c
@@ -523,3 +523,42 @@ void semihost_sys_lseek(CPUState *cs, gdb_syscall_complete_cb complete,
g_assert_not_reached();
}
}
+
+static void gdb_isatty(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf)
+{
+ gdb_do_syscall(complete, "isatty,%x", (target_ulong)gf->hostfd);
+}
+
+static void host_isatty(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf)
+{
+ if (isatty(gf->hostfd)) {
+ complete(cs, 1, 0);
+ } else {
+ complete(cs, 0, errno);
+ }
+}
+
+void semihost_sys_isatty(CPUState *cs, gdb_syscall_complete_cb complete, int fd)
+{
+ GuestFD *gf = get_guestfd(fd);
+
+ if (!gf) {
+ complete(cs, 0, EBADF);
+ return;
+ }
+ switch (gf->type) {
+ case GuestFDGDB:
+ gdb_isatty(cs, complete, gf);
+ break;
+ case GuestFDHost:
+ host_isatty(cs, complete, gf);
+ break;
+ case GuestFDStatic:
+ complete(cs, 0, ENOTTY);
+ break;
+ default:
+ g_assert_not_reached();
+ }
+}
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 27/43] semihosting: Split out semihost_sys_flen
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (25 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 26/43] semihosting: Split out semihost_sys_isatty Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 28/43] semihosting: Split out semihost_sys_remove Richard Henderson
` (16 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
The ARM-specific SYS_FLEN isn't really something that can be
reused by other semihosting apis, but moving the implementation
to guestfd.c means that we can keep the GuestFD stuff together.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/guestfd.h | 4 ++
semihosting/arm-compat-semi.c | 83 ++++++++---------------------------
semihosting/guestfd.c | 55 +++++++++++++++++++++++
3 files changed, 78 insertions(+), 64 deletions(-)
diff --git a/include/semihosting/guestfd.h b/include/semihosting/guestfd.h
index d3dd081e81..d362b7ccf0 100644
--- a/include/semihosting/guestfd.h
+++ b/include/semihosting/guestfd.h
@@ -68,4 +68,8 @@ void semihost_sys_lseek(CPUState *cs, gdb_syscall_complete_cb complete,
void semihost_sys_isatty(CPUState *cs, gdb_syscall_complete_cb complete,
int fd);
+void semihost_sys_flen(CPUState *cs, gdb_syscall_complete_cb fstat_cb,
+ gdb_syscall_complete_cb flen_cb,
+ int fd, target_ulong fstat_addr);
+
#endif /* SEMIHOSTING_GUESTFD_H */
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 3844d0e376..f9938ac879 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -272,41 +272,25 @@ static target_ulong common_semi_flen_buf(CPUState *cs)
}
static void
-common_semi_flen_cb(CPUState *cs, target_ulong ret, target_ulong err)
+common_semi_flen_fstat_cb(CPUState *cs, target_ulong ret, target_ulong err)
{
- /* The size is always stored in big-endian order, extract the value. */
- uint64_t size;
- cpu_memory_rw_debug(cs, common_semi_flen_buf(cs) +
- offsetof(struct gdb_stat, gdb_st_size),
- &size, 8, 0);
- size = be64_to_cpu(size);
- common_semi_cb(cs, -1, err);
- common_semi_set_ret(cs, size);
-}
-
-/*
- * Types for functions implementing various semihosting calls
- * for specific types of guest file descriptor. These must all
- * do the work and return the required return value to the guest
- * via common_semi_cb.
- */
-typedef void sys_flenfn(CPUState *cs, GuestFD *gf);
-
-static void host_flenfn(CPUState *cs, GuestFD *gf)
-{
- struct stat buf;
-
- if (fstat(gf->hostfd, &buf)) {
- common_semi_cb(cs, -1, errno);
- } else {
- common_semi_cb(cs, buf.st_size, 0);
+ if (!err) {
+ /* The size is always stored in big-endian order, extract the value. */
+ CPUArchState *env G_GNUC_UNUSED = cs->env_ptr;
+ uint64_t size;
+ if (get_user_u64(size, common_semi_flen_buf(cs) +
+ offsetof(struct gdb_stat, gdb_st_size))) {
+ ret = -1, err = EFAULT;
+ } else {
+ /* Undo the tswap from get_user_u64, then swap from BE. */
+ size = be64_to_cpu(tswap64(size));
+ ret = size;
+ if (ret != size) {
+ ret = -1, err = EOVERFLOW;
+ }
+ }
}
-}
-
-static void gdb_flenfn(CPUState *cs, GuestFD *gf)
-{
- gdb_do_syscall(common_semi_flen_cb, "fstat,%x,%x",
- gf->hostfd, common_semi_flen_buf(cs));
+ common_semi_cb(cs, ret, err);
}
#define SHFB_MAGIC_0 0x53
@@ -326,27 +310,6 @@ static const uint8_t featurefile_data[] = {
SH_EXT_EXIT_EXTENDED | SH_EXT_STDOUT_STDERR, /* Feature byte 0 */
};
-static void staticfile_flenfn(CPUState *cs, GuestFD *gf)
-{
- common_semi_cb(cs, gf->staticfile.len, 0);
-}
-
-typedef struct GuestFDFunctions {
- sys_flenfn *flenfn;
-} GuestFDFunctions;
-
-static const GuestFDFunctions guestfd_fns[] = {
- [GuestFDHost] = {
- .flenfn = host_flenfn,
- },
- [GuestFDGDB] = {
- .flenfn = gdb_flenfn,
- },
- [GuestFDStatic] = {
- .flenfn = staticfile_flenfn,
- },
-};
-
/*
* Do a semihosting call.
*
@@ -365,7 +328,6 @@ void do_common_semihosting(CPUState *cs)
char * s;
int nr;
uint32_t ret;
- GuestFD *gf;
int64_t elapsed;
nr = common_semi_arg(cs, 0) & 0xffffffffU;
@@ -478,12 +440,8 @@ void do_common_semihosting(CPUState *cs)
case TARGET_SYS_FLEN:
GET_ARG(0);
-
- gf = get_guestfd(arg0);
- if (!gf) {
- goto do_badf;
- }
- guestfd_fns[gf->type].flenfn(cs, gf);
+ semihost_sys_flen(cs, common_semi_flen_fstat_cb, common_semi_cb,
+ arg0, common_semi_flen_buf(cs));
break;
case TARGET_SYS_TMPNAM:
@@ -805,9 +763,6 @@ void do_common_semihosting(CPUState *cs)
cpu_dump_state(cs, stderr, 0);
abort();
- do_badf:
- common_semi_cb(cs, -1, EBADF);
- break;
do_fault:
common_semi_cb(cs, -1, EFAULT);
break;
diff --git a/semihosting/guestfd.c b/semihosting/guestfd.c
index 6ed4a9162d..3a2100585d 100644
--- a/semihosting/guestfd.c
+++ b/semihosting/guestfd.c
@@ -562,3 +562,58 @@ void semihost_sys_isatty(CPUState *cs, gdb_syscall_complete_cb complete, int fd)
g_assert_not_reached();
}
}
+
+static void gdb_fstat(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf, target_ulong addr)
+{
+ gdb_do_syscall(complete, "fstat,%x,%x", (target_ulong)gf->hostfd, addr);
+}
+
+static void host_flen(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf)
+{
+ struct stat buf;
+ target_ulong ret;
+
+ if (fstat(gf->hostfd, &buf) < 0) {
+ complete(cs, -1, errno);
+ } else {
+ ret = buf.st_size;
+ if (ret != buf.st_size) {
+ complete(cs, -1, EOVERFLOW);
+ } else {
+ complete(cs, ret, 0);
+ }
+ }
+}
+
+static void staticfile_flen(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf)
+{
+ complete(cs, gf->staticfile.len, 0);
+}
+
+void semihost_sys_flen(CPUState *cs, gdb_syscall_complete_cb fstat_cb,
+ gdb_syscall_complete_cb flen_cb, int fd,
+ target_ulong fstat_addr)
+{
+ GuestFD *gf = get_guestfd(fd);
+
+ if (!gf) {
+ flen_cb(cs, -1, EBADF);
+ return;
+ }
+ switch (gf->type) {
+ case GuestFDGDB:
+ gdb_fstat(cs, fstat_cb, gf, fstat_addr);
+ break;
+ case GuestFDHost:
+ host_flen(cs, flen_cb, gf);
+ break;
+ case GuestFDStatic:
+ staticfile_flen(cs, flen_cb, gf);
+ break;
+ default:
+ g_assert_not_reached();
+ }
+}
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 28/43] semihosting: Split out semihost_sys_remove
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (26 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 27/43] semihosting: Split out semihost_sys_flen Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 29/43] semihosting: Split out semihost_sys_rename Richard Henderson
` (15 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
Split out the non-ARM specific portions of SYS_REMOVE to a
reusable function. This doesn't use GuestFD, but it does
reuse validate_strlen() from semihost_sys_open.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/guestfd.h | 3 +++
semihosting/arm-compat-semi.c | 13 +-----------
semihosting/guestfd.c | 40 +++++++++++++++++++++++++++++++++++
3 files changed, 44 insertions(+), 12 deletions(-)
diff --git a/include/semihosting/guestfd.h b/include/semihosting/guestfd.h
index d362b7ccf0..c31a48598a 100644
--- a/include/semihosting/guestfd.h
+++ b/include/semihosting/guestfd.h
@@ -72,4 +72,7 @@ void semihost_sys_flen(CPUState *cs, gdb_syscall_complete_cb fstat_cb,
gdb_syscall_complete_cb flen_cb,
int fd, target_ulong fstat_addr);
+void semihost_sys_remove(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong fname, target_ulong fname_len);
+
#endif /* SEMIHOSTING_GUESTFD_H */
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index f9938ac879..d460754ea0 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -472,18 +472,7 @@ void do_common_semihosting(CPUState *cs)
case TARGET_SYS_REMOVE:
GET_ARG(0);
GET_ARG(1);
- if (use_gdb_syscalls()) {
- gdb_do_syscall(common_semi_cb, "unlink,%s",
- arg0, (int)arg1 + 1);
- break;
- }
- s = lock_user_string(arg0);
- if (!s) {
- goto do_fault;
- }
- ret = remove(s);
- unlock_user(s, arg0, 0);
- common_semi_cb(cs, ret, ret ? errno : 0);
+ semihost_sys_remove(cs, common_semi_cb, arg0, arg1 + 1);
break;
case TARGET_SYS_RENAME:
diff --git a/semihosting/guestfd.c b/semihosting/guestfd.c
index 3a2100585d..17d43e83d3 100644
--- a/semihosting/guestfd.c
+++ b/semihosting/guestfd.c
@@ -617,3 +617,43 @@ void semihost_sys_flen(CPUState *cs, gdb_syscall_complete_cb fstat_cb,
g_assert_not_reached();
}
}
+
+static void gdb_remove(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong fname, target_ulong fname_len)
+{
+ int len = validate_strlen(cs, fname, fname_len);
+ if (len < 0) {
+ complete(cs, -1, -len);
+ return;
+ }
+
+ gdb_do_syscall(complete, "unlink,%s", fname, len);
+}
+
+static void host_remove(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong fname, target_ulong fname_len)
+{
+ CPUArchState *env G_GNUC_UNUSED = cs->env_ptr;
+ char *p;
+ int ret;
+
+ ret = validate_lock_user_string(&p, cs, fname, fname_len);
+ if (ret < 0) {
+ complete(cs, -1, -ret);
+ return;
+ }
+
+ ret = remove(p);
+ complete(cs, ret, ret ? errno : 0);
+ unlock_user(p, fname, 0);
+}
+
+void semihost_sys_remove(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong fname, target_ulong fname_len)
+{
+ if (use_gdb_syscalls()) {
+ gdb_remove(cs, complete, fname, fname_len);
+ } else {
+ host_remove(cs, complete, fname, fname_len);
+ }
+}
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 29/43] semihosting: Split out semihost_sys_rename
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (27 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 28/43] semihosting: Split out semihost_sys_remove Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 30/43] semihosting: Split out semihost_sys_system Richard Henderson
` (14 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
Split out the non-ARM specific portions of SYS_RENAME to a
reusable function. This doesn't use GuestFD, but it does
reuse validate_strlen() from semihost_sys_open.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/guestfd.h | 4 +++
semihosting/arm-compat-semi.c | 21 +------------
semihosting/guestfd.c | 57 +++++++++++++++++++++++++++++++++++
3 files changed, 62 insertions(+), 20 deletions(-)
diff --git a/include/semihosting/guestfd.h b/include/semihosting/guestfd.h
index c31a48598a..2bdf02429b 100644
--- a/include/semihosting/guestfd.h
+++ b/include/semihosting/guestfd.h
@@ -75,4 +75,8 @@ void semihost_sys_flen(CPUState *cs, gdb_syscall_complete_cb fstat_cb,
void semihost_sys_remove(CPUState *cs, gdb_syscall_complete_cb complete,
target_ulong fname, target_ulong fname_len);
+void semihost_sys_rename(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong oname, target_ulong oname_len,
+ target_ulong nname, target_ulong nname_len);
+
#endif /* SEMIHOSTING_GUESTFD_H */
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index d460754ea0..143c8689f5 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -480,26 +480,7 @@ void do_common_semihosting(CPUState *cs)
GET_ARG(1);
GET_ARG(2);
GET_ARG(3);
- if (use_gdb_syscalls()) {
- gdb_do_syscall(common_semi_cb, "rename,%s,%s",
- arg0, (int)arg1 + 1, arg2, (int)arg3 + 1);
- } else {
- char *s2;
-
- s = lock_user_string(arg0);
- if (!s) {
- goto do_fault;
- }
- s2 = lock_user_string(arg2);
- if (!s2) {
- unlock_user(s, arg0, 0);
- goto do_fault;
- }
- ret = rename(s, s2);
- unlock_user(s2, arg2, 0);
- unlock_user(s, arg0, 0);
- common_semi_cb(cs, ret, ret ? errno : 0);
- }
+ semihost_sys_rename(cs, common_semi_cb, arg0, arg1 + 1, arg2, arg3 + 1);
break;
case TARGET_SYS_CLOCK:
diff --git a/semihosting/guestfd.c b/semihosting/guestfd.c
index 17d43e83d3..03e516535a 100644
--- a/semihosting/guestfd.c
+++ b/semihosting/guestfd.c
@@ -657,3 +657,60 @@ void semihost_sys_remove(CPUState *cs, gdb_syscall_complete_cb complete,
host_remove(cs, complete, fname, fname_len);
}
}
+
+static void gdb_rename(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong oname, target_ulong oname_len,
+ target_ulong nname, target_ulong nname_len)
+{
+ int olen, nlen;
+
+ olen = validate_strlen(cs, oname, oname_len);
+ if (olen < 0) {
+ complete(cs, -1, -olen);
+ return;
+ }
+ nlen = validate_strlen(cs, nname, nname_len);
+ if (nlen < 0) {
+ complete(cs, -1, -nlen);
+ return;
+ }
+
+ gdb_do_syscall(complete, "rename,%s,%s", oname, olen, nname, nlen);
+}
+
+static void host_rename(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong oname, target_ulong oname_len,
+ target_ulong nname, target_ulong nname_len)
+{
+ CPUArchState *env G_GNUC_UNUSED = cs->env_ptr;
+ char *ostr, *nstr;
+ int ret;
+
+ ret = validate_lock_user_string(&ostr, cs, oname, oname_len);
+ if (ret < 0) {
+ complete(cs, -1, -ret);
+ return;
+ }
+ ret = validate_lock_user_string(&nstr, cs, nname, nname_len);
+ if (ret < 0) {
+ unlock_user(ostr, oname, 0);
+ complete(cs, -1, -ret);
+ return;
+ }
+
+ ret = rename(ostr, nstr);
+ complete(cs, ret, ret ? errno : 0);
+ unlock_user(ostr, oname, 0);
+ unlock_user(nstr, nname, 0);
+}
+
+void semihost_sys_rename(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong oname, target_ulong oname_len,
+ target_ulong nname, target_ulong nname_len)
+{
+ if (use_gdb_syscalls()) {
+ gdb_rename(cs, complete, oname, oname_len, nname, nname_len);
+ } else {
+ host_rename(cs, complete, oname, oname_len, nname, nname_len);
+ }
+}
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 30/43] semihosting: Split out semihost_sys_system
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (28 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 29/43] semihosting: Split out semihost_sys_rename Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 31/43] semihosting: Create semihost_sys_{stat,fstat} Richard Henderson
` (13 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
Split out the non-ARM specific portions of SYS_SYSTEM to a
reusable function. This doesn't use GuestFD, but it does
reuse validate_strlen() from semihost_sys_open.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/guestfd.h | 3 +++
semihosting/arm-compat-semi.c | 12 +----------
semihosting/guestfd.c | 40 +++++++++++++++++++++++++++++++++++
3 files changed, 44 insertions(+), 11 deletions(-)
diff --git a/include/semihosting/guestfd.h b/include/semihosting/guestfd.h
index 2bdf02429b..a6d34e8141 100644
--- a/include/semihosting/guestfd.h
+++ b/include/semihosting/guestfd.h
@@ -79,4 +79,7 @@ void semihost_sys_rename(CPUState *cs, gdb_syscall_complete_cb complete,
target_ulong oname, target_ulong oname_len,
target_ulong nname, target_ulong nname_len);
+void semihost_sys_system(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong cmd, target_ulong cmd_len);
+
#endif /* SEMIHOSTING_GUESTFD_H */
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 143c8689f5..61e8dede8d 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -495,17 +495,7 @@ void do_common_semihosting(CPUState *cs)
case TARGET_SYS_SYSTEM:
GET_ARG(0);
GET_ARG(1);
- if (use_gdb_syscalls()) {
- gdb_do_syscall(common_semi_cb, "system,%s", arg0, (int)arg1 + 1);
- break;
- }
- s = lock_user_string(arg0);
- if (!s) {
- goto do_fault;
- }
- ret = system(s);
- unlock_user(s, arg0, 0);
- common_semi_cb(cs, ret, ret == -1 ? errno : 0);
+ semihost_sys_system(cs, common_semi_cb, arg0, arg1 + 1);
break;
case TARGET_SYS_ERRNO:
diff --git a/semihosting/guestfd.c b/semihosting/guestfd.c
index 03e516535a..9176ddd301 100644
--- a/semihosting/guestfd.c
+++ b/semihosting/guestfd.c
@@ -714,3 +714,43 @@ void semihost_sys_rename(CPUState *cs, gdb_syscall_complete_cb complete,
host_rename(cs, complete, oname, oname_len, nname, nname_len);
}
}
+
+static void gdb_system(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong cmd, target_ulong cmd_len)
+{
+ int len = validate_strlen(cs, cmd, cmd_len);
+ if (len < 0) {
+ complete(cs, -1, -len);
+ return;
+ }
+
+ gdb_do_syscall(complete, "system,%s", cmd, len);
+}
+
+static void host_system(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong cmd, target_ulong cmd_len)
+{
+ CPUArchState *env G_GNUC_UNUSED = cs->env_ptr;
+ char *p;
+ int ret;
+
+ ret = validate_lock_user_string(&p, cs, cmd, cmd_len);
+ if (ret < 0) {
+ complete(cs, -1, -ret);
+ return;
+ }
+
+ ret = system(p);
+ complete(cs, ret, ret == -1 ? errno : 0);
+ unlock_user(p, cmd, 0);
+}
+
+void semihost_sys_system(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong cmd, target_ulong cmd_len)
+{
+ if (use_gdb_syscalls()) {
+ gdb_system(cs, complete, cmd, cmd_len);
+ } else {
+ host_system(cs, complete, cmd, cmd_len);
+ }
+}
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 31/43] semihosting: Create semihost_sys_{stat,fstat}
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (29 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 30/43] semihosting: Split out semihost_sys_system Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 32/43] semihosting: Create semihost_sys_gettimeofday Richard Henderson
` (12 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
These syscalls will be used by m68k and nios2 semihosting.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/guestfd.h | 7 ++
semihosting/guestfd.c | 137 ++++++++++++++++++++++++++++++++++
2 files changed, 144 insertions(+)
diff --git a/include/semihosting/guestfd.h b/include/semihosting/guestfd.h
index a6d34e8141..315cac1c44 100644
--- a/include/semihosting/guestfd.h
+++ b/include/semihosting/guestfd.h
@@ -82,4 +82,11 @@ void semihost_sys_rename(CPUState *cs, gdb_syscall_complete_cb complete,
void semihost_sys_system(CPUState *cs, gdb_syscall_complete_cb complete,
target_ulong cmd, target_ulong cmd_len);
+void semihost_sys_fstat(CPUState *cs, gdb_syscall_complete_cb complete,
+ int fd, target_ulong addr);
+
+void semihost_sys_stat(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong fname, target_ulong fname_len,
+ target_ulong addr);
+
#endif /* SEMIHOSTING_GUESTFD_H */
diff --git a/semihosting/guestfd.c b/semihosting/guestfd.c
index 9176ddd301..c182d5b7e6 100644
--- a/semihosting/guestfd.c
+++ b/semihosting/guestfd.c
@@ -563,12 +563,95 @@ void semihost_sys_isatty(CPUState *cs, gdb_syscall_complete_cb complete, int fd)
}
}
+/*
+ * TODO: Note that gdb always stores the stat structure big-endian.
+ * So far, that's ok, as the only two targets using this are also
+ * big-endian. Until we do something with gdb, also produce the
+ * same big-endian result from the host.
+ */
+static int copy_stat_to_user(CPUState *cs, target_ulong addr,
+ const struct stat *s)
+{
+ CPUArchState *env G_GNUC_UNUSED = cs->env_ptr;
+ struct gdb_stat *p;
+
+ if (s->st_dev != (uint32_t)s->st_dev ||
+ s->st_ino != (uint32_t)s->st_ino) {
+ return -EOVERFLOW;
+ }
+
+ p = lock_user(VERIFY_WRITE, addr, sizeof(struct gdb_stat), 0);
+ if (!p) {
+ return -EFAULT;
+ }
+
+ p->gdb_st_dev = cpu_to_be32(s->st_dev);
+ p->gdb_st_ino = cpu_to_be32(s->st_ino);
+ p->gdb_st_mode = cpu_to_be32(s->st_mode);
+ p->gdb_st_nlink = cpu_to_be32(s->st_nlink);
+ p->gdb_st_uid = cpu_to_be32(s->st_uid);
+ p->gdb_st_gid = cpu_to_be32(s->st_gid);
+ p->gdb_st_rdev = cpu_to_be32(s->st_rdev);
+ p->gdb_st_size = cpu_to_be64(s->st_size);
+#ifdef _WIN32
+ /* Windows stat is missing some fields. */
+ p->gdb_st_blksize = 0;
+ p->gdb_st_blocks = 0;
+#else
+ p->gdb_st_blksize = cpu_to_be64(s->st_blksize);
+ p->gdb_st_blocks = cpu_to_be64(s->st_blocks);
+#endif
+ p->gdb_st_atime = cpu_to_be32(s->st_atime);
+ p->gdb_st_mtime = cpu_to_be32(s->st_mtime);
+ p->gdb_st_ctime = cpu_to_be32(s->st_ctime);
+
+ unlock_user(p, addr, sizeof(struct gdb_stat));
+ return 0;
+}
+
static void gdb_fstat(CPUState *cs, gdb_syscall_complete_cb complete,
GuestFD *gf, target_ulong addr)
{
gdb_do_syscall(complete, "fstat,%x,%x", (target_ulong)gf->hostfd, addr);
}
+static void host_fstat(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf, target_ulong addr)
+{
+ struct stat buf;
+ int ret;
+
+ ret = fstat(gf->hostfd, &buf);
+ if (ret) {
+ complete(cs, -1, errno);
+ return;
+ }
+ ret = copy_stat_to_user(cs, addr, &buf);
+ complete(cs, ret ? -1 : 0, ret ? -ret : 0);
+}
+
+void semihost_sys_fstat(CPUState *cs, gdb_syscall_complete_cb complete,
+ int fd, target_ulong addr)
+{
+ GuestFD *gf = get_guestfd(fd);
+
+ if (!gf) {
+ complete(cs, -1, EBADF);
+ return;
+ }
+ switch (gf->type) {
+ case GuestFDGDB:
+ gdb_fstat(cs, complete, gf, addr);
+ break;
+ case GuestFDHost:
+ host_fstat(cs, complete, gf, addr);
+ break;
+ case GuestFDStatic:
+ default:
+ g_assert_not_reached();
+ }
+}
+
static void host_flen(CPUState *cs, gdb_syscall_complete_cb complete,
GuestFD *gf)
{
@@ -754,3 +837,57 @@ void semihost_sys_system(CPUState *cs, gdb_syscall_complete_cb complete,
host_system(cs, complete, cmd, cmd_len);
}
}
+
+static void gdb_stat(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong fname, target_ulong fname_len,
+ target_ulong addr)
+{
+ int len = validate_strlen(cs, fname, fname_len);
+ if (len < 0) {
+ complete(cs, -1, -len);
+ return;
+ }
+
+ gdb_do_syscall(complete, "stat,%s,%x", fname, len, addr);
+}
+
+static void host_stat(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong fname, target_ulong fname_len,
+ target_ulong addr)
+{
+ CPUArchState *env G_GNUC_UNUSED = cs->env_ptr;
+ struct stat buf;
+ char *name;
+ int ret, err;
+
+ ret = validate_lock_user_string(&name, cs, fname, fname_len);
+ if (ret < 0) {
+ complete(cs, -1, -ret);
+ return;
+ }
+
+ ret = stat(name, &buf);
+ if (ret) {
+ err = errno;
+ } else {
+ ret = copy_stat_to_user(cs, addr, &buf);
+ err = 0;
+ if (ret < 0) {
+ err = -ret;
+ ret = -1;
+ }
+ }
+ complete(cs, ret, err);
+ unlock_user(name, fname, 0);
+}
+
+void semihost_sys_stat(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong fname, target_ulong fname_len,
+ target_ulong addr)
+{
+ if (use_gdb_syscalls()) {
+ gdb_stat(cs, complete, fname, fname_len, addr);
+ } else {
+ host_stat(cs, complete, fname, fname_len, addr);
+ }
+}
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 32/43] semihosting: Create semihost_sys_gettimeofday
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (30 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 31/43] semihosting: Create semihost_sys_{stat,fstat} Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 33/43] gdbstub: Widen gdb_syscall_complete_cb return value Richard Henderson
` (11 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
This syscall will be used by m68k and nios2 semihosting.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/guestfd.h | 3 +++
semihosting/guestfd.c | 42 +++++++++++++++++++++++++++++++++++
2 files changed, 45 insertions(+)
diff --git a/include/semihosting/guestfd.h b/include/semihosting/guestfd.h
index 315cac1c44..5b0ed1b472 100644
--- a/include/semihosting/guestfd.h
+++ b/include/semihosting/guestfd.h
@@ -89,4 +89,7 @@ void semihost_sys_stat(CPUState *cs, gdb_syscall_complete_cb complete,
target_ulong fname, target_ulong fname_len,
target_ulong addr);
+void semihost_sys_gettimeofday(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong tv_addr, target_ulong tz_addr);
+
#endif /* SEMIHOSTING_GUESTFD_H */
diff --git a/semihosting/guestfd.c b/semihosting/guestfd.c
index c182d5b7e6..cb9eab9587 100644
--- a/semihosting/guestfd.c
+++ b/semihosting/guestfd.c
@@ -891,3 +891,45 @@ void semihost_sys_stat(CPUState *cs, gdb_syscall_complete_cb complete,
host_stat(cs, complete, fname, fname_len, addr);
}
}
+
+static void gdb_gettimeofday(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong tv_addr, target_ulong tz_addr)
+{
+ gdb_do_syscall(complete, "gettimeofday,%s,%x", tv_addr, tz_addr);
+}
+
+static void host_gettimeofday(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong tv_addr, target_ulong tz_addr)
+{
+ CPUArchState *env G_GNUC_UNUSED = cs->env_ptr;
+ struct gdb_timeval *p;
+ int64_t rt;
+
+ /* GDB fails on non-null TZ, so be consistent. */
+ if (tz_addr != 0) {
+ complete(cs, -1, EINVAL);
+ return;
+ }
+
+ p = lock_user(VERIFY_WRITE, tv_addr, sizeof(struct gdb_timeval), 0);
+ if (!p) {
+ complete(cs, -1, EFAULT);
+ return;
+ }
+
+ /* TODO: Like stat, gdb always produces big-endian results; match it. */
+ rt = g_get_real_time();
+ p->tv_sec = cpu_to_be32(rt / G_USEC_PER_SEC);
+ p->tv_usec = cpu_to_be64(rt % G_USEC_PER_SEC);
+ unlock_user(p, tv_addr, sizeof(struct gdb_timeval));
+}
+
+void semihost_sys_gettimeofday(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong tv_addr, target_ulong tz_addr)
+{
+ if (use_gdb_syscalls()) {
+ gdb_gettimeofday(cs, complete, tv_addr, tz_addr);
+ } else {
+ host_gettimeofday(cs, complete, tv_addr, tz_addr);
+ }
+}
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 33/43] gdbstub: Widen gdb_syscall_complete_cb return value
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (31 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 32/43] semihosting: Create semihost_sys_gettimeofday Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 34/43] target/m68k: Eliminate m68k_semi_is_fseek Richard Henderson
` (10 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
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/guestfd.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 a7d3bfd5d4..22b386ff65 100644
--- a/include/exec/gdbstub.h
+++ b/include/exec/gdbstub.h
@@ -53,8 +53,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 61e8dede8d..ad0df6eabf 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -216,7 +216,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
@@ -233,7 +233,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/guestfd.c b/semihosting/guestfd.c
index cb9eab9587..341113f939 100644
--- a/semihosting/guestfd.c
+++ b/semihosting/guestfd.c
@@ -179,7 +179,7 @@ static int validate_lock_user_string(char **pstr, CPUState *cs,
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
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 34/43] target/m68k: Eliminate m68k_semi_is_fseek
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (32 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 33/43] gdbstub: Widen gdb_syscall_complete_cb return value Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 35/43] target/m68k: Make semihosting system only Richard Henderson
` (9 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
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
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 35/43] target/m68k: Make semihosting system only
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (33 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 34/43] target/m68k: Eliminate m68k_semi_is_fseek Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 36/43] target/m68k: Use guestfd.h to implement syscalls Richard Henderson
` (8 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
While we had a call to do_m68k_semihosting in linux-user, it
wasn't actually reachable. We don't include DISAS_INSN(halt)
as an instruction unless system mode.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/m68k/cpu_loop.c | 5 -----
target/m68k/m68k-semi.c | 37 +------------------------------------
target/m68k/meson.build | 6 ++++--
3 files changed, 5 insertions(+), 43 deletions(-)
diff --git a/linux-user/m68k/cpu_loop.c b/linux-user/m68k/cpu_loop.c
index d1bf8548b7..fa6aa112cb 100644
--- a/linux-user/m68k/cpu_loop.c
+++ b/linux-user/m68k/cpu_loop.c
@@ -36,11 +36,6 @@ void cpu_loop(CPUM68KState *env)
process_queued_cpu_work(cs);
switch(trapnr) {
- case EXCP_HALT_INSN:
- /* Semihosing syscall. */
- env->pc += 4;
- do_m68k_semihosting(env, env->dregs[0]);
- break;
case EXCP_ILLEGAL:
case EXCP_LINEA:
case EXCP_LINEF:
diff --git a/target/m68k/m68k-semi.c b/target/m68k/m68k-semi.c
index 5b4c51957e..4b5621a101 100644
--- a/target/m68k/m68k-semi.c
+++ b/target/m68k/m68k-semi.c
@@ -21,13 +21,9 @@
#include "cpu.h"
#include "exec/gdbstub.h"
-#if defined(CONFIG_USER_ONLY)
-#include "qemu.h"
-#define SEMIHOSTING_HEAP_SIZE (128 * 1024 * 1024)
-#else
+#include "semihosting/guestfd.h"
#include "semihosting/softmmu-uaccess.h"
#include "hw/boards.h"
-#endif
#include "qemu/log.h"
#define HOSTED_EXIT 0
@@ -375,43 +371,12 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
}
break;
case HOSTED_INIT_SIM:
-#if defined(CONFIG_USER_ONLY)
- {
- CPUState *cs = env_cpu(env);
- TaskState *ts = cs->opaque;
- /* Allocate the heap using sbrk. */
- if (!ts->heap_limit) {
- abi_ulong ret;
- uint32_t size;
- uint32_t base;
-
- base = do_brk(0);
- size = SEMIHOSTING_HEAP_SIZE;
- /* Try a big heap, and reduce the size if that fails. */
- for (;;) {
- ret = do_brk(base + size);
- if (ret >= (base + size)) {
- break;
- }
- size >>= 1;
- }
- ts->heap_limit = base + size;
- }
- /*
- * This call may happen before we have writable memory, so return
- * values directly in registers.
- */
- env->dregs[1] = ts->heap_limit;
- env->aregs[7] = ts->stack_base;
- }
-#else
/*
* FIXME: This is wrong for boards where RAM does not start at
* address zero.
*/
env->dregs[1] = current_machine->ram_size;
env->aregs[7] = current_machine->ram_size;
-#endif
return;
default:
cpu_abort(env_cpu(env), "Unsupported semihosting syscall %d\n", nr);
diff --git a/target/m68k/meson.build b/target/m68k/meson.build
index 05cd9fbd1e..27d2d7ba87 100644
--- a/target/m68k/meson.build
+++ b/target/m68k/meson.build
@@ -4,14 +4,16 @@ m68k_ss.add(files(
'fpu_helper.c',
'gdbstub.c',
'helper.c',
- 'm68k-semi.c',
'op_helper.c',
'softfloat.c',
'translate.c',
))
m68k_softmmu_ss = ss.source_set()
-m68k_softmmu_ss.add(files('monitor.c'))
+m68k_softmmu_ss.add(files(
+ 'm68k-semi.c',
+ 'monitor.c'
+))
target_arch += {'m68k': m68k_ss}
target_softmmu_arch += {'m68k': m68k_softmmu_ss}
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 36/43] target/m68k: Use guestfd.h to implement syscalls.
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (34 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 35/43] target/m68k: Make semihosting system only Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 37/43] target/m68k: Do semihosting call as a normal helper Richard Henderson
` (7 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
This separates guest file descriptors from host file descriptors,
and utilizes shared infrastructure for integration with gdbstub.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/m68k/m68k-semi.c | 268 ++++++----------------------------------
1 file changed, 38 insertions(+), 230 deletions(-)
diff --git a/target/m68k/m68k-semi.c b/target/m68k/m68k-semi.c
index 4b5621a101..71f9d42e6c 100644
--- a/target/m68k/m68k-semi.c
+++ b/target/m68k/m68k-semi.c
@@ -41,54 +41,6 @@
#define HOSTED_ISATTY 12
#define HOSTED_SYSTEM 13
-static int translate_openflags(int flags)
-{
- int hf;
-
- if (flags & GDB_O_WRONLY)
- hf = O_WRONLY;
- else if (flags & GDB_O_RDWR)
- hf = O_RDWR;
- else
- hf = O_RDONLY;
-
- if (flags & GDB_O_APPEND) hf |= O_APPEND;
- if (flags & GDB_O_CREAT) hf |= O_CREAT;
- if (flags & GDB_O_TRUNC) hf |= O_TRUNC;
- if (flags & GDB_O_EXCL) hf |= O_EXCL;
-
- return hf;
-}
-
-static void translate_stat(CPUM68KState *env, target_ulong addr, struct stat *s)
-{
- struct gdb_stat *p;
-
- if (!(p = lock_user(VERIFY_WRITE, addr, sizeof(struct gdb_stat), 0)))
- /* FIXME - should this return an error code? */
- return;
- p->gdb_st_dev = cpu_to_be32(s->st_dev);
- p->gdb_st_ino = cpu_to_be32(s->st_ino);
- p->gdb_st_mode = cpu_to_be32(s->st_mode);
- p->gdb_st_nlink = cpu_to_be32(s->st_nlink);
- p->gdb_st_uid = cpu_to_be32(s->st_uid);
- p->gdb_st_gid = cpu_to_be32(s->st_gid);
- p->gdb_st_rdev = cpu_to_be32(s->st_rdev);
- p->gdb_st_size = cpu_to_be64(s->st_size);
-#ifdef _WIN32
- /* Windows stat is missing some fields. */
- p->gdb_st_blksize = 0;
- p->gdb_st_blocks = 0;
-#else
- p->gdb_st_blksize = cpu_to_be64(s->st_blksize);
- p->gdb_st_blocks = cpu_to_be64(s->st_blocks);
-#endif
- p->gdb_st_atime = cpu_to_be32(s->st_atime);
- p->gdb_st_mtime = cpu_to_be32(s->st_mtime);
- p->gdb_st_ctime = cpu_to_be32(s->st_ctime);
- unlock_user(p, addr, sizeof(struct gdb_stat));
-}
-
static void m68k_semi_u32_cb(CPUState *cs, uint64_t ret, int err)
{
M68kCPU *cpu = M68K_CPU(cs);
@@ -128,8 +80,6 @@ static void m68k_semi_u64_cb(CPUState *cs, uint64_t ret, int err)
*/
#define GET_ARG(n) do { \
if (get_user_ual(arg ## n, args + (n) * 4)) { \
- result = -1; \
- errno = EFAULT; \
goto failed; \
} \
} while (0)
@@ -139,237 +89,93 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
CPUState *cs = env_cpu(env);
uint32_t args;
target_ulong arg0, arg1, arg2, arg3;
- void *p;
- void *q;
- uint32_t len;
- uint32_t result;
args = env->dregs[1];
switch (nr) {
case HOSTED_EXIT:
gdb_exit(env->dregs[0]);
exit(env->dregs[0]);
+
case HOSTED_OPEN:
GET_ARG(0);
GET_ARG(1);
GET_ARG(2);
GET_ARG(3);
- if (use_gdb_syscalls()) {
- gdb_do_syscall(m68k_semi_u32_cb, "open,%s,%x,%x", arg0, (int)arg1,
- arg2, arg3);
- return;
- } else {
- p = lock_user_string(arg0);
- if (!p) {
- /* FIXME - check error code? */
- result = -1;
- } else {
- result = open(p, translate_openflags(arg2), arg3);
- unlock_user(p, arg0, 0);
- }
- }
+ semihost_sys_open(cs, m68k_semi_u32_cb, arg0, arg1, arg2, arg3);
break;
+
case HOSTED_CLOSE:
- {
- /* Ignore attempts to close stdin/out/err. */
- GET_ARG(0);
- int fd = arg0;
- if (fd > 2) {
- if (use_gdb_syscalls()) {
- gdb_do_syscall(m68k_semi_u32_cb, "close,%x", arg0);
- return;
- } else {
- result = close(fd);
- }
- } else {
- result = 0;
- }
- break;
- }
+ GET_ARG(0);
+ semihost_sys_close(cs, m68k_semi_u32_cb, arg0);
+ break;
+
case HOSTED_READ:
GET_ARG(0);
GET_ARG(1);
GET_ARG(2);
- len = arg2;
- if (use_gdb_syscalls()) {
- gdb_do_syscall(m68k_semi_u32_cb, "read,%x,%x,%x",
- arg0, arg1, len);
- return;
- } else {
- p = lock_user(VERIFY_WRITE, arg1, len, 0);
- if (!p) {
- /* FIXME - check error code? */
- result = -1;
- } else {
- result = read(arg0, p, len);
- unlock_user(p, arg1, len);
- }
- }
+ semihost_sys_read(cs, m68k_semi_u32_cb, arg0, arg1, arg2);
break;
+
case HOSTED_WRITE:
GET_ARG(0);
GET_ARG(1);
GET_ARG(2);
- len = arg2;
- if (use_gdb_syscalls()) {
- gdb_do_syscall(m68k_semi_u32_cb, "write,%x,%x,%x",
- arg0, arg1, len);
- return;
- } else {
- p = lock_user(VERIFY_READ, arg1, len, 1);
- if (!p) {
- /* FIXME - check error code? */
- result = -1;
- } else {
- result = write(arg0, p, len);
- unlock_user(p, arg0, 0);
- }
- }
+ semihost_sys_write(cs, m68k_semi_u32_cb, arg0, arg1, arg2);
break;
+
case HOSTED_LSEEK:
- {
- uint64_t off;
- GET_ARG(0);
- GET_ARG(1);
- GET_ARG(2);
- GET_ARG(3);
- off = (uint32_t)arg2 | ((uint64_t)arg1 << 32);
- if (use_gdb_syscalls()) {
- gdb_do_syscall(m68k_semi_u64_cb, "fseek,%x,%lx,%x",
- arg0, off, arg3);
- } else {
- off = lseek(arg0, off, arg3);
- m68k_semi_u64_cb(cs, off, errno);
- }
- return;
- }
+ GET_ARG(0);
+ GET_ARG(1);
+ GET_ARG(2);
+ GET_ARG(3);
+ semihost_sys_lseek(cs, m68k_semi_u64_cb, arg0,
+ deposit64(arg2, arg1, 32, 32), arg3);
+ break;
+
case HOSTED_RENAME:
GET_ARG(0);
GET_ARG(1);
GET_ARG(2);
GET_ARG(3);
- if (use_gdb_syscalls()) {
- gdb_do_syscall(m68k_semi_u32_cb, "rename,%s,%s",
- arg0, (int)arg1, arg2, (int)arg3);
- return;
- } else {
- p = lock_user_string(arg0);
- q = lock_user_string(arg2);
- if (!p || !q) {
- /* FIXME - check error code? */
- result = -1;
- } else {
- result = rename(p, q);
- }
- unlock_user(p, arg0, 0);
- unlock_user(q, arg2, 0);
- }
+ semihost_sys_rename(cs, m68k_semi_u32_cb, arg0, arg1, arg2, arg3);
break;
+
case HOSTED_UNLINK:
GET_ARG(0);
GET_ARG(1);
- if (use_gdb_syscalls()) {
- gdb_do_syscall(m68k_semi_u32_cb, "unlink,%s",
- arg0, (int)arg1);
- return;
- } else {
- p = lock_user_string(arg0);
- if (!p) {
- /* FIXME - check error code? */
- result = -1;
- } else {
- result = unlink(p);
- unlock_user(p, arg0, 0);
- }
- }
+ semihost_sys_remove(cs, m68k_semi_u32_cb, arg0, arg1);
break;
+
case HOSTED_STAT:
GET_ARG(0);
GET_ARG(1);
GET_ARG(2);
- if (use_gdb_syscalls()) {
- gdb_do_syscall(m68k_semi_u32_cb, "stat,%s,%x",
- arg0, (int)arg1, arg2);
- return;
- } else {
- struct stat s;
- p = lock_user_string(arg0);
- if (!p) {
- /* FIXME - check error code? */
- result = -1;
- } else {
- result = stat(p, &s);
- unlock_user(p, arg0, 0);
- }
- if (result == 0) {
- translate_stat(env, arg2, &s);
- }
- }
+ semihost_sys_stat(cs, m68k_semi_u32_cb, arg0, arg1, arg2);
break;
+
case HOSTED_FSTAT:
GET_ARG(0);
GET_ARG(1);
- if (use_gdb_syscalls()) {
- gdb_do_syscall(m68k_semi_u32_cb, "fstat,%x,%x",
- arg0, arg1);
- return;
- } else {
- struct stat s;
- result = fstat(arg0, &s);
- if (result == 0) {
- translate_stat(env, arg1, &s);
- }
- }
+ semihost_sys_fstat(cs, m68k_semi_u32_cb, arg0, arg1);
break;
+
case HOSTED_GETTIMEOFDAY:
GET_ARG(0);
GET_ARG(1);
- if (use_gdb_syscalls()) {
- gdb_do_syscall(m68k_semi_u32_cb, "gettimeofday,%x,%x",
- arg0, arg1);
- return;
- } else {
- struct gdb_timeval *p;
- int64_t rt = g_get_real_time();
- p = lock_user(VERIFY_WRITE, arg0, sizeof(struct gdb_timeval), 0);
- if (!p) {
- /* FIXME - check error code? */
- result = -1;
- } else {
- result = 0;
- p->tv_sec = cpu_to_be32(rt / G_USEC_PER_SEC);
- p->tv_usec = cpu_to_be64(rt % G_USEC_PER_SEC);
- unlock_user(p, arg0, sizeof(struct gdb_timeval));
- }
- }
+ semihost_sys_gettimeofday(cs, m68k_semi_u32_cb, arg0, arg1);
break;
+
case HOSTED_ISATTY:
GET_ARG(0);
- if (use_gdb_syscalls()) {
- gdb_do_syscall(m68k_semi_u32_cb, "isatty,%x", arg0);
- return;
- } else {
- result = isatty(arg0);
- }
+ semihost_sys_isatty(cs, m68k_semi_u32_cb, arg0);
break;
+
case HOSTED_SYSTEM:
GET_ARG(0);
GET_ARG(1);
- if (use_gdb_syscalls()) {
- gdb_do_syscall(m68k_semi_u32_cb, "system,%s",
- arg0, (int)arg1);
- return;
- } else {
- p = lock_user_string(arg0);
- if (!p) {
- /* FIXME - check error code? */
- result = -1;
- } else {
- result = system(p);
- unlock_user(p, arg0, 0);
- }
- }
+ semihost_sys_system(cs, m68k_semi_u32_cb, arg0, arg1);
break;
+
case HOSTED_INIT_SIM:
/*
* FIXME: This is wrong for boards where RAM does not start at
@@ -378,10 +184,12 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
env->dregs[1] = current_machine->ram_size;
env->aregs[7] = current_machine->ram_size;
return;
+
default:
cpu_abort(env_cpu(env), "Unsupported semihosting syscall %d\n", nr);
- result = 0;
+
+ failed:
+ m68k_semi_u32_cb(cs, -1, EFAULT);
+ break;
}
-failed:
- m68k_semi_u32_cb(cs, result, errno);
}
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 37/43] target/m68k: Do semihosting call as a normal helper
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (35 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 36/43] target/m68k: Use guestfd.h to implement syscalls Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 38/43] target/m68k: Enable semihosting for non-coldfire Richard Henderson
` (6 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
There's no need to raise an exception; just call the
helper function directly. The test for the required
surrounding insns is easier as well.
Move the load of nr inside the helper.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/m68k/cpu.h | 2 --
target/m68k/helper.h | 1 +
target/m68k/m68k-semi.c | 6 ++++--
target/m68k/op_helper.c | 10 ----------
target/m68k/translate.c | 26 +++++++++++++++++++++++++-
5 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h
index 9b3bf7a448..60f88e6bc9 100644
--- a/target/m68k/cpu.h
+++ b/target/m68k/cpu.h
@@ -456,8 +456,6 @@ typedef enum {
void m68k_set_irq_level(M68kCPU *cpu, int level, uint8_t vector);
void m68k_switch_sp(CPUM68KState *env);
-void do_m68k_semihosting(CPUM68KState *env, int nr);
-
/*
* The 68000 family is defined in six main CPU classes, the 680[012346]0.
* Generally each successive CPU adds enhanced data/stack/instructions.
diff --git a/target/m68k/helper.h b/target/m68k/helper.h
index 0a6b4146f6..0e27c27810 100644
--- a/target/m68k/helper.h
+++ b/target/m68k/helper.h
@@ -128,4 +128,5 @@ DEF_HELPER_4(chk2, void, env, s32, s32, s32)
DEF_HELPER_3(ptest, void, env, i32, i32)
DEF_HELPER_3(pflush, void, env, i32, i32)
DEF_HELPER_FLAGS_1(reset, TCG_CALL_NO_RWG, void, env)
+DEF_HELPER_1(semihosting, void, env)
#endif
diff --git a/target/m68k/m68k-semi.c b/target/m68k/m68k-semi.c
index 71f9d42e6c..1a36c1158d 100644
--- a/target/m68k/m68k-semi.c
+++ b/target/m68k/m68k-semi.c
@@ -25,6 +25,7 @@
#include "semihosting/softmmu-uaccess.h"
#include "hw/boards.h"
#include "qemu/log.h"
+#include "exec/helper-proto.h"
#define HOSTED_EXIT 0
#define HOSTED_INIT_SIM 1
@@ -84,12 +85,13 @@ static void m68k_semi_u64_cb(CPUState *cs, uint64_t ret, int err)
} \
} while (0)
-void do_m68k_semihosting(CPUM68KState *env, int nr)
+void HELPER(semihosting)(CPUM68KState *env)
{
CPUState *cs = env_cpu(env);
- uint32_t args;
+ uint32_t args, nr;
target_ulong arg0, arg1, arg2, arg3;
+ nr = env->dregs[0];
args = env->dregs[1];
switch (nr) {
case HOSTED_EXIT:
diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c
index 8decc61240..a345245612 100644
--- a/target/m68k/op_helper.c
+++ b/target/m68k/op_helper.c
@@ -22,7 +22,6 @@
#include "exec/helper-proto.h"
#include "exec/exec-all.h"
#include "exec/cpu_ldst.h"
-#include "semihosting/semihost.h"
#if !defined(CONFIG_USER_ONLY)
@@ -203,15 +202,6 @@ static void cf_interrupt_all(CPUM68KState *env, int is_hw)
cf_rte(env);
return;
case EXCP_HALT_INSN:
- if (semihosting_enabled()
- && (env->sr & SR_S) != 0
- && (env->pc & 3) == 0
- && cpu_lduw_code(env, env->pc - 4) == 0x4e71
- && cpu_ldl_code(env, env->pc) == 0x4e7bf000) {
- env->pc += 4;
- do_m68k_semihosting(env, env->dregs[0]);
- return;
- }
cs->halted = 1;
cs->exception_index = EXCP_HLT;
cpu_loop_exit(cs);
diff --git a/target/m68k/translate.c b/target/m68k/translate.c
index 4026572ed8..b7adc8f53d 100644
--- a/target/m68k/translate.c
+++ b/target/m68k/translate.c
@@ -33,6 +33,9 @@
#include "exec/log.h"
#include "fpu/softfloat.h"
+#ifndef CONFIG_USER_ONLY
+#include "semihosting/semihost.h"
+#endif
//#define DEBUG_DISPATCH 1
@@ -313,6 +316,25 @@ static inline void gen_addr_fault(DisasContext *s)
gen_exception(s, s->base.pc_next, EXCP_ADDRESS);
}
+#ifndef CONFIG_USER_ONLY
+static bool maybe_semihosting(DisasContext *s)
+{
+ /*
+ * The semihosting insn (halt or bkpt) is preceeded by an aligned NOP
+ * and followed by an invalid sentinel insn (movec %sp,0).
+ */
+ if (semihosting_enabled()
+ && (s->pc & 3) == 2
+ && cpu_lduw_code(s->env, s->pc - 2) == 0x4e71
+ && cpu_ldl_code(s->env, s->pc + 4) == 0x4e7bf000) {
+ gen_helper_semihosting(cpu_env);
+ s->pc += 4;
+ return true;
+ }
+ return false;
+}
+#endif
+
/*
* Generate a load from the specified address. Narrow values are
* sign extended to full register width.
@@ -4702,7 +4724,9 @@ DISAS_INSN(halt)
gen_exception(s, s->base.pc_next, EXCP_PRIVILEGE);
return;
}
-
+ if (maybe_semihosting(s)) {
+ return;
+ }
gen_exception(s, s->pc, EXCP_HALT_INSN);
}
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 38/43] target/m68k: Enable semihosting for non-coldfire
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (36 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 37/43] target/m68k: Do semihosting call as a normal helper Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 39/43] target/m68k: Remove EXCP_HALT_INSN Richard Henderson
` (5 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
The libgloss m68k-semi.txt spec says that bkpt #0 may be
used when the halt insn is not available. While halt is
available for 68060, continue to support bkpt #0 for all
m68k processors.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/m68k/translate.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/target/m68k/translate.c b/target/m68k/translate.c
index b7adc8f53d..51c546f26f 100644
--- a/target/m68k/translate.c
+++ b/target/m68k/translate.c
@@ -2775,6 +2775,15 @@ DISAS_INSN(swap)
DISAS_INSN(bkpt)
{
+#ifndef CONFIG_USER_ONLY
+ /* The non-ColdFire semihosting insn is bkpt #0. */
+ if (!m68k_feature(s->env, M68K_FEATURE_CF_ISA_A)
+ && !IS_USER(s)
+ && (insn & 7) == 0
+ && maybe_semihosting(s)) {
+ return;
+ }
+#endif
gen_exception(s, s->base.pc_next, EXCP_DEBUG);
}
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 39/43] target/m68k: Remove EXCP_HALT_INSN
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (37 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 38/43] target/m68k: Enable semihosting for non-coldfire Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 40/43] target/nios2: Eliminate nios2_semi_is_lseek Richard Henderson
` (4 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
Now that semihosting is not attached to EXCP_HALT_INSN,
we can use EXCP_HLT.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/m68k/cpu.h | 1 -
target/m68k/op_helper.c | 5 -----
target/m68k/translate.c | 3 ++-
3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h
index 60f88e6bc9..f10554318b 100644
--- a/target/m68k/cpu.h
+++ b/target/m68k/cpu.h
@@ -66,7 +66,6 @@
#define EXCP_MMU_ACCESS 58 /* MMU Access Level Violation Error */
#define EXCP_RTE 0x100
-#define EXCP_HALT_INSN 0x101
#define M68K_DTTR0 0
#define M68K_DTTR1 1
diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c
index a345245612..6218ac791b 100644
--- a/target/m68k/op_helper.c
+++ b/target/m68k/op_helper.c
@@ -201,11 +201,6 @@ static void cf_interrupt_all(CPUM68KState *env, int is_hw)
/* Return from an exception. */
cf_rte(env);
return;
- case EXCP_HALT_INSN:
- cs->halted = 1;
- cs->exception_index = EXCP_HLT;
- cpu_loop_exit(cs);
- return;
}
if (cs->exception_index >= EXCP_TRAP0
&& cs->exception_index <= EXCP_TRAP15) {
diff --git a/target/m68k/translate.c b/target/m68k/translate.c
index 51c546f26f..354a127e1a 100644
--- a/target/m68k/translate.c
+++ b/target/m68k/translate.c
@@ -4736,7 +4736,8 @@ DISAS_INSN(halt)
if (maybe_semihosting(s)) {
return;
}
- gen_exception(s, s->pc, EXCP_HALT_INSN);
+ tcg_gen_movi_i32(cpu_halted, 1);
+ gen_exception(s, s->pc, EXCP_HLT);
}
DISAS_INSN(stop)
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 40/43] target/nios2: Eliminate nios2_semi_is_lseek
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (38 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 39/43] target/m68k: Remove EXCP_HALT_INSN Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 41/43] target/nios2: Move nios2-semi.c to nios2_softmmu_ss Richard Henderson
` (3 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
Reorg nios2_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/nios2/nios2-semi.c | 59 +++++++++++++++------------------------
1 file changed, 23 insertions(+), 36 deletions(-)
diff --git a/target/nios2/nios2-semi.c b/target/nios2/nios2-semi.c
index 4d02789d26..bdf8849689 100644
--- a/target/nios2/nios2-semi.c
+++ b/target/nios2/nios2-semi.c
@@ -108,9 +108,12 @@ static bool translate_stat(CPUNios2State *env, target_ulong addr,
return true;
}
-static void nios2_semi_return_u32(CPUNios2State *env, uint32_t ret, int err)
+static void nios2_semi_u32_cb(CPUState *cs, uint64_t ret, int err)
{
+ Nios2CPU *cpu = NIOS2_CPU(cs);
+ CPUNios2State *env = &cpu->env;
target_ulong args = env->regs[R_ARG1];
+
if (put_user_u32(ret, args) ||
put_user_u32(err, args + 4)) {
/*
@@ -123,9 +126,12 @@ static void nios2_semi_return_u32(CPUNios2State *env, uint32_t ret, int err)
}
}
-static void nios2_semi_return_u64(CPUNios2State *env, uint64_t ret, int err)
+static void nios2_semi_u64_cb(CPUState *cs, uint64_t ret, int err)
{
+ Nios2CPU *cpu = NIOS2_CPU(cs);
+ CPUNios2State *env = &cpu->env;
target_ulong args = env->regs[R_ARG1];
+
if (put_user_u32(ret >> 32, args) ||
put_user_u32(ret, args + 4) ||
put_user_u32(err, args + 8)) {
@@ -135,25 +141,6 @@ static void nios2_semi_return_u64(CPUNios2State *env, uint64_t ret, int err)
}
}
-static int nios2_semi_is_lseek;
-
-static void nios2_semi_cb(CPUState *cs, uint64_t ret, int err)
-{
- Nios2CPU *cpu = NIOS2_CPU(cs);
- CPUNios2State *env = &cpu->env;
-
- if (nios2_semi_is_lseek) {
- /*
- * FIXME: We've already lost the high bits of the lseek
- * return value.
- */
- nios2_semi_return_u64(env, ret, err);
- nios2_semi_is_lseek = 0;
- } else {
- nios2_semi_return_u32(env, ret, err);
- }
-}
-
/*
* Read the input value from the argument block; fail the semihosting
* call if the memory read fails.
@@ -168,6 +155,7 @@ static void nios2_semi_cb(CPUState *cs, uint64_t ret, int err)
void do_nios2_semihosting(CPUNios2State *env)
{
+ CPUState *cs = env_cpu(env);
int nr;
uint32_t args;
target_ulong arg0, arg1, arg2, arg3;
@@ -188,7 +176,7 @@ void do_nios2_semihosting(CPUNios2State *env)
GET_ARG(2);
GET_ARG(3);
if (use_gdb_syscalls()) {
- gdb_do_syscall(nios2_semi_cb, "open,%s,%x,%x", arg0, (int)arg1,
+ gdb_do_syscall(nios2_semi_u32_cb, "open,%s,%x,%x", arg0, (int)arg1,
arg2, arg3);
return;
} else {
@@ -209,7 +197,7 @@ void do_nios2_semihosting(CPUNios2State *env)
int fd = arg0;
if (fd > 2) {
if (use_gdb_syscalls()) {
- gdb_do_syscall(nios2_semi_cb, "close,%x", arg0);
+ gdb_do_syscall(nios2_semi_u32_cb, "close,%x", arg0);
return;
} else {
result = close(fd);
@@ -225,7 +213,7 @@ void do_nios2_semihosting(CPUNios2State *env)
GET_ARG(2);
len = arg2;
if (use_gdb_syscalls()) {
- gdb_do_syscall(nios2_semi_cb, "read,%x,%x,%x",
+ gdb_do_syscall(nios2_semi_u32_cb, "read,%x,%x,%x",
arg0, arg1, len);
return;
} else {
@@ -245,7 +233,7 @@ void do_nios2_semihosting(CPUNios2State *env)
GET_ARG(2);
len = arg2;
if (use_gdb_syscalls()) {
- gdb_do_syscall(nios2_semi_cb, "write,%x,%x,%x",
+ gdb_do_syscall(nios2_semi_u32_cb, "write,%x,%x,%x",
arg0, arg1, len);
return;
} else {
@@ -268,12 +256,11 @@ void do_nios2_semihosting(CPUNios2State *env)
GET_ARG(3);
off = (uint32_t)arg2 | ((uint64_t)arg1 << 32);
if (use_gdb_syscalls()) {
- nios2_semi_is_lseek = 1;
- gdb_do_syscall(nios2_semi_cb, "lseek,%x,%lx,%x",
+ gdb_do_syscall(nios2_semi_u64_cb, "lseek,%x,%lx,%x",
arg0, off, arg3);
} else {
off = lseek(arg0, off, arg3);
- nios2_semi_return_u64(env, off, errno);
+ nios2_semi_u64_cb(cs, off, errno);
}
return;
}
@@ -283,7 +270,7 @@ void do_nios2_semihosting(CPUNios2State *env)
GET_ARG(2);
GET_ARG(3);
if (use_gdb_syscalls()) {
- gdb_do_syscall(nios2_semi_cb, "rename,%s,%s",
+ gdb_do_syscall(nios2_semi_u32_cb, "rename,%s,%s",
arg0, (int)arg1, arg2, (int)arg3);
return;
} else {
@@ -303,7 +290,7 @@ void do_nios2_semihosting(CPUNios2State *env)
GET_ARG(0);
GET_ARG(1);
if (use_gdb_syscalls()) {
- gdb_do_syscall(nios2_semi_cb, "unlink,%s",
+ gdb_do_syscall(nios2_semi_u32_cb, "unlink,%s",
arg0, (int)arg1);
return;
} else {
@@ -322,7 +309,7 @@ void do_nios2_semihosting(CPUNios2State *env)
GET_ARG(1);
GET_ARG(2);
if (use_gdb_syscalls()) {
- gdb_do_syscall(nios2_semi_cb, "stat,%s,%x",
+ gdb_do_syscall(nios2_semi_u32_cb, "stat,%s,%x",
arg0, (int)arg1, arg2);
return;
} else {
@@ -345,7 +332,7 @@ void do_nios2_semihosting(CPUNios2State *env)
GET_ARG(0);
GET_ARG(1);
if (use_gdb_syscalls()) {
- gdb_do_syscall(nios2_semi_cb, "fstat,%x,%x",
+ gdb_do_syscall(nios2_semi_u32_cb, "fstat,%x,%x",
arg0, arg1);
return;
} else {
@@ -361,7 +348,7 @@ void do_nios2_semihosting(CPUNios2State *env)
/* Only the tv parameter is used. tz is assumed NULL. */
GET_ARG(0);
if (use_gdb_syscalls()) {
- gdb_do_syscall(nios2_semi_cb, "gettimeofday,%x,%x",
+ gdb_do_syscall(nios2_semi_u32_cb, "gettimeofday,%x,%x",
arg0, 0);
return;
} else {
@@ -382,7 +369,7 @@ void do_nios2_semihosting(CPUNios2State *env)
case HOSTED_ISATTY:
GET_ARG(0);
if (use_gdb_syscalls()) {
- gdb_do_syscall(nios2_semi_cb, "isatty,%x", arg0);
+ gdb_do_syscall(nios2_semi_u32_cb, "isatty,%x", arg0);
return;
} else {
result = isatty(arg0);
@@ -392,7 +379,7 @@ void do_nios2_semihosting(CPUNios2State *env)
GET_ARG(0);
GET_ARG(1);
if (use_gdb_syscalls()) {
- gdb_do_syscall(nios2_semi_cb, "system,%s",
+ gdb_do_syscall(nios2_semi_u32_cb, "system,%s",
arg0, (int)arg1);
return;
} else {
@@ -412,5 +399,5 @@ void do_nios2_semihosting(CPUNios2State *env)
result = 0;
}
failed:
- nios2_semi_return_u32(env, result, errno);
+ nios2_semi_u32_cb(cs, result, errno);
}
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 41/43] target/nios2: Move nios2-semi.c to nios2_softmmu_ss
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (39 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 40/43] target/nios2: Eliminate nios2_semi_is_lseek Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 42/43] target/nios2: Use guestfd.h to implement syscalls Richard Henderson
` (2 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
Semihosting is not enabled for nios2-linux-user.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/nios2/meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/target/nios2/meson.build b/target/nios2/meson.build
index 2bd60ba306..c6e2243cc3 100644
--- a/target/nios2/meson.build
+++ b/target/nios2/meson.build
@@ -1,7 +1,6 @@
nios2_ss = ss.source_set()
nios2_ss.add(files(
'cpu.c',
- 'nios2-semi.c',
'op_helper.c',
'translate.c',
))
@@ -10,7 +9,8 @@ nios2_softmmu_ss = ss.source_set()
nios2_softmmu_ss.add(files(
'helper.c',
'monitor.c',
- 'mmu.c'
+ 'mmu.c',
+ 'nios2-semi.c',
))
target_arch += {'nios2': nios2_ss}
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 42/43] target/nios2: Use guestfd.h to implement syscalls.
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (40 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 41/43] target/nios2: Move nios2-semi.c to nios2_softmmu_ss Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-04-30 13:29 ` [PATCH 43/43] target/nios2: Do semihosting call as a normal helper Richard Henderson
2022-05-01 7:02 ` [PATCH 00/43] semihosting cleanup Richard Henderson
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
This separates guest file descriptors from host file descriptors,
and utilizes shared infrastructure for integration with gdbstub.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/nios2/nios2-semi.c | 287 ++++++--------------------------------
1 file changed, 41 insertions(+), 246 deletions(-)
diff --git a/target/nios2/nios2-semi.c b/target/nios2/nios2-semi.c
index bdf8849689..3dad72d1f6 100644
--- a/target/nios2/nios2-semi.c
+++ b/target/nios2/nios2-semi.c
@@ -25,6 +25,7 @@
#include "cpu.h"
#include "exec/gdbstub.h"
+#include "semihosting/guestfd.h"
#if defined(CONFIG_USER_ONLY)
#include "qemu.h"
#else
@@ -47,67 +48,6 @@
#define HOSTED_ISATTY 12
#define HOSTED_SYSTEM 13
-static int translate_openflags(int flags)
-{
- int hf;
-
- if (flags & GDB_O_WRONLY) {
- hf = O_WRONLY;
- } else if (flags & GDB_O_RDWR) {
- hf = O_RDWR;
- } else {
- hf = O_RDONLY;
- }
-
- if (flags & GDB_O_APPEND) {
- hf |= O_APPEND;
- }
- if (flags & GDB_O_CREAT) {
- hf |= O_CREAT;
- }
- if (flags & GDB_O_TRUNC) {
- hf |= O_TRUNC;
- }
- if (flags & GDB_O_EXCL) {
- hf |= O_EXCL;
- }
-
- return hf;
-}
-
-static bool translate_stat(CPUNios2State *env, target_ulong addr,
- struct stat *s)
-{
- struct gdb_stat *p;
-
- p = lock_user(VERIFY_WRITE, addr, sizeof(struct gdb_stat), 0);
-
- if (!p) {
- return false;
- }
- p->gdb_st_dev = cpu_to_be32(s->st_dev);
- p->gdb_st_ino = cpu_to_be32(s->st_ino);
- p->gdb_st_mode = cpu_to_be32(s->st_mode);
- p->gdb_st_nlink = cpu_to_be32(s->st_nlink);
- p->gdb_st_uid = cpu_to_be32(s->st_uid);
- p->gdb_st_gid = cpu_to_be32(s->st_gid);
- p->gdb_st_rdev = cpu_to_be32(s->st_rdev);
- p->gdb_st_size = cpu_to_be64(s->st_size);
-#ifdef _WIN32
- /* Windows stat is missing some fields. */
- p->gdb_st_blksize = 0;
- p->gdb_st_blocks = 0;
-#else
- p->gdb_st_blksize = cpu_to_be64(s->st_blksize);
- p->gdb_st_blocks = cpu_to_be64(s->st_blocks);
-#endif
- p->gdb_st_atime = cpu_to_be32(s->st_atime);
- p->gdb_st_mtime = cpu_to_be32(s->st_mtime);
- p->gdb_st_ctime = cpu_to_be32(s->st_ctime);
- unlock_user(p, addr, sizeof(struct gdb_stat));
- return true;
-}
-
static void nios2_semi_u32_cb(CPUState *cs, uint64_t ret, int err)
{
Nios2CPU *cpu = NIOS2_CPU(cs);
@@ -147,8 +87,6 @@ static void nios2_semi_u64_cb(CPUState *cs, uint64_t ret, int err)
*/
#define GET_ARG(n) do { \
if (get_user_ual(arg ## n, args + (n) * 4)) { \
- result = -1; \
- errno = EFAULT; \
goto failed; \
} \
} while (0)
@@ -159,10 +97,6 @@ void do_nios2_semihosting(CPUNios2State *env)
int nr;
uint32_t args;
target_ulong arg0, arg1, arg2, arg3;
- void *p;
- void *q;
- uint32_t len;
- uint32_t result;
nr = env->regs[R_ARG0];
args = env->regs[R_ARG1];
@@ -170,234 +104,95 @@ void do_nios2_semihosting(CPUNios2State *env)
case HOSTED_EXIT:
gdb_exit(env->regs[R_ARG0]);
exit(env->regs[R_ARG0]);
+
case HOSTED_OPEN:
GET_ARG(0);
GET_ARG(1);
GET_ARG(2);
GET_ARG(3);
- if (use_gdb_syscalls()) {
- gdb_do_syscall(nios2_semi_u32_cb, "open,%s,%x,%x", arg0, (int)arg1,
- arg2, arg3);
- return;
- } else {
- p = lock_user_string(arg0);
- if (!p) {
- result = -1;
- errno = EFAULT;
- } else {
- result = open(p, translate_openflags(arg2), arg3);
- unlock_user(p, arg0, 0);
- }
- }
+ semihost_sys_open(cs, nios2_semi_u32_cb, arg0, arg1, arg2, arg3);
break;
+
case HOSTED_CLOSE:
- {
- /* Ignore attempts to close stdin/out/err. */
- GET_ARG(0);
- int fd = arg0;
- if (fd > 2) {
- if (use_gdb_syscalls()) {
- gdb_do_syscall(nios2_semi_u32_cb, "close,%x", arg0);
- return;
- } else {
- result = close(fd);
- }
- } else {
- result = 0;
- }
- break;
- }
+ GET_ARG(0);
+ semihost_sys_close(cs, nios2_semi_u32_cb, arg0);
+ break;
+
case HOSTED_READ:
GET_ARG(0);
GET_ARG(1);
GET_ARG(2);
- len = arg2;
- if (use_gdb_syscalls()) {
- gdb_do_syscall(nios2_semi_u32_cb, "read,%x,%x,%x",
- arg0, arg1, len);
- return;
- } else {
- p = lock_user(VERIFY_WRITE, arg1, len, 0);
- if (!p) {
- result = -1;
- errno = EFAULT;
- } else {
- result = read(arg0, p, len);
- unlock_user(p, arg1, len);
- }
- }
+ semihost_sys_read(cs, nios2_semi_u32_cb, arg0, arg1, arg2);
break;
+
case HOSTED_WRITE:
GET_ARG(0);
GET_ARG(1);
GET_ARG(2);
- len = arg2;
- if (use_gdb_syscalls()) {
- gdb_do_syscall(nios2_semi_u32_cb, "write,%x,%x,%x",
- arg0, arg1, len);
- return;
- } else {
- p = lock_user(VERIFY_READ, arg1, len, 1);
- if (!p) {
- result = -1;
- errno = EFAULT;
- } else {
- result = write(arg0, p, len);
- unlock_user(p, arg0, 0);
- }
- }
+ semihost_sys_write(cs, nios2_semi_u32_cb, arg0, arg1, arg2);
break;
+
case HOSTED_LSEEK:
- {
- uint64_t off;
- GET_ARG(0);
- GET_ARG(1);
- GET_ARG(2);
- GET_ARG(3);
- off = (uint32_t)arg2 | ((uint64_t)arg1 << 32);
- if (use_gdb_syscalls()) {
- gdb_do_syscall(nios2_semi_u64_cb, "lseek,%x,%lx,%x",
- arg0, off, arg3);
- } else {
- off = lseek(arg0, off, arg3);
- nios2_semi_u64_cb(cs, off, errno);
- }
- return;
- }
+ GET_ARG(0);
+ GET_ARG(1);
+ GET_ARG(2);
+ GET_ARG(3);
+ semihost_sys_lseek(cs, nios2_semi_u64_cb, arg0,
+ deposit64(arg2, arg1, 32, 32), arg3);
+ break;
+
case HOSTED_RENAME:
GET_ARG(0);
GET_ARG(1);
GET_ARG(2);
GET_ARG(3);
- if (use_gdb_syscalls()) {
- gdb_do_syscall(nios2_semi_u32_cb, "rename,%s,%s",
- arg0, (int)arg1, arg2, (int)arg3);
- return;
- } else {
- p = lock_user_string(arg0);
- q = lock_user_string(arg2);
- if (!p || !q) {
- result = -1;
- errno = EFAULT;
- } else {
- result = rename(p, q);
- }
- unlock_user(p, arg0, 0);
- unlock_user(q, arg2, 0);
- }
+ semihost_sys_rename(cs, nios2_semi_u32_cb, arg0, arg1, arg2, arg3);
break;
+
case HOSTED_UNLINK:
GET_ARG(0);
GET_ARG(1);
- if (use_gdb_syscalls()) {
- gdb_do_syscall(nios2_semi_u32_cb, "unlink,%s",
- arg0, (int)arg1);
- return;
- } else {
- p = lock_user_string(arg0);
- if (!p) {
- result = -1;
- errno = EFAULT;
- } else {
- result = unlink(p);
- unlock_user(p, arg0, 0);
- }
- }
+ semihost_sys_remove(cs, nios2_semi_u32_cb, arg0, arg1);
break;
+
case HOSTED_STAT:
GET_ARG(0);
GET_ARG(1);
GET_ARG(2);
- if (use_gdb_syscalls()) {
- gdb_do_syscall(nios2_semi_u32_cb, "stat,%s,%x",
- arg0, (int)arg1, arg2);
- return;
- } else {
- struct stat s;
- p = lock_user_string(arg0);
- if (!p) {
- result = -1;
- errno = EFAULT;
- } else {
- result = stat(p, &s);
- unlock_user(p, arg0, 0);
- }
- if (result == 0 && !translate_stat(env, arg2, &s)) {
- result = -1;
- errno = EFAULT;
- }
- }
+ semihost_sys_stat(cs, nios2_semi_u32_cb, arg0, arg1, arg2);
break;
+
case HOSTED_FSTAT:
GET_ARG(0);
GET_ARG(1);
- if (use_gdb_syscalls()) {
- gdb_do_syscall(nios2_semi_u32_cb, "fstat,%x,%x",
- arg0, arg1);
- return;
- } else {
- struct stat s;
- result = fstat(arg0, &s);
- if (result == 0 && !translate_stat(env, arg1, &s)) {
- result = -1;
- errno = EFAULT;
- }
- }
+ semihost_sys_fstat(cs, nios2_semi_u32_cb, arg0, arg1);
break;
+
case HOSTED_GETTIMEOFDAY:
- /* Only the tv parameter is used. tz is assumed NULL. */
GET_ARG(0);
- if (use_gdb_syscalls()) {
- gdb_do_syscall(nios2_semi_u32_cb, "gettimeofday,%x,%x",
- arg0, 0);
- return;
- } else {
- struct gdb_timeval *p;
- int64_t rt = g_get_real_time();
- p = lock_user(VERIFY_WRITE, arg0, sizeof(struct gdb_timeval), 0);
- if (!p) {
- result = -1;
- errno = EFAULT;
- } else {
- result = 0;
- p->tv_sec = cpu_to_be32(rt / G_USEC_PER_SEC);
- p->tv_usec = cpu_to_be64(rt % G_USEC_PER_SEC);
- unlock_user(p, arg0, sizeof(struct gdb_timeval));
- }
- }
+ GET_ARG(1);
+ semihost_sys_gettimeofday(cs, nios2_semi_u32_cb, arg0, arg1);
break;
+
case HOSTED_ISATTY:
GET_ARG(0);
- if (use_gdb_syscalls()) {
- gdb_do_syscall(nios2_semi_u32_cb, "isatty,%x", arg0);
- return;
- } else {
- result = isatty(arg0);
- }
+ semihost_sys_isatty(cs, nios2_semi_u32_cb, arg0);
break;
+
case HOSTED_SYSTEM:
GET_ARG(0);
GET_ARG(1);
- if (use_gdb_syscalls()) {
- gdb_do_syscall(nios2_semi_u32_cb, "system,%s",
- arg0, (int)arg1);
- return;
- } else {
- p = lock_user_string(arg0);
- if (!p) {
- result = -1;
- errno = EFAULT;
- } else {
- result = system(p);
- unlock_user(p, arg0, 0);
- }
- }
+ semihost_sys_system(cs, nios2_semi_u32_cb, arg0, arg1);
break;
+
default:
qemu_log_mask(LOG_GUEST_ERROR, "nios2-semihosting: unsupported "
"semihosting syscall %d\n", nr);
- result = 0;
+ nios2_semi_u32_cb(cs, -1, ENOSYS);
+ break;
+
+ failed:
+ nios2_semi_u32_cb(cs, -1, EFAULT);
+ break;
}
-failed:
- nios2_semi_u32_cb(cs, result, errno);
}
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 43/43] target/nios2: Do semihosting call as a normal helper
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (41 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 42/43] target/nios2: Use guestfd.h to implement syscalls Richard Henderson
@ 2022-04-30 13:29 ` Richard Henderson
2022-05-01 7:02 ` [PATCH 00/43] semihosting cleanup Richard Henderson
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-04-30 13:29 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
There's no need to raise an exception; just call
the helper function directly.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/nios2/cpu.h | 3 ---
target/nios2/helper.h | 1 +
target/nios2/helper.c | 7 -------
target/nios2/nios2-semi.c | 3 ++-
target/nios2/translate.c | 2 +-
5 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/target/nios2/cpu.h b/target/nios2/cpu.h
index f85581ee56..75a111a25e 100644
--- a/target/nios2/cpu.h
+++ b/target/nios2/cpu.h
@@ -164,7 +164,6 @@ FIELD(CR_TLBMISC, EE, 24, 1)
/* Exceptions */
#define EXCP_BREAK 0x1000
-#define EXCP_SEMIHOST 0x1001
#define EXCP_RESET 0
#define EXCP_PRESET 1
#define EXCP_IRQ 2
@@ -269,8 +268,6 @@ G_NORETURN void nios2_cpu_do_unaligned_access(CPUState *cpu, vaddr addr,
G_NORETURN void nios2_cpu_loop_exit_advance(CPUNios2State *env,
uintptr_t retaddr);
-void do_nios2_semihosting(CPUNios2State *env);
-
#define CPU_RESOLVING_TYPE TYPE_NIOS2_CPU
#define cpu_gen_code cpu_nios2_gen_code
diff --git a/target/nios2/helper.h b/target/nios2/helper.h
index 1648d76ade..51ec2b35a0 100644
--- a/target/nios2/helper.h
+++ b/target/nios2/helper.h
@@ -29,4 +29,5 @@ DEF_HELPER_3(wrprs, void, env, i32, i32)
DEF_HELPER_2(mmu_write_tlbacc, void, env, i32)
DEF_HELPER_2(mmu_write_tlbmisc, void, env, i32)
DEF_HELPER_2(mmu_write_pteaddr, void, env, i32)
+DEF_HELPER_1(semihosting, void, env)
#endif
diff --git a/target/nios2/helper.c b/target/nios2/helper.c
index bb3b09e5a7..491cbd486f 100644
--- a/target/nios2/helper.c
+++ b/target/nios2/helper.c
@@ -173,9 +173,6 @@ void nios2_cpu_do_interrupt(CPUState *cs)
case EXCP_BREAK:
name = "BREAK insn";
break;
- case EXCP_SEMIHOST:
- name = "SEMIHOST insn";
- break;
}
if (name) {
qemu_log("%s at pc=0x%08x\n", name, env->pc);
@@ -250,10 +247,6 @@ void nios2_cpu_do_interrupt(CPUState *cs)
do_exception(cpu, cpu->exception_addr, 0, true);
break;
- case EXCP_SEMIHOST:
- do_nios2_semihosting(env);
- break;
-
default:
cpu_abort(cs, "unhandled exception type=%d\n", cs->exception_index);
}
diff --git a/target/nios2/nios2-semi.c b/target/nios2/nios2-semi.c
index 3dad72d1f6..9648030d37 100644
--- a/target/nios2/nios2-semi.c
+++ b/target/nios2/nios2-semi.c
@@ -32,6 +32,7 @@
#include "semihosting/softmmu-uaccess.h"
#endif
#include "qemu/log.h"
+#include "exec/helper-proto.h"
#define HOSTED_EXIT 0
#define HOSTED_INIT_SIM 1
@@ -91,7 +92,7 @@ static void nios2_semi_u64_cb(CPUState *cs, uint64_t ret, int err)
} \
} while (0)
-void do_nios2_semihosting(CPUNios2State *env)
+void HELPER(semihosting)(CPUNios2State *env)
{
CPUState *cs = env_cpu(env);
int nr;
diff --git a/target/nios2/translate.c b/target/nios2/translate.c
index 3a037a68cc..f245fd7d0a 100644
--- a/target/nios2/translate.c
+++ b/target/nios2/translate.c
@@ -819,7 +819,7 @@ static void gen_break(DisasContext *dc, uint32_t code, uint32_t flags)
/* The semihosting instruction is "break 1". */
R_TYPE(instr, code);
if (semihosting_enabled() && instr.imm5 == 1) {
- t_gen_helper_raise_exception(dc, EXCP_SEMIHOST);
+ gen_helper_semihosting(cpu_env);
return;
}
#endif
--
2.34.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* Re: [PATCH 00/43] semihosting cleanup
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
` (42 preceding siblings ...)
2022-04-30 13:29 ` [PATCH 43/43] target/nios2: Do semihosting call as a normal helper Richard Henderson
@ 2022-05-01 7:02 ` Richard Henderson
43 siblings, 0 replies; 45+ messages in thread
From: Richard Henderson @ 2022-05-01 7:02 UTC (permalink / raw)
To: qemu-devel; +Cc: crwulff, alex.bennee, f4bug, laurent
On 4/30/22 06:28, Richard Henderson wrote:
> target/m68k: Do semihosting call as a normal helper
> target/nios2: Do semihosting call as a normal helper
There's a reason not to do this: locking of the iothread mutex, and being back in the main
loop, where the vm will be stopped while we may wait for a reply from gdb.
r~
^ permalink raw reply [flat|nested] 45+ messages in thread
end of thread, other threads:[~2022-05-01 7:23 UTC | newest]
Thread overview: 45+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-30 13:28 [PATCH 00/43] semihosting cleanup Richard Henderson
2022-04-30 13:28 ` [PATCH 01/43] semihosting: Move exec/softmmu-semi.h to semihosting/softmmu-uaccess.h Richard Henderson
2022-04-30 13:28 ` [PATCH 02/43] semihosting: Return failure from softmmu-uaccess.h functions Richard Henderson
2022-04-30 13:28 ` [PATCH 03/43] semihosting: Improve condition for config.c and console.c Richard Henderson
2022-04-30 13:28 ` [PATCH 04/43] semihosting: Move softmmu-uaccess functions out of line Richard Henderson
2022-04-30 13:28 ` [PATCH 05/43] semihosting: Add target_strlen for softmmu-uaccess.h Richard Henderson
2022-04-30 13:28 ` [PATCH 06/43] semihosting: Simplify softmmu_lock_user_string Richard Henderson
2022-04-30 13:28 ` [PATCH 07/43] semihosting: Split out guestfd.c Richard Henderson
2022-04-30 13:28 ` [PATCH 08/43] semihosting: Generalize GuestFDFeatureFile Richard Henderson
2022-04-30 13:28 ` [PATCH 09/43] semihosting: Return void from do_common_semihosting Richard Henderson
2022-04-30 13:28 ` [PATCH 10/43] semihosting: Adjust error checking in common_semi_cb Richard Henderson
2022-04-30 13:29 ` [PATCH 11/43] semihosting: Move common-semi.h to include/semihosting/ Richard Henderson
2022-04-30 13:29 ` [PATCH 12/43] include/exec: Move gdb open flags to gdbstub.h Richard Henderson
2022-04-30 13:29 ` [PATCH 13/43] include/exec: Move gdb_stat and gdb_timeval " Richard Henderson
2022-04-30 13:29 ` [PATCH 14/43] semihosting: Use struct gdb_stat in common_semi_flen_cb Richard Henderson
2022-04-30 13:29 ` [PATCH 15/43] semihosting: Split is_64bit_semihosting per target Richard Henderson
2022-04-30 13:29 ` [PATCH 16/43] semihosting: Split common_semi_flen_buf " Richard Henderson
2022-04-30 13:29 ` [PATCH 17/43] semihosting: Split out common_semi_has_synccache Richard Henderson
2022-04-30 13:29 ` [PATCH 18/43] semihosting: Use env more often in do_common_semihosting Richard Henderson
2022-04-30 13:29 ` [PATCH 19/43] semihosting: Move GET_ARG/SET_ARG earlier in the file Richard Henderson
2022-04-30 13:29 ` [PATCH 20/43] semihosting: Split out semihost_sys_open Richard Henderson
2022-04-30 13:29 ` [PATCH 21/43] semihosting: Split out semihost_sys_close Richard Henderson
2022-04-30 13:29 ` [PATCH 22/43] semihosting: Split out semihost_sys_read Richard Henderson
2022-04-30 13:29 ` [PATCH 23/43] semihosting: Split out semihost_sys_write Richard Henderson
2022-04-30 13:29 ` [PATCH 24/43] semihosting: Bound length for semihost_sys_{read, write} Richard Henderson
2022-04-30 13:29 ` [PATCH 25/43] semihosting: Split out semihost_sys_lseek Richard Henderson
2022-04-30 13:29 ` [PATCH 26/43] semihosting: Split out semihost_sys_isatty Richard Henderson
2022-04-30 13:29 ` [PATCH 27/43] semihosting: Split out semihost_sys_flen Richard Henderson
2022-04-30 13:29 ` [PATCH 28/43] semihosting: Split out semihost_sys_remove Richard Henderson
2022-04-30 13:29 ` [PATCH 29/43] semihosting: Split out semihost_sys_rename Richard Henderson
2022-04-30 13:29 ` [PATCH 30/43] semihosting: Split out semihost_sys_system Richard Henderson
2022-04-30 13:29 ` [PATCH 31/43] semihosting: Create semihost_sys_{stat,fstat} Richard Henderson
2022-04-30 13:29 ` [PATCH 32/43] semihosting: Create semihost_sys_gettimeofday Richard Henderson
2022-04-30 13:29 ` [PATCH 33/43] gdbstub: Widen gdb_syscall_complete_cb return value Richard Henderson
2022-04-30 13:29 ` [PATCH 34/43] target/m68k: Eliminate m68k_semi_is_fseek Richard Henderson
2022-04-30 13:29 ` [PATCH 35/43] target/m68k: Make semihosting system only Richard Henderson
2022-04-30 13:29 ` [PATCH 36/43] target/m68k: Use guestfd.h to implement syscalls Richard Henderson
2022-04-30 13:29 ` [PATCH 37/43] target/m68k: Do semihosting call as a normal helper Richard Henderson
2022-04-30 13:29 ` [PATCH 38/43] target/m68k: Enable semihosting for non-coldfire Richard Henderson
2022-04-30 13:29 ` [PATCH 39/43] target/m68k: Remove EXCP_HALT_INSN Richard Henderson
2022-04-30 13:29 ` [PATCH 40/43] target/nios2: Eliminate nios2_semi_is_lseek Richard Henderson
2022-04-30 13:29 ` [PATCH 41/43] target/nios2: Move nios2-semi.c to nios2_softmmu_ss Richard Henderson
2022-04-30 13:29 ` [PATCH 42/43] target/nios2: Use guestfd.h to implement syscalls Richard Henderson
2022-04-30 13:29 ` [PATCH 43/43] target/nios2: Do semihosting call as a normal helper Richard Henderson
2022-05-01 7:02 ` [PATCH 00/43] semihosting cleanup Richard Henderson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.