* [PATCH v3 01/49] semihosting: Move exec/softmmu-semi.h to semihosting/softmmu-uaccess.h
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 02/49] semihosting: Return failure from softmmu-uaccess.h functions Richard Henderson
` (47 subsequent siblings)
48 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
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.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
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] 83+ messages in thread* [PATCH v3 02/49] semihosting: Return failure from softmmu-uaccess.h functions
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
2022-05-21 0:03 ` [PATCH v3 01/49] semihosting: Move exec/softmmu-semi.h to semihosting/softmmu-uaccess.h Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 03/49] semihosting: Improve condition for config.c and console.c Richard Henderson
` (46 subsequent siblings)
48 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
We were reporting unconditional success for these functions;
pass on any failure from cpu_memory_rw_debug.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
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] 83+ messages in thread* [PATCH v3 03/49] semihosting: Improve condition for config.c and console.c
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
2022-05-21 0:03 ` [PATCH v3 01/49] semihosting: Move exec/softmmu-semi.h to semihosting/softmmu-uaccess.h Richard Henderson
2022-05-21 0:03 ` [PATCH v3 02/49] semihosting: Return failure from softmmu-uaccess.h functions Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 04/49] semihosting: Move softmmu-uaccess.h functions out of line Richard Henderson
` (45 subsequent siblings)
48 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
While CONFIG_SEMIHOSTING is currently only set for softmmu,
this will not continue to be true.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
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] 83+ messages in thread* [PATCH v3 04/49] semihosting: Move softmmu-uaccess.h functions out of line
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (2 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 03/49] semihosting: Improve condition for config.c and console.c Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 05/49] semihosting: Add target_strlen for softmmu-uaccess.h Richard Henderson
` (44 subsequent siblings)
48 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
Rather that static (and not even inline) functions within a
header, move the functions to semihosting/uaccess.c.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
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] 83+ messages in thread* [PATCH v3 05/49] semihosting: Add target_strlen for softmmu-uaccess.h
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (3 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 04/49] semihosting: Move softmmu-uaccess.h functions out of line Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-21 4:51 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 06/49] semihosting: Simplify softmmu_lock_user_string Richard Henderson
` (43 subsequent siblings)
48 siblings, 1 reply; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
Mirror the interface of the user-only function of the same name.
Use probe_access_flags for the common case of ram, and
cpu_memory_rw_debug for the uncommon case of mmio.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
v3: Use probe_access_flags (pmm)
---
include/semihosting/softmmu-uaccess.h | 3 ++
semihosting/uaccess.c | 49 +++++++++++++++++++++++++++
2 files changed, 52 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..51019b79ff 100644
--- a/semihosting/uaccess.c
+++ b/semihosting/uaccess.c
@@ -8,6 +8,7 @@
*/
#include "qemu/osdep.h"
+#include "exec/exec-all.h"
#include "semihosting/softmmu-uaccess.h"
void *softmmu_lock_user(CPUArchState *env, target_ulong addr,
@@ -23,6 +24,54 @@ void *softmmu_lock_user(CPUArchState *env, target_ulong addr,
return p;
}
+ssize_t softmmu_strlen_user(CPUArchState *env, target_ulong addr)
+{
+ int mmu_idx = cpu_mmu_index(env, false);
+ size_t len = 0;
+
+ while (1) {
+ size_t left_in_page;
+ int flags;
+ void *h;
+
+ /* Find the number of bytes remaining in the page. */
+ left_in_page = -(addr | TARGET_PAGE_MASK);
+
+ flags = probe_access_flags(env, addr, MMU_DATA_LOAD,
+ mmu_idx, true, &h, 0);
+ if (flags & TLB_INVALID_MASK) {
+ return -1;
+ }
+ if (flags & TLB_MMIO) {
+ do {
+ uint8_t c;
+ if (cpu_memory_rw_debug(env_cpu(env), addr, &c, 1, 0)) {
+ return -1;
+ }
+ if (c == 0) {
+ return len;
+ }
+ addr++;
+ len++;
+ if (len > INT32_MAX) {
+ return -1;
+ }
+ } while (--left_in_page != 0);
+ } else {
+ char *p = memchr(h, 0, left_in_page);
+ if (p) {
+ len += p - (char *)h;
+ return len <= INT32_MAX ? (ssize_t)len : -1;
+ }
+ addr += left_in_page;
+ len += left_in_page;
+ 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] 83+ messages in thread* Re: [PATCH v3 05/49] semihosting: Add target_strlen for softmmu-uaccess.h
2022-05-21 0:03 ` [PATCH v3 05/49] semihosting: Add target_strlen for softmmu-uaccess.h Richard Henderson
@ 2022-05-21 4:51 ` Richard Henderson
2022-05-23 10:55 ` Peter Maydell
0 siblings, 1 reply; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 4:51 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee, Philippe Mathieu-Daudé
On 5/20/22 17:03, Richard Henderson wrote:
> Mirror the interface of the user-only function of the same name.
> Use probe_access_flags for the common case of ram, and
> cpu_memory_rw_debug for the uncommon case of mmio.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> v3: Use probe_access_flags (pmm)
Ho hum. MIPS still selects semihosting without TCG, which means that
probe_access_flags is not present.
At present I'm assuming that semihosting can't work with KVM, and that we should disable
the feature.
r~
> ---
> include/semihosting/softmmu-uaccess.h | 3 ++
> semihosting/uaccess.c | 49 +++++++++++++++++++++++++++
> 2 files changed, 52 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..51019b79ff 100644
> --- a/semihosting/uaccess.c
> +++ b/semihosting/uaccess.c
> @@ -8,6 +8,7 @@
> */
>
> #include "qemu/osdep.h"
> +#include "exec/exec-all.h"
> #include "semihosting/softmmu-uaccess.h"
>
> void *softmmu_lock_user(CPUArchState *env, target_ulong addr,
> @@ -23,6 +24,54 @@ void *softmmu_lock_user(CPUArchState *env, target_ulong addr,
> return p;
> }
>
> +ssize_t softmmu_strlen_user(CPUArchState *env, target_ulong addr)
> +{
> + int mmu_idx = cpu_mmu_index(env, false);
> + size_t len = 0;
> +
> + while (1) {
> + size_t left_in_page;
> + int flags;
> + void *h;
> +
> + /* Find the number of bytes remaining in the page. */
> + left_in_page = -(addr | TARGET_PAGE_MASK);
> +
> + flags = probe_access_flags(env, addr, MMU_DATA_LOAD,
> + mmu_idx, true, &h, 0);
> + if (flags & TLB_INVALID_MASK) {
> + return -1;
> + }
> + if (flags & TLB_MMIO) {
> + do {
> + uint8_t c;
> + if (cpu_memory_rw_debug(env_cpu(env), addr, &c, 1, 0)) {
> + return -1;
> + }
> + if (c == 0) {
> + return len;
> + }
> + addr++;
> + len++;
> + if (len > INT32_MAX) {
> + return -1;
> + }
> + } while (--left_in_page != 0);
> + } else {
> + char *p = memchr(h, 0, left_in_page);
> + if (p) {
> + len += p - (char *)h;
> + return len <= INT32_MAX ? (ssize_t)len : -1;
> + }
> + addr += left_in_page;
> + len += left_in_page;
> + 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. */
^ permalink raw reply [flat|nested] 83+ messages in thread* Re: [PATCH v3 05/49] semihosting: Add target_strlen for softmmu-uaccess.h
2022-05-21 4:51 ` Richard Henderson
@ 2022-05-23 10:55 ` Peter Maydell
0 siblings, 0 replies; 83+ messages in thread
From: Peter Maydell @ 2022-05-23 10:55 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, alex.bennee, Philippe Mathieu-Daudé
On Sat, 21 May 2022 at 05:51, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> On 5/20/22 17:03, Richard Henderson wrote:
> > Mirror the interface of the user-only function of the same name.
> > Use probe_access_flags for the common case of ram, and
> > cpu_memory_rw_debug for the uncommon case of mmio.
> >
> > Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> > ---
> > v3: Use probe_access_flags (pmm)
>
> Ho hum. MIPS still selects semihosting without TCG, which means that
> probe_access_flags is not present.
>
> At present I'm assuming that semihosting can't work with KVM, and that we should disable
> the feature.
>
>
> r~
>
> > ---
> > include/semihosting/softmmu-uaccess.h | 3 ++
> > semihosting/uaccess.c | 49 +++++++++++++++++++++++++++
> > 2 files changed, 52 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..51019b79ff 100644
> > --- a/semihosting/uaccess.c
> > +++ b/semihosting/uaccess.c
> > @@ -8,6 +8,7 @@
> > */
> >
> > #include "qemu/osdep.h"
> > +#include "exec/exec-all.h"
> > #include "semihosting/softmmu-uaccess.h"
> >
> > void *softmmu_lock_user(CPUArchState *env, target_ulong addr,
> > @@ -23,6 +24,54 @@ void *softmmu_lock_user(CPUArchState *env, target_ulong addr,
> > return p;
> > }
> >
> > +ssize_t softmmu_strlen_user(CPUArchState *env, target_ulong addr)
> > +{
> > + int mmu_idx = cpu_mmu_index(env, false);
> > + size_t len = 0;
> > +
> > + while (1) {
> > + size_t left_in_page;
> > + int flags;
> > + void *h;
> > +
> > + /* Find the number of bytes remaining in the page. */
> > + left_in_page = -(addr | TARGET_PAGE_MASK);
This works but I'm never really a fan of expressions that mix
arithmetic and logical operations -- I always have to start writing
out bit patterns and checking what 2s-complement representation
involves in order to find out what they really do.
left_in_page = TARGET_PAGE_SIZE - (addr & ~TARGET_PAGE_MASK);
seems to me like it would be clearer.
You're correct that MIPS shouldn't be selecting semihosting in
a KVM-only compile -- there's no code to handle getting from the
guest executing the sdbbp insn to QEMU userspace to the code in
QEMU to deal with a semihosting call.
So for this patch:
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
-- PMM
^ permalink raw reply [flat|nested] 83+ messages in thread
* [PATCH v3 06/49] semihosting: Simplify softmmu_lock_user_string
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (4 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 05/49] semihosting: Add target_strlen for softmmu-uaccess.h Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 07/49] semihosting: Split out guestfd.c Richard Henderson
` (42 subsequent siblings)
48 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
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.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
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 51019b79ff..9894f40feb 100644
--- a/semihosting/uaccess.c
+++ b/semihosting/uaccess.c
@@ -74,20 +74,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] 83+ messages in thread* [PATCH v3 07/49] semihosting: Split out guestfd.c
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (5 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 06/49] semihosting: Simplify softmmu_lock_user_string Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 08/49] semihosting: Inline set_swi_errno into common_semi_cb Richard Henderson
` (41 subsequent siblings)
48 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
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.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
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 | 83 +++++++++++
semihosting/arm-compat-semi.c | 164 +++-------------------
semihosting/guestfd.c | 118 ++++++++++++++++
semihosting/meson.build | 4 +
10 files changed, 233 insertions(+), 142 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..ef268abe85
--- /dev/null
+++ b/include/semihosting/guestfd.h
@@ -0,0 +1,83 @@
+/*
+ * 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,
+ GuestFDStatic = 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;
+ struct {
+ const uint8_t *data;
+ size_t len;
+ size_t off;
+ } staticfile;
+ };
+} GuestFD;
+
+/**
+ * alloc_guestfd:
+ *
+ * Allocate an unused GuestFD index. The associated guestfd index
+ * will still be GuestFDUnused until it is initialized.
+ */
+int alloc_guestfd(void);
+
+/**
+ * dealloc_guestfd:
+ * @guestfd: GuestFD index
+ *
+ * Deallocate a GuestFD index. The associated GuestFD structure
+ * will be recycled for a subsequent allocation.
+ */
+void dealloc_guestfd(int guestfd);
+
+/**
+ * get_guestfd:
+ * @guestfd: GuestFD index
+ *
+ * Return the GuestFD structure associated with an initialized @guestfd,
+ * or NULL if it has not been allocated, or hasn't been initialized.
+ */
+GuestFD *get_guestfd(int guestfd);
+
+/**
+ * associate_guestfd:
+ * @guestfd: GuestFD index
+ * @hostfd: host file descriptor
+ *
+ * Initialize the GuestFD for @guestfd to GuestFDHost using @hostfd.
+ */
+void associate_guestfd(int guestfd, int hostfd);
+
+/**
+ * staticfile_guestfd:
+ * @guestfd: GuestFD index
+ * @data: data to be read
+ * @len: length of @data
+ *
+ * Initialize the GuestFD for @guestfd to GuestFDStatic.
+ * The @len bytes at @data will be returned to the guest on reads.
+ */
+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 dbef280b87..c6bfd4d1ba 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,22 +553,13 @@ 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)
+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 */
@@ -689,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;
@@ -703,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);
@@ -716,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 {
@@ -759,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,
},
};
@@ -886,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
new file mode 100644
index 0000000000..b6405f5663
--- /dev/null
+++ b/semihosting/guestfd.c
@@ -0,0 +1,118 @@
+/*
+ * 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 staticfile_guestfd(int guestfd, const uint8_t *data, size_t len)
+{
+ GuestFD *gf = do_get_guestfd(guestfd);
+
+ assert(gf);
+ gf->type = GuestFDStatic;
+ gf->staticfile.data = data;
+ gf->staticfile.len = len;
+ gf->staticfile.off = 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] 83+ messages in thread* [PATCH v3 08/49] semihosting: Inline set_swi_errno into common_semi_cb
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (6 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 07/49] semihosting: Split out guestfd.c Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-23 10:58 ` Peter Maydell
2022-05-21 0:03 ` [PATCH v3 09/49] semihosting: Adjust error checking in common_semi_cb Richard Henderson
` (40 subsequent siblings)
48 siblings, 1 reply; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
Do not store 'err' into errno only to read it back immediately.
Use 'ret' for the return value, not 'reg0'.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
semihosting/arm-compat-semi.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index c6bfd4d1ba..b00ed2c6d1 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -290,28 +290,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)
--
2.34.1
^ permalink raw reply related [flat|nested] 83+ messages in thread* Re: [PATCH v3 08/49] semihosting: Inline set_swi_errno into common_semi_cb
2022-05-21 0:03 ` [PATCH v3 08/49] semihosting: Inline set_swi_errno into common_semi_cb Richard Henderson
@ 2022-05-23 10:58 ` Peter Maydell
2022-05-23 14:58 ` Richard Henderson
0 siblings, 1 reply; 83+ messages in thread
From: Peter Maydell @ 2022-05-23 10:58 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, alex.bennee
On Sat, 21 May 2022 at 01:04, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> Do not store 'err' into errno only to read it back immediately.
> Use 'ret' for the return value, not 'reg0'.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> semihosting/arm-compat-semi.c | 19 ++++++++++---------
> 1 file changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
> index c6bfd4d1ba..b00ed2c6d1 100644
> --- a/semihosting/arm-compat-semi.c
> +++ b/semihosting/arm-compat-semi.c
> @@ -290,28 +290,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);
This should be "ret = ", right? (Otherwise I think this fails to
compile. I assume that some later patch has this fix in it.)
Otherwise
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
thanks
-- PMM
^ permalink raw reply [flat|nested] 83+ messages in thread* Re: [PATCH v3 08/49] semihosting: Inline set_swi_errno into common_semi_cb
2022-05-23 10:58 ` Peter Maydell
@ 2022-05-23 14:58 ` Richard Henderson
2022-05-23 16:58 ` Peter Maydell
0 siblings, 1 reply; 83+ messages in thread
From: Richard Henderson @ 2022-05-23 14:58 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, alex.bennee
On 5/23/22 03:58, Peter Maydell wrote:
> On Sat, 21 May 2022 at 01:04, Richard Henderson
> <richard.henderson@linaro.org> wrote:
>>
>> Do not store 'err' into errno only to read it back immediately.
>> Use 'ret' for the return value, not 'reg0'.
>>
>> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
>> ---
>> semihosting/arm-compat-semi.c | 19 ++++++++++---------
>> 1 file changed, 10 insertions(+), 9 deletions(-)
>>
>> diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
>> index c6bfd4d1ba..b00ed2c6d1 100644
>> --- a/semihosting/arm-compat-semi.c
>> +++ b/semihosting/arm-compat-semi.c
>> @@ -290,28 +290,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);
>
> This should be "ret = ", right? (Otherwise I think this fails to
> compile. I assume that some later patch has this fix in it.)
Eh? No, we're extracting argument reg 0, and then switching on it.
Why would it not compile -- I've moved the whole declaration down.
r~
>
> Otherwise
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
>
> thanks
> -- PMM
^ permalink raw reply [flat|nested] 83+ messages in thread* Re: [PATCH v3 08/49] semihosting: Inline set_swi_errno into common_semi_cb
2022-05-23 14:58 ` Richard Henderson
@ 2022-05-23 16:58 ` Peter Maydell
0 siblings, 0 replies; 83+ messages in thread
From: Peter Maydell @ 2022-05-23 16:58 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, alex.bennee
On Mon, 23 May 2022 at 15:58, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> On 5/23/22 03:58, Peter Maydell wrote:
> > On Sat, 21 May 2022 at 01:04, Richard Henderson
> > <richard.henderson@linaro.org> wrote:
> >>
> >> Do not store 'err' into errno only to read it back immediately.
> >> Use 'ret' for the return value, not 'reg0'.
> >>
> >> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> >> ---
> >> semihosting/arm-compat-semi.c | 19 ++++++++++---------
> >> 1 file changed, 10 insertions(+), 9 deletions(-)
> >>
> >> diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
> >> index c6bfd4d1ba..b00ed2c6d1 100644
> >> --- a/semihosting/arm-compat-semi.c
> >> +++ b/semihosting/arm-compat-semi.c
> >> @@ -290,28 +290,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);
> >
> > This should be "ret = ", right? (Otherwise I think this fails to
> > compile. I assume that some later patch has this fix in it.)
>
> Eh? No, we're extracting argument reg 0, and then switching on it.
> Why would it not compile -- I've moved the whole declaration down.
Yes, you're right -- I misread the diff as doing a rename of
'reg0' to 'ret', but these are different variables and both
present both before and after the change.
-- PMM
^ permalink raw reply [flat|nested] 83+ messages in thread
* [PATCH v3 09/49] semihosting: Adjust error checking in common_semi_cb
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (7 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 08/49] semihosting: Inline set_swi_errno into common_semi_cb Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-23 12:13 ` Peter Maydell
2022-05-21 0:03 ` [PATCH v3 10/49] semihosting: Clean up common_semi_flen_cb Richard Henderson
` (39 subsequent siblings)
48 siblings, 1 reply; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
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 b00ed2c6d1..88e1c286ba 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -290,7 +290,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] 83+ messages in thread* Re: [PATCH v3 09/49] semihosting: Adjust error checking in common_semi_cb
2022-05-21 0:03 ` [PATCH v3 09/49] semihosting: Adjust error checking in common_semi_cb Richard Henderson
@ 2022-05-23 12:13 ` Peter Maydell
2022-05-23 15:35 ` Richard Henderson
0 siblings, 1 reply; 83+ messages in thread
From: Peter Maydell @ 2022-05-23 12:13 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, alex.bennee
On Sat, 21 May 2022 at 01:04, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> 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.
The gdb protocol isn't 100% clear on this, but what it says is:
https://sourceware.org/gdb/onlinedocs/gdb/The-F-Reply-Packet.html#The-F-Reply-Packet
# retcode is the return code of the system call as hexadecimal value.
# errno is the errno set by the call, in protocol-specific representation.
# This parameter can be omitted if the call was successful.
(and from the implementation in gdb it is basically just returning
the return value from a syscall plus errno).
That implies that our current code is right, in that the
way to check for "did the call fail" is to look at the
retcode, not the errno (in the same way that if you make a
native syscall or library call you look first at its return
value, not at errno). There's nothing in the protocol text
that makes a guarantee that the errno value is non-0 if and
only if the call failed.
(I think gdb's implementation happens to only set errno to
non-0 on failures, and lldb doesn't implement the file-io
extension at all as far as I can see, so there might be scope
for getting the protocol definition tightened up I guess.)
> This fixes the errno setting of SYS_ISTTY, which returns 0 on
> error, not -1.
The gdb implementation of the isatty call returns 0 or 1 on
success, and -1 on failure (though the only failure mode it has
is "you messed up the protocol packet format"):
https://sourceware.org/git/?p=binutils-gdb.git;a=blob;f=gdb/remote-fileio.c;h=fe191fb6069a53a3844656a81e77069afa781946;hb=HEAD#l1039
thanks
-- PMM
^ permalink raw reply [flat|nested] 83+ messages in thread
* Re: [PATCH v3 09/49] semihosting: Adjust error checking in common_semi_cb
2022-05-23 12:13 ` Peter Maydell
@ 2022-05-23 15:35 ` Richard Henderson
2022-05-23 15:44 ` Peter Maydell
2022-06-07 17:41 ` Richard Henderson
0 siblings, 2 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-23 15:35 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, alex.bennee
On 5/23/22 05:13, Peter Maydell wrote:
> On Sat, 21 May 2022 at 01:04, Richard Henderson
> <richard.henderson@linaro.org> wrote:
>>
>> 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.
>
> The gdb protocol isn't 100% clear on this, but what it says is:
> https://sourceware.org/gdb/onlinedocs/gdb/The-F-Reply-Packet.html#The-F-Reply-Packet
>
> # retcode is the return code of the system call as hexadecimal value.
> # errno is the errno set by the call, in protocol-specific representation.
> # This parameter can be omitted if the call was successful.
>
> (and from the implementation in gdb it is basically just returning
> the return value from a syscall plus errno).
>
> That implies that our current code is right, in that the
> way to check for "did the call fail" is to look at the
> retcode, not the errno (in the same way that if you make a
> native syscall or library call you look first at its return
> value, not at errno). There's nothing in the protocol text
> that makes a guarantee that the errno value is non-0 if and
> only if the call failed.
I admit that I didn't check the gdb code. I looked at our side and saw that when the
second result is missing that we'd supply 0, and interpreted "can be omitted" as "will be
omitted" on success.
> The gdb implementation of the isatty call returns 0 or 1 on
> success, and -1 on failure (though the only failure mode it has
> is "you messed up the protocol packet format"):
> https://sourceware.org/git/?p=binutils-gdb.git;a=blob;f=gdb/remote-fileio.c;h=fe191fb6069a53a3844656a81e77069afa781946;hb=HEAD#l1039
Technically, isatty = 0 is failure not success and should also set ENOTTY.
r~
^ permalink raw reply [flat|nested] 83+ messages in thread
* Re: [PATCH v3 09/49] semihosting: Adjust error checking in common_semi_cb
2022-05-23 15:35 ` Richard Henderson
@ 2022-05-23 15:44 ` Peter Maydell
2022-06-07 17:41 ` Richard Henderson
1 sibling, 0 replies; 83+ messages in thread
From: Peter Maydell @ 2022-05-23 15:44 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, alex.bennee
On Mon, 23 May 2022 at 16:35, Richard Henderson
<richard.henderson@linaro.org> wrote:
> On 5/23/22 05:13, Peter Maydell wrote:
> > The gdb implementation of the isatty call returns 0 or 1 on
> > success, and -1 on failure (though the only failure mode it has
> > is "you messed up the protocol packet format"):
> > https://sourceware.org/git/?p=binutils-gdb.git;a=blob;f=gdb/remote-fileio.c;h=fe191fb6069a53a3844656a81e77069afa781946;hb=HEAD#l1039
>
> Technically, isatty = 0 is failure not success and should also set ENOTTY.
There are multiple different APIs here with similar names but
not necessarily always the exact same behaviour in all cases:
Arm semihosting SYS_ISTTY:
https://github.com/ARM-software/abi-aa/blob/main/semihosting/semihosting.rst#sys-istty-0x09
returns 1 if the handle identifies an interactive device.
0 if the handle identifies a file.
A value other than 1 or 0 if an error occurs
(and implicitly sets errno, I assume)
GDB File-I/O isatty:
https://sourceware.org/gdb/onlinedocs/gdb/isatty.html#isatty
Returns 1 if fd refers to the GDB console, 0 otherwise
Documentation doesn't say how it reports errors. Actual implementation
returns -1 and sets errno. (We should probably report some of these
spec issues as gdb bugs...)
isatty() POSIX function:
returns 1 for a terminal
0 with errno ENOTTY for not-a-terminal
0 with some other errno for error cases
It looks like our 'host' implementation of the semihosting SYS_ISTTY
doesn't correctly do the matching up between the semihosting spec
and the isatty() function, so it will return the wrong value for
the error case.
thanks
-- PMM
^ permalink raw reply [flat|nested] 83+ messages in thread* Re: [PATCH v3 09/49] semihosting: Adjust error checking in common_semi_cb
2022-05-23 15:35 ` Richard Henderson
2022-05-23 15:44 ` Peter Maydell
@ 2022-06-07 17:41 ` Richard Henderson
1 sibling, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-06-07 17:41 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, alex.bennee
On 5/23/22 08:35, Richard Henderson wrote:
>> That implies that our current code is right, in that the
>> way to check for "did the call fail" is to look at the
>> retcode, not the errno (in the same way that if you make a
>> native syscall or library call you look first at its return
>> value, not at errno). There's nothing in the protocol text
>> that makes a guarantee that the errno value is non-0 if and
>> only if the call failed.
>
> I admit that I didn't check the gdb code. I looked at our side and saw that when the
> second result is missing that we'd supply 0, and interpreted "can be omitted" as "will be
> omitted" on success.
Checking, can->will is actually correct, and gdb will omit the errno parameter on success.
https://sourceware.org/git?p=binutils-gdb.git;a=blob;f=gdb/remote-fileio.c;h=fe191fb6069a53a3844656a81e77069afa781946;hb=HEAD#l328
So I think checking err != 0 is a good change.
r~
^ permalink raw reply [flat|nested] 83+ messages in thread
* [PATCH v3 10/49] semihosting: Clean up common_semi_flen_cb
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (8 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 09/49] semihosting: Adjust error checking in common_semi_cb Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-06-07 9:05 ` Alex Bennée
2022-05-21 0:03 ` [PATCH v3 11/49] semihosting: Clean up common_semi_open_cb Richard Henderson
` (38 subsequent siblings)
48 siblings, 1 reply; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
Do not read from the gdb struct stat buffer if the callback is
reporting an error. Use common_semi_cb to finish returning results.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
semihosting/arm-compat-semi.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 88e1c286ba..8792180974 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -346,15 +346,17 @@ 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);
- common_semi_set_ret(cs, size);
- errno = err;
- set_swi_errno(cs, -1);
+ if (!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);
+ ret = be32_to_cpu(size);
+ }
+ common_semi_cb(cs, ret, err);
}
static int common_semi_open_guestfd;
--
2.34.1
^ permalink raw reply related [flat|nested] 83+ messages in thread* Re: [PATCH v3 10/49] semihosting: Clean up common_semi_flen_cb
2022-05-21 0:03 ` [PATCH v3 10/49] semihosting: Clean up common_semi_flen_cb Richard Henderson
@ 2022-06-07 9:05 ` Alex Bennée
0 siblings, 0 replies; 83+ messages in thread
From: Alex Bennée @ 2022-06-07 9:05 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, peter.maydell
Richard Henderson <richard.henderson@linaro.org> writes:
> Do not read from the gdb struct stat buffer if the callback is
> reporting an error. Use common_semi_cb to finish returning results.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> semihosting/arm-compat-semi.c | 20 +++++++++++---------
> 1 file changed, 11 insertions(+), 9 deletions(-)
>
> diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
> index 88e1c286ba..8792180974 100644
> --- a/semihosting/arm-compat-semi.c
> +++ b/semihosting/arm-compat-semi.c
> @@ -346,15 +346,17 @@ 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);
> - common_semi_set_ret(cs, size);
> - errno = err;
> - set_swi_errno(cs, -1);
> + if (!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);
I did a double take but compared to the actual code it calls I guess
its fine. Technically I think:
cpu_memory_rw_debug(cs, common_semi_flen_buf(cs) + 32,
(void *) &size, sizeof(size), 0);
might be slightly cleaner but whatever:
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> + ret = be32_to_cpu(size);
> + }
> + common_semi_cb(cs, ret, err);
> }
>
> static int common_semi_open_guestfd;
--
Alex Bennée
^ permalink raw reply [flat|nested] 83+ messages in thread
* [PATCH v3 11/49] semihosting: Clean up common_semi_open_cb
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (9 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 10/49] semihosting: Clean up common_semi_flen_cb Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-06-07 11:30 ` Alex Bennée
2022-05-21 0:03 ` [PATCH v3 12/49] semihosting: Return void from do_common_semihosting Richard Henderson
` (37 subsequent siblings)
48 siblings, 1 reply; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
Use common_semi_cb to return results instead of calling
set_swi_errno and common_semi_set_ret directly.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
semihosting/arm-compat-semi.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 8792180974..1f1c5b4c9e 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -364,15 +364,13 @@ 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) {
- errno = err;
- set_swi_errno(cs, -1);
+ if (err) {
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);
+ common_semi_cb(cs, ret, err);
}
static target_ulong
--
2.34.1
^ permalink raw reply related [flat|nested] 83+ messages in thread* [PATCH v3 12/49] semihosting: Return void from do_common_semihosting
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (10 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 11/49] semihosting: Clean up common_semi_open_cb Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 13/49] semihosting: Move common-semi.h to include/semihosting/ Richard Henderson
` (36 subsequent siblings)
48 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
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 | 543 ++++++++++++++++------------------
target/arm/helper.c | 4 +-
target/arm/m_helper.c | 2 +-
target/riscv/cpu_helper.c | 2 +-
8 files changed, 264 insertions(+), 295 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 1f1c5b4c9e..7b56bae7db 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
@@ -373,54 +359,24 @@ common_semi_open_cb(CPUState *cs, target_ulong ret, target_ulong err)
common_semi_cb(cs, ret, err);
}
-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);
-}
-
/*
* 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.
@@ -428,113 +384,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
@@ -554,63 +503,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 {
@@ -669,13 +612,11 @@ 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); \
+ goto do_fault; \
} \
} else { \
if (get_user_u32(arg ## n, args + (n) * 4)) { \
- errno = EFAULT; \
- return set_swi_errno(cs, -1); \
+ goto do_fault; \
} \
} \
} while (0)
@@ -695,7 +636,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;
@@ -715,32 +656,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
@@ -748,63 +680,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);
@@ -813,11 +749,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);
@@ -826,129 +762,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.
@@ -999,22 +956,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. */
@@ -1029,9 +984,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. */
@@ -1044,9 +998,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];
@@ -1103,12 +1058,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)) {
@@ -1138,6 +1094,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) {
@@ -1146,10 +1103,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
@@ -1158,16 +1119,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 40da63913c..902abe67cf 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -10313,13 +10313,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] 83+ messages in thread* [PATCH v3 13/49] semihosting: Move common-semi.h to include/semihosting/
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (11 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 12/49] semihosting: Return void from do_common_semihosting Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-23 12:14 ` Peter Maydell
2022-05-21 0:03 ` [PATCH v3 14/49] include/exec: Move gdb open flags to gdbstub.h Richard Henderson
` (35 subsequent siblings)
48 siblings, 1 reply; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
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] 83+ messages in thread* Re: [PATCH v3 13/49] semihosting: Move common-semi.h to include/semihosting/
2022-05-21 0:03 ` [PATCH v3 13/49] semihosting: Move common-semi.h to include/semihosting/ Richard Henderson
@ 2022-05-23 12:14 ` Peter Maydell
0 siblings, 0 replies; 83+ messages in thread
From: Peter Maydell @ 2022-05-23 12:14 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, alex.bennee
On Sat, 21 May 2022 at 01:04, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> 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
> --
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
thanks
-- PMM
^ permalink raw reply [flat|nested] 83+ messages in thread
* [PATCH v3 14/49] include/exec: Move gdb open flags to gdbstub.h
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (12 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 13/49] semihosting: Move common-semi.h to include/semihosting/ Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-23 12:26 ` Peter Maydell
2022-06-07 13:58 ` Alex Bennée
2022-05-21 0:03 ` [PATCH v3 15/49] include/exec: Move gdb_stat and gdb_timeval " Richard Henderson
` (34 subsequent siblings)
48 siblings, 2 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
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 7b56bae7db..2e0e7febb1 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] 83+ messages in thread* Re: [PATCH v3 14/49] include/exec: Move gdb open flags to gdbstub.h
2022-05-21 0:03 ` [PATCH v3 14/49] include/exec: Move gdb open flags to gdbstub.h Richard Henderson
@ 2022-05-23 12:26 ` Peter Maydell
2022-06-07 13:58 ` Alex Bennée
1 sibling, 0 replies; 83+ messages in thread
From: Peter Maydell @ 2022-05-23 12:26 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, alex.bennee
On Sat, 21 May 2022 at 01:04, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> 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(-)
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Separately:
> +#define GDB_O_BINARY 0
The gdb remote protocol doesn't define an O_BINARY:
https://sourceware.org/gdb/onlinedocs/gdb/Open-Flags.html#Open-Flags
and files are always opened in binary mode:
https://sourceware.org/git/?p=binutils-gdb.git;a=blob;f=gdb/remote-fileio.c;h=fe191fb6069a53a3844656a81e77069afa781946;hb=HEAD#l122
so we should probably drop our definition and use of GDB_O_BINARY.
thanks
-- PMM
^ permalink raw reply [flat|nested] 83+ messages in thread
* Re: [PATCH v3 14/49] include/exec: Move gdb open flags to gdbstub.h
2022-05-21 0:03 ` [PATCH v3 14/49] include/exec: Move gdb open flags to gdbstub.h Richard Henderson
2022-05-23 12:26 ` Peter Maydell
@ 2022-06-07 13:58 ` Alex Bennée
1 sibling, 0 replies; 83+ messages in thread
From: Alex Bennée @ 2022-06-07 13:58 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, peter.maydell
Richard Henderson <richard.henderson@linaro.org> writes:
> 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>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
--
Alex Bennée
^ permalink raw reply [flat|nested] 83+ messages in thread
* [PATCH v3 15/49] include/exec: Move gdb_stat and gdb_timeval to gdbstub.h
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (13 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 14/49] include/exec: Move gdb open flags to gdbstub.h Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-23 12:42 ` Peter Maydell
2022-06-07 13:59 ` Alex Bennée
2022-05-21 0:03 ` [PATCH v3 16/49] include/exec: Define errno values in gdbstub.h Richard Henderson
` (33 subsequent siblings)
48 siblings, 2 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
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] 83+ messages in thread* Re: [PATCH v3 15/49] include/exec: Move gdb_stat and gdb_timeval to gdbstub.h
2022-05-21 0:03 ` [PATCH v3 15/49] include/exec: Move gdb_stat and gdb_timeval " Richard Henderson
@ 2022-05-23 12:42 ` Peter Maydell
2022-06-07 13:59 ` Alex Bennée
1 sibling, 0 replies; 83+ messages in thread
From: Peter Maydell @ 2022-05-23 12:42 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, alex.bennee
On Sat, 21 May 2022 at 01:04, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> 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;
As an aside,
https://sourceware.org/gdb/onlinedocs/gdb/struct-timeval.html#struct-timeval
says "this structure is of size 8 bytes", but looking at the gdb sources
our definition here is correct and it's 12 bytes (not 8 as the text says
and not 16 as you might expect from the C struct in the docs...)
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
thanks
-- PMM
^ permalink raw reply [flat|nested] 83+ messages in thread* Re: [PATCH v3 15/49] include/exec: Move gdb_stat and gdb_timeval to gdbstub.h
2022-05-21 0:03 ` [PATCH v3 15/49] include/exec: Move gdb_stat and gdb_timeval " Richard Henderson
2022-05-23 12:42 ` Peter Maydell
@ 2022-06-07 13:59 ` Alex Bennée
1 sibling, 0 replies; 83+ messages in thread
From: Alex Bennée @ 2022-06-07 13:59 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, peter.maydell
Richard Henderson <richard.henderson@linaro.org> writes:
> 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)))
checkpatch hard fails on the assignment in an if condition so it's
probably worth cleaning that up while you go.
Otherwise:
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
--
Alex Bennée
^ permalink raw reply [flat|nested] 83+ messages in thread
* [PATCH v3 16/49] include/exec: Define errno values in gdbstub.h
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (14 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 15/49] include/exec: Move gdb_stat and gdb_timeval " Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-23 12:44 ` Peter Maydell
2022-05-21 0:03 ` [PATCH v3 17/49] semihosting: Use struct gdb_stat in common_semi_flen_cb Richard Henderson
` (32 subsequent siblings)
48 siblings, 1 reply; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
Define constants for the errno values defined by the
gdb remote fileio protocol.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/gdbstub.h | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h
index 33a262a5a3..0a6e0d6eeb 100644
--- a/include/exec/gdbstub.h
+++ b/include/exec/gdbstub.h
@@ -20,6 +20,28 @@
#define GDB_O_TRUNC 0x400
#define GDB_O_EXCL 0x800
+/* For gdb file i/o remove protocol errno values */
+#define GDB_EPERM 1
+#define GDB_ENOENT 2
+#define GDB_EINTR 4
+#define GDB_EBADF 9
+#define GDB_EACCES 13
+#define GDB_EFAULT 14
+#define GDB_EBUSY 16
+#define GDB_EEXIST 17
+#define GDB_ENODEV 19
+#define GDB_ENOTDIR 20
+#define GDB_EISDIR 21
+#define GDB_EINVAL 22
+#define GDB_ENFILE 23
+#define GDB_EMFILE 24
+#define GDB_EFBIG 27
+#define GDB_ENOSPC 28
+#define GDB_ESPIPE 29
+#define GDB_EROFS 30
+#define GDB_ENAMETOOLONG 91
+#define GDB_EUNKNOWN 9999
+
/* For gdb file i/o stat/fstat. */
typedef uint32_t gdb_mode_t;
typedef uint32_t gdb_time_t;
--
2.34.1
^ permalink raw reply related [flat|nested] 83+ messages in thread* Re: [PATCH v3 16/49] include/exec: Define errno values in gdbstub.h
2022-05-21 0:03 ` [PATCH v3 16/49] include/exec: Define errno values in gdbstub.h Richard Henderson
@ 2022-05-23 12:44 ` Peter Maydell
0 siblings, 0 replies; 83+ messages in thread
From: Peter Maydell @ 2022-05-23 12:44 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, alex.bennee
On Sat, 21 May 2022 at 01:04, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> Define constants for the errno values defined by the
> gdb remote fileio protocol.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> include/exec/gdbstub.h | 22 ++++++++++++++++++++++
> 1 file changed, 22 insertions(+)
>
> diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h
> index 33a262a5a3..0a6e0d6eeb 100644
> --- a/include/exec/gdbstub.h
> +++ b/include/exec/gdbstub.h
> @@ -20,6 +20,28 @@
> #define GDB_O_TRUNC 0x400
> #define GDB_O_EXCL 0x800
>
> +/* For gdb file i/o remove protocol errno values */
"remote"
Otherwise
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
thanks
-- PMM
^ permalink raw reply [flat|nested] 83+ messages in thread
* [PATCH v3 17/49] semihosting: Use struct gdb_stat in common_semi_flen_cb
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (15 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 16/49] include/exec: Define errno values in gdbstub.h Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-23 12:47 ` Peter Maydell
2022-05-21 0:03 ` [PATCH v3 18/49] semihosting: Split is_64bit_semihosting per target Richard Henderson
` (31 subsequent siblings)
48 siblings, 1 reply; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
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 | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 2e0e7febb1..7becc14a81 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -325,14 +325,12 @@ static void
common_semi_flen_cb(CPUState *cs, target_ulong ret, target_ulong err)
{
if (!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);
- ret = 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);
+ ret = be64_to_cpu(size);
}
common_semi_cb(cs, ret, err);
}
--
2.34.1
^ permalink raw reply related [flat|nested] 83+ messages in thread* Re: [PATCH v3 17/49] semihosting: Use struct gdb_stat in common_semi_flen_cb
2022-05-21 0:03 ` [PATCH v3 17/49] semihosting: Use struct gdb_stat in common_semi_flen_cb Richard Henderson
@ 2022-05-23 12:47 ` Peter Maydell
0 siblings, 0 replies; 83+ messages in thread
From: Peter Maydell @ 2022-05-23 12:47 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, alex.bennee
On Sat, 21 May 2022 at 01:04, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> 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 | 14 ++++++--------
> 1 file changed, 6 insertions(+), 8 deletions(-)
Commit message seems to put the cart before the horse, in that
the important thing is the bugfix to read 64 bits and that
we choose to do that by using the struct offset is a detail :-)
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
thanks
-- PMM
^ permalink raw reply [flat|nested] 83+ messages in thread
* [PATCH v3 18/49] semihosting: Split is_64bit_semihosting per target
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (16 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 17/49] semihosting: Use struct gdb_stat in common_semi_flen_cb Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-23 12:48 ` Peter Maydell
2022-05-21 0:03 ` [PATCH v3 19/49] semihosting: Split common_semi_flen_buf " Richard Henderson
` (30 subsequent siblings)
48 siblings, 1 reply; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee, Alistair Francis
We already have some larger ifdef blocks for ARM and RISCV;
split the function into multiple implementations per arch.
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
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 7becc14a81..99a1809f27 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
/*
@@ -587,17 +595,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] 83+ messages in thread* Re: [PATCH v3 18/49] semihosting: Split is_64bit_semihosting per target
2022-05-21 0:03 ` [PATCH v3 18/49] semihosting: Split is_64bit_semihosting per target Richard Henderson
@ 2022-05-23 12:48 ` Peter Maydell
0 siblings, 0 replies; 83+ messages in thread
From: Peter Maydell @ 2022-05-23 12:48 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, alex.bennee, Alistair Francis
On Sat, 21 May 2022 at 01:04, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> We already have some larger ifdef blocks for ARM and RISCV;
> split the function into multiple implementations per arch.
>
> Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> semihosting/arm-compat-semi.c | 19 ++++++++-----------
> 1 file changed, 8 insertions(+), 11 deletions(-)
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
thanks
-- PMM
^ permalink raw reply [flat|nested] 83+ messages in thread
* [PATCH v3 19/49] semihosting: Split common_semi_flen_buf per target
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (17 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 18/49] semihosting: Split is_64bit_semihosting per target Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-23 12:50 ` Peter Maydell
2022-05-21 0:03 ` [PATCH v3 20/49] semihosting: Split out common_semi_has_synccache Richard Henderson
` (29 subsequent siblings)
48 siblings, 1 reply; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee, Alistair Francis
We already have some larger ifdef blocks for ARM and RISCV;
split out common_semi_stack_bottom per target.
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
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 99a1809f27..9ea985beee 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] 83+ messages in thread* Re: [PATCH v3 19/49] semihosting: Split common_semi_flen_buf per target
2022-05-21 0:03 ` [PATCH v3 19/49] semihosting: Split common_semi_flen_buf " Richard Henderson
@ 2022-05-23 12:50 ` Peter Maydell
0 siblings, 0 replies; 83+ messages in thread
From: Peter Maydell @ 2022-05-23 12:50 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, alex.bennee, Alistair Francis
On Sat, 21 May 2022 at 01:04, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> We already have some larger ifdef blocks for ARM and RISCV;
> split out common_semi_stack_bottom per target.
>
> Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> semihosting/arm-compat-semi.c | 44 +++++++++++++++++------------------
> 1 file changed, 21 insertions(+), 23 deletions(-)
>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
thanks
-- PMM
^ permalink raw reply [flat|nested] 83+ messages in thread
* [PATCH v3 20/49] semihosting: Split out common_semi_has_synccache
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (18 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 19/49] semihosting: Split common_semi_flen_buf " Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-23 12:51 ` Peter Maydell
2022-05-21 0:03 ` [PATCH v3 21/49] semihosting: Use env more often in do_common_semihosting Richard Henderson
` (28 subsequent siblings)
48 siblings, 1 reply; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee, Alistair Francis
We already have some larger ifdef blocks for ARM and RISCV;
split out a boolean test for SYS_SYNCCACHE.
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
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 9ea985beee..c53cb1891f 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
/*
@@ -1102,16 +1113,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] 83+ messages in thread* Re: [PATCH v3 20/49] semihosting: Split out common_semi_has_synccache
2022-05-21 0:03 ` [PATCH v3 20/49] semihosting: Split out common_semi_has_synccache Richard Henderson
@ 2022-05-23 12:51 ` Peter Maydell
2022-05-23 15:40 ` Richard Henderson
0 siblings, 1 reply; 83+ messages in thread
From: Peter Maydell @ 2022-05-23 12:51 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, alex.bennee, Alistair Francis
On Sat, 21 May 2022 at 01:04, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> We already have some larger ifdef blocks for ARM and RISCV;
> split out a boolean test for SYS_SYNCCACHE.
>
> Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
> 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 9ea985beee..c53cb1891f 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);
> +}
Condition seems to be inverted ?
-- PMM
^ permalink raw reply [flat|nested] 83+ messages in thread* Re: [PATCH v3 20/49] semihosting: Split out common_semi_has_synccache
2022-05-23 12:51 ` Peter Maydell
@ 2022-05-23 15:40 ` Richard Henderson
0 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-23 15:40 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, alex.bennee, Alistair Francis
On 5/23/22 05:51, Peter Maydell wrote:
> On Sat, 21 May 2022 at 01:04, Richard Henderson
> <richard.henderson@linaro.org> wrote:
>>
>> We already have some larger ifdef blocks for ARM and RISCV;
>> split out a boolean test for SYS_SYNCCACHE.
>>
>> Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
>> 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 9ea985beee..c53cb1891f 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);
>> +}
>
> Condition seems to be inverted ?
Oops, yes.
r~
^ permalink raw reply [flat|nested] 83+ messages in thread
* [PATCH v3 21/49] semihosting: Use env more often in do_common_semihosting
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (19 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 20/49] semihosting: Split out common_semi_has_synccache Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-23 12:53 ` Peter Maydell
2022-05-21 0:03 ` [PATCH v3 22/49] semihosting: Move GET_ARG/SET_ARG earlier in the file Richard Henderson
` (27 subsequent siblings)
48 siblings, 1 reply; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
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 c53cb1891f..9c6fe7ffd7 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,
@@ -645,7 +553,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);
@@ -728,12 +635,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;
@@ -764,7 +671,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] 83+ messages in thread* Re: [PATCH v3 21/49] semihosting: Use env more often in do_common_semihosting
2022-05-21 0:03 ` [PATCH v3 21/49] semihosting: Use env more often in do_common_semihosting Richard Henderson
@ 2022-05-23 12:53 ` Peter Maydell
2022-05-23 15:41 ` Richard Henderson
0 siblings, 1 reply; 83+ messages in thread
From: Peter Maydell @ 2022-05-23 12:53 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, alex.bennee
On Sat, 21 May 2022 at 01:04, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> 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
Commit message doesn't match contents -- two changes accidentally
squashed together here ?
thanks
-- PMM
^ permalink raw reply [flat|nested] 83+ messages in thread
* Re: [PATCH v3 21/49] semihosting: Use env more often in do_common_semihosting
2022-05-23 12:53 ` Peter Maydell
@ 2022-05-23 15:41 ` Richard Henderson
0 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-23 15:41 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, alex.bennee
On 5/23/22 05:53, Peter Maydell wrote:
> On Sat, 21 May 2022 at 01:04, Richard Henderson
> <richard.henderson@linaro.org> wrote:
>>
>> 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
>
> Commit message doesn't match contents -- two changes accidentally
> squashed together here ?
Yep, that's exactly it.
r~
^ permalink raw reply [flat|nested] 83+ messages in thread
* [PATCH v3 22/49] semihosting: Move GET_ARG/SET_ARG earlier in the file
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (20 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 21/49] semihosting: Use env more often in do_common_semihosting Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-23 12:53 ` Peter Maydell
2022-05-21 0:03 ` [PATCH v3 23/49] semihosting: Split out semihost_sys_open Richard Henderson
` (26 subsequent siblings)
48 siblings, 1 reply; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
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 | 48 +++++++++++++++++------------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 9c6fe7ffd7..7a7468799f 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -181,6 +181,30 @@ 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)) { \
+ goto do_fault; \
+ } \
+ } else { \
+ if (get_user_u32(arg ## n, args + (n) * 4)) { \
+ goto do_fault; \
+ } \
+ } \
+} 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
@@ -507,30 +531,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)) { \
- goto do_fault; \
- } \
- } else { \
- if (get_user_u32(arg ## n, args + (n) * 4)) { \
- goto do_fault; \
- } \
- } \
-} 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] 83+ messages in thread* [PATCH v3 23/49] semihosting: Split out semihost_sys_open
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (21 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 22/49] semihosting: Move GET_ARG/SET_ARG earlier in the file Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-23 13:30 ` Peter Maydell
2022-05-21 0:03 ` [PATCH v3 24/49] semihosting: Split out semihost_sys_close Richard Henderson
` (25 subsequent siblings)
48 siblings, 1 reply; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
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/syscalls.h | 25 +++++
semihosting/arm-compat-semi.c | 50 +--------
semihosting/guestfd.c | 5 +
semihosting/syscalls.c | 186 +++++++++++++++++++++++++++++++++
semihosting/meson.build | 1 +
5 files changed, 222 insertions(+), 45 deletions(-)
create mode 100644 include/semihosting/syscalls.h
create mode 100644 semihosting/syscalls.c
diff --git a/include/semihosting/syscalls.h b/include/semihosting/syscalls.h
new file mode 100644
index 0000000000..991658bf79
--- /dev/null
+++ b/include/semihosting/syscalls.h
@@ -0,0 +1,25 @@
+/*
+ * Syscall implementations for semihosting.
+ *
+ * Copyright (c) 2022 Linaro
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#ifndef SEMIHOSTING_SYSCALLS_H
+#define SEMIHOSTING_SYSCALLS_H
+
+/*
+ * 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_SYSCALLS_H */
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 7a7468799f..cc008d0338 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -35,9 +35,10 @@
#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"
+#include "semihosting/syscalls.h"
#ifdef CONFIG_USER_ONLY
#include "qemu.h"
@@ -98,21 +99,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
/**
@@ -284,20 +270,6 @@ common_semi_flen_cb(CPUState *cs, target_ulong ret, target_ulong err)
common_semi_cb(cs, ret, err);
}
-static int common_semi_open_guestfd;
-
-static void
-common_semi_open_cb(CPUState *cs, target_ulong ret, target_ulong err)
-{
- if (err) {
- 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
@@ -601,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..7ac2e147a8 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;
diff --git a/semihosting/syscalls.c b/semihosting/syscalls.c
new file mode 100644
index 0000000000..a44d5cbae2
--- /dev/null
+++ b/semihosting/syscalls.c
@@ -0,0 +1,186 @@
+/*
+ * Syscall implementations for semihosting.
+ *
+ * Copyright (c) 2022 Linaro
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "qemu/osdep.h"
+#include "exec/gdbstub.h"
+#include "semihosting/guestfd.h"
+#include "semihosting/syscalls.h"
+#ifdef CONFIG_USER_ONLY
+#include "qemu.h"
+#else
+#include "semihosting/softmmu-uaccess.h"
+#endif
+
+
+/*
+ * 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 -GDB_EFAULT;
+ }
+ if (slen >= INT32_MAX) {
+ return -GDB_ENAMETOOLONG;
+ }
+ return slen + 1;
+ }
+ if (tlen > INT32_MAX) {
+ return -GDB_ENAMETOOLONG;
+ }
+ if (get_user_u8(c, str + tlen - 1)) {
+ return -GDB_EFAULT;
+ }
+ if (c != 0) {
+ return -GDB_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 : -GDB_EFAULT;
+ }
+ *pstr = str;
+ return ret;
+}
+
+static int errno_for_gdb(void)
+{
+#define E(N) case E##N: return GDB_E##N
+
+ switch (errno) {
+ E(PERM);
+ E(NOENT);
+ E(INTR);
+ E(BADF);
+ E(ACCES);
+ E(FAULT);
+ E(BUSY);
+ E(EXIST);
+ E(NODEV);
+ E(NOTDIR);
+ E(ISDIR);
+ E(INVAL);
+ E(NFILE);
+ E(MFILE);
+ E(FBIG);
+ E(NOSPC);
+ E(SPIPE);
+ E(ROFS);
+ E(NAMETOOLONG);
+ }
+ return GDB_EUNKNOWN;
+
+#undef E
+}
+
+/*
+ * GDB 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);
+}
+
+/*
+ * Host semihosting syscall implementations.
+ */
+
+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_for_gdb());
+ } else {
+ int guestfd = alloc_guestfd();
+ associate_guestfd(guestfd, ret);
+ complete(cs, guestfd, 0);
+ }
+ unlock_user(p, fname, 0);
+}
+
+/*
+ * Syscall entry points.
+ */
+
+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);
+ }
+}
diff --git a/semihosting/meson.build b/semihosting/meson.build
index d2c1c37bfd..8057db5494 100644
--- a/semihosting/meson.build
+++ b/semihosting/meson.build
@@ -1,5 +1,6 @@
specific_ss.add(when: 'CONFIG_SEMIHOSTING', if_true: files(
'guestfd.c',
+ 'syscalls.c',
))
specific_ss.add(when: ['CONFIG_SEMIHOSTING', 'CONFIG_SOFTMMU'], if_true: files(
--
2.34.1
^ permalink raw reply related [flat|nested] 83+ messages in thread* Re: [PATCH v3 23/49] semihosting: Split out semihost_sys_open
2022-05-21 0:03 ` [PATCH v3 23/49] semihosting: Split out semihost_sys_open Richard Henderson
@ 2022-05-23 13:30 ` Peter Maydell
2022-05-23 15:46 ` Richard Henderson
2022-06-07 18:23 ` Richard Henderson
0 siblings, 2 replies; 83+ messages in thread
From: Peter Maydell @ 2022-05-23 13:30 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, alex.bennee
On Sat, 21 May 2022 at 01:04, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> 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>
> diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
> index 7a7468799f..cc008d0338 100644
> --- a/semihosting/arm-compat-semi.c
> +++ b/semihosting/arm-compat-semi.c
> @@ -35,9 +35,10 @@
> #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"
> +#include "semihosting/syscalls.h"
Can we keep all the semihosting/ include lines together?
> diff --git a/semihosting/guestfd.c b/semihosting/guestfd.c
> index b6405f5663..7ac2e147a8 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
Does this need to be in this patch, or should it be somewhere else?
> +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_for_gdb());
So this changes the errno values in the not-gdb case from being
host errno values to the gdb protocol ones. Errnos in Arm semihosting
are an unspecified mess, so maybe we can get away with changing
the existing QEMU behaviour; but I'd rather we didn't do it
one syscall at a time in a big refactoring series if we can avoid it.
> + } else {
> + int guestfd = alloc_guestfd();
> + associate_guestfd(guestfd, ret);
> + complete(cs, guestfd, 0);
> + }
> + unlock_user(p, fname, 0);
> +}
thanks
-- PMM
^ permalink raw reply [flat|nested] 83+ messages in thread* Re: [PATCH v3 23/49] semihosting: Split out semihost_sys_open
2022-05-23 13:30 ` Peter Maydell
@ 2022-05-23 15:46 ` Richard Henderson
2022-05-23 16:54 ` Peter Maydell
2022-06-07 18:23 ` Richard Henderson
1 sibling, 1 reply; 83+ messages in thread
From: Richard Henderson @ 2022-05-23 15:46 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, alex.bennee
On 5/23/22 06:30, Peter Maydell wrote:
> So this changes the errno values in the not-gdb case from being
> host errno values to the gdb protocol ones. Errnos in Arm semihosting
> are an unspecified mess, so maybe we can get away with changing
> the existing QEMU behaviour; but I'd rather we didn't do it
> one syscall at a time in a big refactoring series if we can avoid it.
Ok.
Also, I think I mentioned this in the v2 cover but not here, that having done the errno
conversion here for arm semihosting, it worked less well for mips and xtensa, which have a
rather better defined set of errnos.
My question from v2 was: should we in fact convert back from gdb's errno to host errno in
gdbstub.c handle_file_io(), and then let each semihosting backend convert from host to guest?
r~
^ permalink raw reply [flat|nested] 83+ messages in thread
* Re: [PATCH v3 23/49] semihosting: Split out semihost_sys_open
2022-05-23 15:46 ` Richard Henderson
@ 2022-05-23 16:54 ` Peter Maydell
2022-05-23 18:21 ` Richard Henderson
0 siblings, 1 reply; 83+ messages in thread
From: Peter Maydell @ 2022-05-23 16:54 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, alex.bennee
On Mon, 23 May 2022 at 16:46, Richard Henderson
<richard.henderson@linaro.org> wrote:
> Also, I think I mentioned this in the v2 cover but not here, that having done the errno
> conversion here for arm semihosting, it worked less well for mips and xtensa, which have a
> rather better defined set of errnos.
>
> My question from v2 was: should we in fact convert back from gdb's errno to host errno in
> gdbstub.c handle_file_io(), and then let each semihosting backend convert from host to guest?
That sounds like it's probably a better idea (though I'm not sure
what host errno we use for the gdb "unknown errno" case)...
-- PMM
^ permalink raw reply [flat|nested] 83+ messages in thread
* Re: [PATCH v3 23/49] semihosting: Split out semihost_sys_open
2022-05-23 16:54 ` Peter Maydell
@ 2022-05-23 18:21 ` Richard Henderson
0 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-23 18:21 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, alex.bennee
On 5/23/22 09:54, Peter Maydell wrote:
> On Mon, 23 May 2022 at 16:46, Richard Henderson
> <richard.henderson@linaro.org> wrote:
>> Also, I think I mentioned this in the v2 cover but not here, that having done the errno
>> conversion here for arm semihosting, it worked less well for mips and xtensa, which have a
>> rather better defined set of errnos.
>>
>> My question from v2 was: should we in fact convert back from gdb's errno to host errno in
>> gdbstub.c handle_file_io(), and then let each semihosting backend convert from host to guest?
>
> That sounds like it's probably a better idea (though I'm not sure
> what host errno we use for the gdb "unknown errno" case)...
An excellent question. I note that both mips and xtensa use EINVAL when there is no exact
match for the guest. It does seem to be the least bad option.
r~
^ permalink raw reply [flat|nested] 83+ messages in thread
* Re: [PATCH v3 23/49] semihosting: Split out semihost_sys_open
2022-05-23 13:30 ` Peter Maydell
2022-05-23 15:46 ` Richard Henderson
@ 2022-06-07 18:23 ` Richard Henderson
1 sibling, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-06-07 18:23 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, alex.bennee
On 5/23/22 06:30, Peter Maydell wrote:
>> diff --git a/semihosting/guestfd.c b/semihosting/guestfd.c
>> index b6405f5663..7ac2e147a8 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
>
> Does this need to be in this patch, or should it be somewhere else?
The first use of target_strlen is added in this patch, so yes, belongs here.
r~
^ permalink raw reply [flat|nested] 83+ messages in thread
* [PATCH v3 24/49] semihosting: Split out semihost_sys_close
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (22 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 23/49] semihosting: Split out semihost_sys_open Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 25/49] semihosting: Split out semihost_sys_read Richard Henderson
` (24 subsequent siblings)
48 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
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/syscalls.h | 3 +++
semihosting/arm-compat-semi.c | 41 +----------------------------
semihosting/guestfd.c | 7 ++++-
semihosting/syscalls.c | 47 ++++++++++++++++++++++++++++++++++
4 files changed, 57 insertions(+), 41 deletions(-)
diff --git a/include/semihosting/syscalls.h b/include/semihosting/syscalls.h
index 991658bf79..00e718f11d 100644
--- a/include/semihosting/syscalls.h
+++ b/include/semihosting/syscalls.h
@@ -22,4 +22,7 @@ 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_SYSCALLS_H */
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index cc008d0338..9bb80c3286 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 7ac2e147a8..e3122ebba9 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,5 +124,5 @@ void dealloc_guestfd(int guestfd)
GuestFD *gf = do_get_guestfd(guestfd);
assert(gf);
- gf->type = GuestFDUnused;
+ do_dealloc_guestfd(gf);
}
diff --git a/semihosting/syscalls.c b/semihosting/syscalls.c
index a44d5cbae2..9c4b635317 100644
--- a/semihosting/syscalls.c
+++ b/semihosting/syscalls.c
@@ -124,6 +124,12 @@ static void gdb_open(CPUState *cs, gdb_syscall_complete_cb complete,
fname, len, (target_ulong)gdb_flags, (target_ulong)mode);
}
+static void gdb_close(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf)
+{
+ gdb_do_syscall(complete, "close,%x", (target_ulong)gf->hostfd);
+}
+
/*
* Host semihosting syscall implementations.
*/
@@ -170,6 +176,23 @@ static void host_open(CPUState *cs, gdb_syscall_complete_cb complete,
unlock_user(p, fname, 0);
}
+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_for_gdb());
+ } else {
+ complete(cs, 0, 0);
+ }
+}
+
/*
* Syscall entry points.
*/
@@ -184,3 +207,27 @@ void semihost_sys_open(CPUState *cs, gdb_syscall_complete_cb complete,
host_open(cs, complete, fname, fname_len, gdb_flags, mode);
}
}
+
+void semihost_sys_close(CPUState *cs, gdb_syscall_complete_cb complete, int fd)
+{
+ GuestFD *gf = get_guestfd(fd);
+
+ if (!gf) {
+ complete(cs, -1, GDB_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();
+ }
+ dealloc_guestfd(fd);
+}
--
2.34.1
^ permalink raw reply related [flat|nested] 83+ messages in thread* [PATCH v3 25/49] semihosting: Split out semihost_sys_read
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (23 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 24/49] semihosting: Split out semihost_sys_close Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 26/49] semihosting: Split out semihost_sys_write Richard Henderson
` (23 subsequent siblings)
48 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
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/syscalls.h | 8 ++++
semihosting/arm-compat-semi.c | 85 ++++++++--------------------------
semihosting/syscalls.c | 85 ++++++++++++++++++++++++++++++++++
3 files changed, 113 insertions(+), 65 deletions(-)
diff --git a/include/semihosting/syscalls.h b/include/semihosting/syscalls.h
index 00e718f11d..20da8138b0 100644
--- a/include/semihosting/syscalls.h
+++ b/include/semihosting/syscalls.h
@@ -18,6 +18,8 @@
* or non-zero (where it should include the terminating zero).
*/
+typedef struct GuestFD GuestFD;
+
void semihost_sys_open(CPUState *cs, gdb_syscall_complete_cb complete,
target_ulong fname, target_ulong fname_len,
int gdb_flags, int mode);
@@ -25,4 +27,10 @@ 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);
+
+void semihost_sys_read_gf(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf, target_ulong buf, target_ulong len);
+
#endif /* SEMIHOSTING_SYSCALLS_H */
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 9bb80c3286..5e4101c6a7 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -231,7 +231,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:
@@ -244,6 +243,25 @@ 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) {
+ do_fault:
+ 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 +296,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 +318,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 +347,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 +387,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 +405,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 +413,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 +543,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/syscalls.c b/semihosting/syscalls.c
index 9c4b635317..7c18f77898 100644
--- a/semihosting/syscalls.c
+++ b/semihosting/syscalls.c
@@ -130,6 +130,13 @@ static void gdb_close(CPUState *cs, gdb_syscall_complete_cb complete,
gdb_do_syscall(complete, "close,%x", (target_ulong)gf->hostfd);
}
+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);
+}
+
/*
* Host semihosting syscall implementations.
*/
@@ -193,6 +200,54 @@ static void host_close(CPUState *cs, gdb_syscall_complete_cb complete,
}
}
+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, GDB_EFAULT);
+ return;
+ }
+ do {
+ ret = read(gf->hostfd, ptr, len);
+ } while (ret == -1 && errno == EINTR);
+ if (ret == -1) {
+ complete(cs, -1, errno_for_gdb());
+ unlock_user(ptr, buf, 0);
+ } else {
+ complete(cs, ret, 0);
+ unlock_user(ptr, buf, ret);
+ }
+}
+
+/*
+ * Static file semihosting syscall implementations.
+ */
+
+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, GDB_EFAULT);
+ return;
+ }
+ memcpy(ptr, gf->staticfile.data + gf->staticfile.off, len);
+ gf->staticfile.off += len;
+ complete(cs, len, 0);
+ unlock_user(ptr, buf, len);
+}
+
/*
* Syscall entry points.
*/
@@ -231,3 +286,33 @@ void semihost_sys_close(CPUState *cs, gdb_syscall_complete_cb complete, int fd)
}
dealloc_guestfd(fd);
}
+
+void semihost_sys_read_gf(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf, target_ulong buf, target_ulong len)
+{
+ 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();
+ }
+}
+
+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) {
+ semihost_sys_read_gf(cs, complete, gf, buf, len);
+ } else {
+ complete(cs, -1, GDB_EBADF);
+ }
+}
--
2.34.1
^ permalink raw reply related [flat|nested] 83+ messages in thread* [PATCH v3 26/49] semihosting: Split out semihost_sys_write
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (24 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 25/49] semihosting: Split out semihost_sys_read Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 27/49] semihosting: Bound length for semihost_sys_{read, write} Richard Henderson
` (22 subsequent siblings)
48 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
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/syscalls.h | 6 ++++
semihosting/arm-compat-semi.c | 52 +-------------------------------
semihosting/syscalls.c | 54 ++++++++++++++++++++++++++++++++++
3 files changed, 61 insertions(+), 51 deletions(-)
diff --git a/include/semihosting/syscalls.h b/include/semihosting/syscalls.h
index 20da8138b0..2464467579 100644
--- a/include/semihosting/syscalls.h
+++ b/include/semihosting/syscalls.h
@@ -33,4 +33,10 @@ void semihost_sys_read(CPUState *cs, gdb_syscall_complete_cb complete,
void semihost_sys_read_gf(CPUState *cs, gdb_syscall_complete_cb complete,
GuestFD *gf, 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);
+
+void semihost_sys_write_gf(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf, target_ulong buf, target_ulong len);
+
#endif /* SEMIHOSTING_SYSCALLS_H */
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 5e4101c6a7..1238b81e0a 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -215,8 +215,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) {
@@ -230,9 +228,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;
@@ -294,30 +289,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);
@@ -340,13 +315,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);
@@ -380,13 +348,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);
@@ -404,7 +365,6 @@ static void staticfile_flenfn(CPUState *cs, GuestFD *gf)
}
typedef struct GuestFDFunctions {
- sys_writefn *writefn;
sys_isattyfn *isattyfn;
sys_seekfn *seekfn;
sys_flenfn *flenfn;
@@ -412,19 +372,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,
@@ -449,7 +406,6 @@ void do_common_semihosting(CPUState *cs)
char * s;
int nr;
uint32_t ret;
- uint32_t len;
GuestFD *gf;
int64_t elapsed;
@@ -530,13 +486,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/syscalls.c b/semihosting/syscalls.c
index 7c18f77898..db4561b798 100644
--- a/semihosting/syscalls.c
+++ b/semihosting/syscalls.c
@@ -137,6 +137,13 @@ static void gdb_read(CPUState *cs, gdb_syscall_complete_cb complete,
(target_ulong)gf->hostfd, buf, len);
}
+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);
+}
+
/*
* Host semihosting syscall implementations.
*/
@@ -223,6 +230,22 @@ static void host_read(CPUState *cs, gdb_syscall_complete_cb complete,
}
}
+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, GDB_EFAULT);
+ return;
+ }
+ ret = write(gf->hostfd, ptr, len);
+ complete(cs, ret, ret == -1 ? errno_for_gdb() : 0);
+ unlock_user(ptr, buf, 0);
+}
+
/*
* Static file semihosting syscall implementations.
*/
@@ -316,3 +339,34 @@ void semihost_sys_read(CPUState *cs, gdb_syscall_complete_cb complete,
complete(cs, -1, GDB_EBADF);
}
}
+
+void semihost_sys_write_gf(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf, target_ulong buf, target_ulong len)
+{
+ 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:
+ /* Static files are never open for writing: EBADF. */
+ complete(cs, -1, GDB_EBADF);
+ break;
+ default:
+ g_assert_not_reached();
+ }
+}
+
+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) {
+ semihost_sys_write_gf(cs, complete, gf, buf, len);
+ } else {
+ complete(cs, -1, GDB_EBADF);
+ }
+}
--
2.34.1
^ permalink raw reply related [flat|nested] 83+ messages in thread* [PATCH v3 27/49] semihosting: Bound length for semihost_sys_{read, write}
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (25 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 26/49] semihosting: Split out semihost_sys_write Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 28/49] semihosting: Split out semihost_sys_lseek Richard Henderson
` (21 subsequent siblings)
48 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
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/syscalls.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/semihosting/syscalls.c b/semihosting/syscalls.c
index db4561b798..a5623ebf0f 100644
--- a/semihosting/syscalls.c
+++ b/semihosting/syscalls.c
@@ -313,6 +313,14 @@ void semihost_sys_close(CPUState *cs, gdb_syscall_complete_cb complete, int fd)
void semihost_sys_read_gf(CPUState *cs, gdb_syscall_complete_cb complete,
GuestFD *gf, target_ulong buf, target_ulong len)
{
+ /*
+ * 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);
@@ -343,6 +351,14 @@ void semihost_sys_read(CPUState *cs, gdb_syscall_complete_cb complete,
void semihost_sys_write_gf(CPUState *cs, gdb_syscall_complete_cb complete,
GuestFD *gf, target_ulong buf, target_ulong len)
{
+ /*
+ * 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] 83+ messages in thread* [PATCH v3 28/49] semihosting: Split out semihost_sys_lseek
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (26 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 27/49] semihosting: Bound length for semihost_sys_{read, write} Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 29/49] semihosting: Split out semihost_sys_isatty Richard Henderson
` (20 subsequent siblings)
48 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
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/syscalls.h | 3 ++
semihosting/arm-compat-semi.c | 51 ++++++---------------
semihosting/syscalls.c | 81 ++++++++++++++++++++++++++++++++++
4 files changed, 102 insertions(+), 38 deletions(-)
diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h
index 0a6e0d6eeb..056db1a0d0 100644
--- a/include/exec/gdbstub.h
+++ b/include/exec/gdbstub.h
@@ -42,6 +42,11 @@
#define GDB_ENAMETOOLONG 91
#define GDB_EUNKNOWN 9999
+/* 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/syscalls.h b/include/semihosting/syscalls.h
index 2464467579..841a93d25b 100644
--- a/include/semihosting/syscalls.h
+++ b/include/semihosting/syscalls.h
@@ -39,4 +39,7 @@ void semihost_sys_write(CPUState *cs, gdb_syscall_complete_cb complete,
void semihost_sys_write_gf(CPUState *cs, gdb_syscall_complete_cb complete,
GuestFD *gf, 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_SYSCALLS_H */
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 1238b81e0a..e7e568a77e 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -224,16 +224,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
@@ -290,7 +292,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)
@@ -298,12 +299,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;
@@ -320,11 +315,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",
@@ -353,12 +343,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);
@@ -366,24 +350,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,
},
};
@@ -519,12 +499,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/syscalls.c b/semihosting/syscalls.c
index a5623ebf0f..db8891535b 100644
--- a/semihosting/syscalls.c
+++ b/semihosting/syscalls.c
@@ -144,6 +144,13 @@ static void gdb_write(CPUState *cs, gdb_syscall_complete_cb complete,
(target_ulong)gf->hostfd, buf, len);
}
+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);
+}
+
/*
* Host semihosting syscall implementations.
*/
@@ -246,6 +253,29 @@ static void host_write(CPUState *cs, gdb_syscall_complete_cb complete,
unlock_user(ptr, buf, 0);
}
+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_for_gdb();
+ }
+ } else {
+ ret = -1;
+ err = GDB_EINVAL;
+ }
+ complete(cs, ret, err);
+}
+
/*
* Static file semihosting syscall implementations.
*/
@@ -271,6 +301,33 @@ static void staticfile_read(CPUState *cs, gdb_syscall_complete_cb complete,
unlock_user(ptr, buf, len);
}
+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);
+ }
+}
+
/*
* Syscall entry points.
*/
@@ -386,3 +443,27 @@ void semihost_sys_write(CPUState *cs, gdb_syscall_complete_cb complete,
complete(cs, -1, GDB_EBADF);
}
}
+
+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, GDB_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] 83+ messages in thread* [PATCH v3 29/49] semihosting: Split out semihost_sys_isatty
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (27 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 28/49] semihosting: Split out semihost_sys_lseek Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 30/49] semihosting: Split out semihost_sys_flen Richard Henderson
` (19 subsequent siblings)
48 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
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/exec/gdbstub.h | 1 +
include/semihosting/syscalls.h | 3 +++
semihosting/arm-compat-semi.c | 27 +------------------------
semihosting/syscalls.c | 36 ++++++++++++++++++++++++++++++++++
4 files changed, 41 insertions(+), 26 deletions(-)
diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h
index 056db1a0d0..fd4bc4e937 100644
--- a/include/exec/gdbstub.h
+++ b/include/exec/gdbstub.h
@@ -41,6 +41,7 @@
#define GDB_EROFS 30
#define GDB_ENAMETOOLONG 91
#define GDB_EUNKNOWN 9999
+#define GDB_ENOTTY GDB_EUNKNOWN
/* For gdb file i/o remote protocol lseek whence. */
#define GDB_SEEK_SET 0
diff --git a/include/semihosting/syscalls.h b/include/semihosting/syscalls.h
index 841a93d25b..c60ebafb85 100644
--- a/include/semihosting/syscalls.h
+++ b/include/semihosting/syscalls.h
@@ -42,4 +42,7 @@ void semihost_sys_write_gf(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_SYSCALLS_H */
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index e7e568a77e..973b0a68ab 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -291,14 +291,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;
@@ -310,11 +304,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",
@@ -338,32 +327,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,
},
};
@@ -488,12 +468,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/syscalls.c b/semihosting/syscalls.c
index db8891535b..702541b270 100644
--- a/semihosting/syscalls.c
+++ b/semihosting/syscalls.c
@@ -151,6 +151,12 @@ static void gdb_lseek(CPUState *cs, gdb_syscall_complete_cb complete,
(target_ulong)gf->hostfd, off, (target_ulong)gdb_whence);
}
+static void gdb_isatty(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf)
+{
+ gdb_do_syscall(complete, "isatty,%x", (target_ulong)gf->hostfd);
+}
+
/*
* Host semihosting syscall implementations.
*/
@@ -276,6 +282,13 @@ static void host_lseek(CPUState *cs, gdb_syscall_complete_cb complete,
complete(cs, ret, err);
}
+static void host_isatty(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf)
+{
+ int ret = isatty(gf->hostfd);
+ complete(cs, ret, ret ? 0 : errno_for_gdb());
+}
+
/*
* Static file semihosting syscall implementations.
*/
@@ -467,3 +480,26 @@ void semihost_sys_lseek(CPUState *cs, gdb_syscall_complete_cb complete,
g_assert_not_reached();
}
}
+
+void semihost_sys_isatty(CPUState *cs, gdb_syscall_complete_cb complete, int fd)
+{
+ GuestFD *gf = get_guestfd(fd);
+
+ if (!gf) {
+ complete(cs, 0, GDB_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, GDB_ENOTTY);
+ break;
+ default:
+ g_assert_not_reached();
+ }
+}
--
2.34.1
^ permalink raw reply related [flat|nested] 83+ messages in thread* [PATCH v3 30/49] semihosting: Split out semihost_sys_flen
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (28 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 29/49] semihosting: Split out semihost_sys_isatty Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 31/49] semihosting: Split out semihost_sys_remove Richard Henderson
` (18 subsequent siblings)
48 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
The ARM-specific SYS_FLEN isn't really something that can be
reused by other semihosting apis, but there are parts that can
reused for the implementation of semihost_sys_fstat.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/gdbstub.h | 1 +
include/semihosting/syscalls.h | 4 ++
semihosting/arm-compat-semi.c | 74 ++++++----------------------------
semihosting/syscalls.c | 49 ++++++++++++++++++++++
4 files changed, 67 insertions(+), 61 deletions(-)
diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h
index fd4bc4e937..8e9cdcb1c1 100644
--- a/include/exec/gdbstub.h
+++ b/include/exec/gdbstub.h
@@ -42,6 +42,7 @@
#define GDB_ENAMETOOLONG 91
#define GDB_EUNKNOWN 9999
#define GDB_ENOTTY GDB_EUNKNOWN
+#define GDB_EOVERFLOW GDB_EUNKNOWN
/* For gdb file i/o remote protocol lseek whence. */
#define GDB_SEEK_SET 0
diff --git a/include/semihosting/syscalls.h b/include/semihosting/syscalls.h
index c60ebafb85..1ae5ba6716 100644
--- a/include/semihosting/syscalls.h
+++ b/include/semihosting/syscalls.h
@@ -45,4 +45,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_SYSCALLS_H */
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 973b0a68ab..5dd8c800cc 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -272,44 +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)
{
if (!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);
- ret = be64_to_cpu(size);
+ if (cpu_memory_rw_debug(cs, common_semi_flen_buf(cs) +
+ offsetof(struct gdb_stat, gdb_st_size),
+ &size, 8, 0)) {
+ ret = -1, err = GDB_EFAULT;
+ } else {
+ size = be64_to_cpu(size);
+ if (ret != size) {
+ ret = -1, err = GDB_EOVERFLOW;
+ }
+ }
}
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 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);
- }
-}
-
-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));
-}
-
#define SHFB_MAGIC_0 0x53
#define SHFB_MAGIC_1 0x48
#define SHFB_MAGIC_2 0x46
@@ -327,27 +308,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.
*
@@ -366,7 +326,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;
@@ -479,12 +438,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:
@@ -806,9 +761,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/syscalls.c b/semihosting/syscalls.c
index 702541b270..1425156bf6 100644
--- a/semihosting/syscalls.c
+++ b/semihosting/syscalls.c
@@ -157,6 +157,12 @@ static void gdb_isatty(CPUState *cs, gdb_syscall_complete_cb complete,
gdb_do_syscall(complete, "isatty,%x", (target_ulong)gf->hostfd);
}
+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);
+}
+
/*
* Host semihosting syscall implementations.
*/
@@ -289,6 +295,18 @@ static void host_isatty(CPUState *cs, gdb_syscall_complete_cb complete,
complete(cs, ret, ret ? 0 : errno_for_gdb());
}
+static void host_flen(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf)
+{
+ struct stat buf;
+
+ if (fstat(gf->hostfd, &buf) < 0) {
+ complete(cs, -1, errno_for_gdb());
+ } else {
+ complete(cs, buf.st_size, 0);
+ }
+}
+
/*
* Static file semihosting syscall implementations.
*/
@@ -341,6 +359,12 @@ static void staticfile_lseek(CPUState *cs, gdb_syscall_complete_cb complete,
}
}
+static void staticfile_flen(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf)
+{
+ complete(cs, gf->staticfile.len, 0);
+}
+
/*
* Syscall entry points.
*/
@@ -503,3 +527,28 @@ void semihost_sys_isatty(CPUState *cs, gdb_syscall_complete_cb complete, int fd)
g_assert_not_reached();
}
}
+
+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, GDB_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] 83+ messages in thread* [PATCH v3 31/49] semihosting: Split out semihost_sys_remove
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (29 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 30/49] semihosting: Split out semihost_sys_flen Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 32/49] semihosting: Split out semihost_sys_rename Richard Henderson
` (17 subsequent siblings)
48 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
Split out the non-ARM specific portions of SYS_REMOVE to a
reusable function.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/syscalls.h | 3 +++
semihosting/arm-compat-semi.c | 13 +----------
semihosting/syscalls.c | 40 ++++++++++++++++++++++++++++++++++
3 files changed, 44 insertions(+), 12 deletions(-)
diff --git a/include/semihosting/syscalls.h b/include/semihosting/syscalls.h
index 1ae5ba6716..748a4b5e47 100644
--- a/include/semihosting/syscalls.h
+++ b/include/semihosting/syscalls.h
@@ -49,4 +49,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_SYSCALLS_H */
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 5dd8c800cc..b4320939a1 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -470,18 +470,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/syscalls.c b/semihosting/syscalls.c
index 1425156bf6..3464896281 100644
--- a/semihosting/syscalls.c
+++ b/semihosting/syscalls.c
@@ -163,6 +163,18 @@ static void gdb_fstat(CPUState *cs, gdb_syscall_complete_cb complete,
gdb_do_syscall(complete, "fstat,%x,%x", (target_ulong)gf->hostfd, addr);
}
+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);
+}
+
/*
* Host semihosting syscall implementations.
*/
@@ -307,6 +319,24 @@ static void host_flen(CPUState *cs, gdb_syscall_complete_cb complete,
}
}
+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_for_gdb() : 0);
+ unlock_user(p, fname, 0);
+}
+
/*
* Static file semihosting syscall implementations.
*/
@@ -552,3 +582,13 @@ void semihost_sys_flen(CPUState *cs, gdb_syscall_complete_cb fstat_cb,
g_assert_not_reached();
}
}
+
+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] 83+ messages in thread* [PATCH v3 32/49] semihosting: Split out semihost_sys_rename
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (30 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 31/49] semihosting: Split out semihost_sys_remove Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 33/49] semihosting: Split out semihost_sys_system Richard Henderson
` (16 subsequent siblings)
48 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
Split out the non-ARM specific portions of SYS_RENAME to a
reusable function.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/syscalls.h | 4 +++
semihosting/arm-compat-semi.c | 21 +------------
semihosting/syscalls.c | 57 ++++++++++++++++++++++++++++++++++
3 files changed, 62 insertions(+), 20 deletions(-)
diff --git a/include/semihosting/syscalls.h b/include/semihosting/syscalls.h
index 748a4b5e47..21430aa0ef 100644
--- a/include/semihosting/syscalls.h
+++ b/include/semihosting/syscalls.h
@@ -52,4 +52,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_SYSCALLS_H */
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index b4320939a1..f02131aebd 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -478,26 +478,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/syscalls.c b/semihosting/syscalls.c
index 3464896281..96d823e8b3 100644
--- a/semihosting/syscalls.c
+++ b/semihosting/syscalls.c
@@ -175,6 +175,26 @@ static void gdb_remove(CPUState *cs, gdb_syscall_complete_cb complete,
gdb_do_syscall(complete, "unlink,%s", 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);
+}
+
/*
* Host semihosting syscall implementations.
*/
@@ -337,6 +357,32 @@ static void host_remove(CPUState *cs, gdb_syscall_complete_cb complete,
unlock_user(p, fname, 0);
}
+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_for_gdb() : 0);
+ unlock_user(ostr, oname, 0);
+ unlock_user(nstr, nname, 0);
+}
+
/*
* Static file semihosting syscall implementations.
*/
@@ -592,3 +638,14 @@ void semihost_sys_remove(CPUState *cs, gdb_syscall_complete_cb complete,
host_remove(cs, complete, fname, 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)
+{
+ 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] 83+ messages in thread* [PATCH v3 33/49] semihosting: Split out semihost_sys_system
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (31 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 32/49] semihosting: Split out semihost_sys_rename Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 34/49] semihosting: Create semihost_sys_{stat,fstat} Richard Henderson
` (15 subsequent siblings)
48 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
Split out the non-ARM specific portions of SYS_SYSTEM to a
reusable function.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/syscalls.h | 3 +++
semihosting/arm-compat-semi.c | 12 +---------
semihosting/syscalls.c | 40 ++++++++++++++++++++++++++++++++++
3 files changed, 44 insertions(+), 11 deletions(-)
diff --git a/include/semihosting/syscalls.h b/include/semihosting/syscalls.h
index 21430aa0ef..c9f9e66be1 100644
--- a/include/semihosting/syscalls.h
+++ b/include/semihosting/syscalls.h
@@ -56,4 +56,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_SYSCALLS_H */
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index f02131aebd..9cfa8a421c 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -493,17 +493,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/syscalls.c b/semihosting/syscalls.c
index 96d823e8b3..b6c395af22 100644
--- a/semihosting/syscalls.c
+++ b/semihosting/syscalls.c
@@ -195,6 +195,18 @@ static void gdb_rename(CPUState *cs, gdb_syscall_complete_cb complete,
gdb_do_syscall(complete, "rename,%s,%s", oname, olen, nname, nlen);
}
+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);
+}
+
/*
* Host semihosting syscall implementations.
*/
@@ -383,6 +395,24 @@ static void host_rename(CPUState *cs, gdb_syscall_complete_cb complete,
unlock_user(nstr, nname, 0);
}
+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_for_gdb() : 0);
+ unlock_user(p, cmd, 0);
+}
+
/*
* Static file semihosting syscall implementations.
*/
@@ -649,3 +679,13 @@ void semihost_sys_rename(CPUState *cs, gdb_syscall_complete_cb complete,
host_rename(cs, complete, oname, oname_len, nname, nname_len);
}
}
+
+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] 83+ messages in thread* [PATCH v3 34/49] semihosting: Create semihost_sys_{stat,fstat}
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (32 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 33/49] semihosting: Split out semihost_sys_system Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 35/49] semihosting: Create semihost_sys_gettimeofday Richard Henderson
` (14 subsequent siblings)
48 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
These syscalls will be used by m68k and nios2 semihosting.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/syscalls.h | 7 ++
semihosting/syscalls.c | 137 +++++++++++++++++++++++++++++++++
2 files changed, 144 insertions(+)
diff --git a/include/semihosting/syscalls.h b/include/semihosting/syscalls.h
index c9f9e66be1..ecc97751a9 100644
--- a/include/semihosting/syscalls.h
+++ b/include/semihosting/syscalls.h
@@ -49,6 +49,13 @@ 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_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);
+
void semihost_sys_remove(CPUState *cs, gdb_syscall_complete_cb complete,
target_ulong fname, target_ulong fname_len);
diff --git a/semihosting/syscalls.c b/semihosting/syscalls.c
index b6c395af22..7bc2640512 100644
--- a/semihosting/syscalls.c
+++ b/semihosting/syscalls.c
@@ -93,6 +93,52 @@ static int errno_for_gdb(void)
#undef E
}
+/*
+ * 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 -GDB_EOVERFLOW;
+ }
+
+ p = lock_user(VERIFY_WRITE, addr, sizeof(struct gdb_stat), 0);
+ if (!p) {
+ return -GDB_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;
+}
+
/*
* GDB semihosting syscall implementations.
*/
@@ -163,6 +209,19 @@ static void gdb_fstat(CPUState *cs, gdb_syscall_complete_cb complete,
gdb_do_syscall(complete, "fstat,%x,%x", (target_ulong)gf->hostfd, addr);
}
+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 gdb_remove(CPUState *cs, gdb_syscall_complete_cb complete,
target_ulong fname, target_ulong fname_len)
{
@@ -351,6 +410,51 @@ static void host_flen(CPUState *cs, gdb_syscall_complete_cb complete,
}
}
+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_for_gdb());
+ return;
+ }
+ ret = copy_stat_to_user(cs, addr, &buf);
+ complete(cs, ret ? -1 : 0, ret ? -ret : 0);
+}
+
+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_for_gdb();
+ } 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);
+}
+
static void host_remove(CPUState *cs, gdb_syscall_complete_cb complete,
target_ulong fname, target_ulong fname_len)
{
@@ -659,6 +763,39 @@ void semihost_sys_flen(CPUState *cs, gdb_syscall_complete_cb fstat_cb,
}
}
+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, GDB_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();
+ }
+}
+
+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);
+ }
+}
+
void semihost_sys_remove(CPUState *cs, gdb_syscall_complete_cb complete,
target_ulong fname, target_ulong fname_len)
{
--
2.34.1
^ permalink raw reply related [flat|nested] 83+ messages in thread* [PATCH v3 35/49] semihosting: Create semihost_sys_gettimeofday
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (33 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 34/49] semihosting: Create semihost_sys_{stat,fstat} Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 36/49] gdbstub: Widen gdb_syscall_complete_cb return value Richard Henderson
` (13 subsequent siblings)
48 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
This syscall will be used by m68k and nios2 semihosting.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/syscalls.h | 3 +++
semihosting/syscalls.c | 42 ++++++++++++++++++++++++++++++++++
2 files changed, 45 insertions(+)
diff --git a/include/semihosting/syscalls.h b/include/semihosting/syscalls.h
index ecc97751a9..347200cb9f 100644
--- a/include/semihosting/syscalls.h
+++ b/include/semihosting/syscalls.h
@@ -66,4 +66,7 @@ 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_gettimeofday(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong tv_addr, target_ulong tz_addr);
+
#endif /* SEMIHOSTING_SYSCALLS_H */
diff --git a/semihosting/syscalls.c b/semihosting/syscalls.c
index 7bc2640512..269f750d98 100644
--- a/semihosting/syscalls.c
+++ b/semihosting/syscalls.c
@@ -266,6 +266,12 @@ static void gdb_system(CPUState *cs, gdb_syscall_complete_cb complete,
gdb_do_syscall(complete, "system,%s", cmd, len);
}
+static void gdb_gettimeofday(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong tv_addr, target_ulong tz_addr)
+{
+ gdb_do_syscall(complete, "gettimeofday,%x,%x", tv_addr, tz_addr);
+}
+
/*
* Host semihosting syscall implementations.
*/
@@ -517,6 +523,32 @@ static void host_system(CPUState *cs, gdb_syscall_complete_cb complete,
unlock_user(p, cmd, 0);
}
+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, GDB_EINVAL);
+ return;
+ }
+
+ p = lock_user(VERIFY_WRITE, tv_addr, sizeof(struct gdb_timeval), 0);
+ if (!p) {
+ complete(cs, -1, GDB_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));
+}
+
/*
* Static file semihosting syscall implementations.
*/
@@ -826,3 +858,13 @@ void semihost_sys_system(CPUState *cs, gdb_syscall_complete_cb complete,
host_system(cs, complete, cmd, cmd_len);
}
}
+
+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] 83+ messages in thread* [PATCH v3 36/49] gdbstub: Widen gdb_syscall_complete_cb return value
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (34 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 35/49] semihosting: Create semihost_sys_gettimeofday Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-23 13:32 ` Peter Maydell
2022-05-21 0:03 ` [PATCH v3 37/49] semihosting: Fix docs comment for qemu_semihosting_console_inc Richard Henderson
` (12 subsequent siblings)
48 siblings, 1 reply; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
Always pass a uint64_t. This resolves a FIXME in the
m68k and nios2 semihosting that we've lost data.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/gdbstub.h | 3 +--
gdbstub.c | 7 ++++---
semihosting/arm-compat-semi.c | 9 ++++-----
semihosting/console.c | 7 +++----
semihosting/syscalls.c | 2 +-
target/m68k/m68k-semi.c | 10 +++-------
target/nios2/nios2-semi.c | 8 +++-----
7 files changed, 19 insertions(+), 27 deletions(-)
diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h
index 8e9cdcb1c1..63764a9766 100644
--- a/include/exec/gdbstub.h
+++ b/include/exec/gdbstub.h
@@ -77,8 +77,7 @@ struct gdb_timeval {
#ifdef NEED_CPU_H
#include "cpu.h"
-typedef void (*gdb_syscall_complete_cb)(CPUState *cpu,
- target_ulong ret, target_ulong err);
+typedef void (*gdb_syscall_complete_cb)(CPUState *cpu, uint64_t ret, int err);
/**
* gdb_do_syscall:
diff --git a/gdbstub.c b/gdbstub.c
index a3ff8702ce..5286253f8a 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -1870,11 +1870,12 @@ static void handle_read_all_regs(GArray *params, void *user_ctx)
static void handle_file_io(GArray *params, void *user_ctx)
{
if (params->len >= 1 && gdbserver_state.current_syscall_cb) {
- target_ulong ret, err;
+ uint64_t ret;
+ int err;
- ret = (target_ulong)get_param(params, 0)->val_ull;
+ ret = get_param(params, 0)->val_ull;
if (params->len >= 2) {
- err = (target_ulong)get_param(params, 1)->val_ull;
+ err = get_param(params, 1)->val_ull;
} else {
err = 0;
}
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 9cfa8a421c..3eb9d1c049 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -215,7 +215,7 @@ static inline uint32_t get_swi_errno(CPUState *cs)
#endif
}
-static void common_semi_cb(CPUState *cs, target_ulong ret, target_ulong err)
+static void common_semi_cb(CPUState *cs, uint64_t ret, int err)
{
if (err) {
#ifdef CONFIG_USER_ONLY
@@ -232,7 +232,7 @@ static void common_semi_cb(CPUState *cs, target_ulong ret, target_ulong err)
* SYS_READ and SYS_WRITE always return the number of bytes not read/written.
* There is no error condition, other than returning the original length.
*/
-static void common_semi_rw_cb(CPUState *cs, target_ulong ret, target_ulong err)
+static void common_semi_rw_cb(CPUState *cs, uint64_t ret, int err)
{
/* Recover the original length from the third argument. */
CPUArchState *env G_GNUC_UNUSED = cs->env_ptr;
@@ -250,8 +250,7 @@ static void common_semi_rw_cb(CPUState *cs, target_ulong ret, target_ulong err)
/*
* SYS_SEEK returns 0 on success, not the resulting offset.
*/
-static void common_semi_seek_cb(CPUState *cs, target_ulong ret,
- target_ulong err)
+static void common_semi_seek_cb(CPUState *cs, uint64_t ret, int err)
{
if (!err) {
ret = 0;
@@ -272,7 +271,7 @@ static target_ulong common_semi_flen_buf(CPUState *cs)
}
static void
-common_semi_flen_fstat_cb(CPUState *cs, target_ulong ret, target_ulong err)
+common_semi_flen_fstat_cb(CPUState *cs, uint64_t ret, int err)
{
if (!err) {
/* The size is always stored in big-endian order, extract the value. */
diff --git a/semihosting/console.c b/semihosting/console.c
index ef6958d844..3dd0ac60e2 100644
--- a/semihosting/console.c
+++ b/semihosting/console.c
@@ -64,11 +64,10 @@ static GString *copy_user_string(CPUArchState *env, target_ulong addr)
return s;
}
-static void semihosting_cb(CPUState *cs, target_ulong ret, target_ulong err)
+static void semihosting_cb(CPUState *cs, uint64_t ret, int err)
{
- if (ret == (target_ulong) -1) {
- qemu_log("%s: gdb console output failed ("TARGET_FMT_ld")",
- __func__, err);
+ if (err) {
+ qemu_log("%s: gdb console output failed (%d)", __func__, err);
}
}
diff --git a/semihosting/syscalls.c b/semihosting/syscalls.c
index 269f750d98..4c934654cd 100644
--- a/semihosting/syscalls.c
+++ b/semihosting/syscalls.c
@@ -145,7 +145,7 @@ static int copy_stat_to_user(CPUState *cs, target_ulong addr,
static gdb_syscall_complete_cb gdb_open_complete;
-static void gdb_open_cb(CPUState *cs, target_ulong ret, target_ulong err)
+static void gdb_open_cb(CPUState *cs, uint64_t ret, int err)
{
if (!err) {
int guestfd = alloc_guestfd();
diff --git a/target/m68k/m68k-semi.c b/target/m68k/m68k-semi.c
index da0186f3ef..94deebf09e 100644
--- a/target/m68k/m68k-semi.c
+++ b/target/m68k/m68k-semi.c
@@ -93,7 +93,7 @@ static void translate_stat(CPUM68KState *env, target_ulong addr, struct stat *s)
unlock_user(p, addr, sizeof(struct gdb_stat));
}
-static void m68k_semi_return_u32(CPUM68KState *env, uint32_t ret, uint32_t err)
+static void m68k_semi_return_u32(CPUM68KState *env, uint32_t ret, int err)
{
target_ulong args = env->dregs[1];
if (put_user_u32(ret, args) ||
@@ -108,7 +108,7 @@ static void m68k_semi_return_u32(CPUM68KState *env, uint32_t ret, uint32_t err)
}
}
-static void m68k_semi_return_u64(CPUM68KState *env, uint64_t ret, uint32_t err)
+static void m68k_semi_return_u64(CPUM68KState *env, uint64_t ret, int err)
{
target_ulong args = env->dregs[1];
if (put_user_u32(ret >> 32, args) ||
@@ -122,16 +122,12 @@ static void m68k_semi_return_u64(CPUM68KState *env, uint64_t ret, uint32_t err)
static int m68k_semi_is_fseek;
-static void m68k_semi_cb(CPUState *cs, target_ulong ret, target_ulong err)
+static void m68k_semi_cb(CPUState *cs, uint64_t ret, int err)
{
M68kCPU *cpu = M68K_CPU(cs);
CPUM68KState *env = &cpu->env;
if (m68k_semi_is_fseek) {
- /*
- * FIXME: We've already lost the high bits of the fseek
- * return value.
- */
m68k_semi_return_u64(env, ret, err);
m68k_semi_is_fseek = 0;
} else {
diff --git a/target/nios2/nios2-semi.c b/target/nios2/nios2-semi.c
index 3e504a6c5f..4d02789d26 100644
--- a/target/nios2/nios2-semi.c
+++ b/target/nios2/nios2-semi.c
@@ -108,8 +108,7 @@ static bool translate_stat(CPUNios2State *env, target_ulong addr,
return true;
}
-static void nios2_semi_return_u32(CPUNios2State *env, uint32_t ret,
- uint32_t err)
+static void nios2_semi_return_u32(CPUNios2State *env, uint32_t ret, int err)
{
target_ulong args = env->regs[R_ARG1];
if (put_user_u32(ret, args) ||
@@ -124,8 +123,7 @@ static void nios2_semi_return_u32(CPUNios2State *env, uint32_t ret,
}
}
-static void nios2_semi_return_u64(CPUNios2State *env, uint64_t ret,
- uint32_t err)
+static void nios2_semi_return_u64(CPUNios2State *env, uint64_t ret, int err)
{
target_ulong args = env->regs[R_ARG1];
if (put_user_u32(ret >> 32, args) ||
@@ -139,7 +137,7 @@ static void nios2_semi_return_u64(CPUNios2State *env, uint64_t ret,
static int nios2_semi_is_lseek;
-static void nios2_semi_cb(CPUState *cs, target_ulong ret, target_ulong err)
+static void nios2_semi_cb(CPUState *cs, uint64_t ret, int err)
{
Nios2CPU *cpu = NIOS2_CPU(cs);
CPUNios2State *env = &cpu->env;
--
2.34.1
^ permalink raw reply related [flat|nested] 83+ messages in thread* Re: [PATCH v3 36/49] gdbstub: Widen gdb_syscall_complete_cb return value
2022-05-21 0:03 ` [PATCH v3 36/49] gdbstub: Widen gdb_syscall_complete_cb return value Richard Henderson
@ 2022-05-23 13:32 ` Peter Maydell
0 siblings, 0 replies; 83+ messages in thread
From: Peter Maydell @ 2022-05-23 13:32 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, alex.bennee
On Sat, 21 May 2022 at 01:04, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> Always pass a uint64_t. This resolves a FIXME in the
> m68k and nios2 semihosting that we've lost data.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> include/exec/gdbstub.h | 3 +--
> gdbstub.c | 7 ++++---
> semihosting/arm-compat-semi.c | 9 ++++-----
> semihosting/console.c | 7 +++----
> semihosting/syscalls.c | 2 +-
> target/m68k/m68k-semi.c | 10 +++-------
> target/nios2/nios2-semi.c | 8 +++-----
> 7 files changed, 19 insertions(+), 27 deletions(-)
> -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);
Commit message says we're just changing the return value
handling, but the code also changes the type used for errno.
-- PMM
^ permalink raw reply [flat|nested] 83+ messages in thread
* [PATCH v3 37/49] semihosting: Fix docs comment for qemu_semihosting_console_inc
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (35 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 36/49] gdbstub: Widen gdb_syscall_complete_cb return value Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-23 13:38 ` Peter Maydell
2022-05-21 0:03 ` [PATCH v3 38/49] semihosting: Pass CPUState to qemu_semihosting_console_inc Richard Henderson
` (11 subsequent siblings)
48 siblings, 1 reply; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
The implementation of qemu_semihosting_console_inc does not
defer to gdbstub, but only reads from the fifo in console.c.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/console.h | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/include/semihosting/console.h b/include/semihosting/console.h
index 0238f540f4..4f6217bf10 100644
--- a/include/semihosting/console.h
+++ b/include/semihosting/console.h
@@ -41,11 +41,10 @@ void qemu_semihosting_console_outc(CPUArchState *env, target_ulong c);
* qemu_semihosting_console_inc:
* @env: CPUArchState
*
- * Receive single character from debug console. This may be the remote
- * gdb session if a softmmu guest is currently being debugged. As this
- * call may block if no data is available we suspend the CPU and will
- * re-execute the instruction when data is there. Therefore two
- * conditions must be met:
+ * Receive single character from debug console. As this call may block
+ * if no data is available we suspend the CPU and will re-execute the
+ * instruction when data is there. Therefore two conditions must be met:
+ *
* - CPUState is synchronized before calling this function
* - pc is only updated once the character is successfully returned
*
--
2.34.1
^ permalink raw reply related [flat|nested] 83+ messages in thread* Re: [PATCH v3 37/49] semihosting: Fix docs comment for qemu_semihosting_console_inc
2022-05-21 0:03 ` [PATCH v3 37/49] semihosting: Fix docs comment for qemu_semihosting_console_inc Richard Henderson
@ 2022-05-23 13:38 ` Peter Maydell
0 siblings, 0 replies; 83+ messages in thread
From: Peter Maydell @ 2022-05-23 13:38 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, alex.bennee
On Sat, 21 May 2022 at 01:04, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> The implementation of qemu_semihosting_console_inc does not
> defer to gdbstub, but only reads from the fifo in console.c.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> include/semihosting/console.h | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/include/semihosting/console.h b/include/semihosting/console.h
> index 0238f540f4..4f6217bf10 100644
> --- a/include/semihosting/console.h
> +++ b/include/semihosting/console.h
> @@ -41,11 +41,10 @@ void qemu_semihosting_console_outc(CPUArchState *env, target_ulong c);
> * qemu_semihosting_console_inc:
> * @env: CPUArchState
> *
> - * Receive single character from debug console. This may be the remote
> - * gdb session if a softmmu guest is currently being debugged. As this
> - * call may block if no data is available we suspend the CPU and will
> - * re-execute the instruction when data is there. Therefore two
> - * conditions must be met:
> + * Receive single character from debug console. As this call may block
> + * if no data is available we suspend the CPU and will re-execute the
> + * instruction when data is there. Therefore two conditions must be met:
> + *
> * - CPUState is synchronized before calling this function
> * - pc is only updated once the character is successfully returned
> *
Most functions declared here do use the remote gdb connection,
so I think that like qemu_semihosting_log_out() (whose doc comment
includes a sentence "Unlike..." explaining this) we should
explain why this is an exception to that rule ("Unlike...")
rather than just silently not mentioning it. Having 'inc' not
be reading from the same place that 'outc' writes to is rather
unexpected, after all.
thanks
-- PMM
^ permalink raw reply [flat|nested] 83+ messages in thread
* [PATCH v3 38/49] semihosting: Pass CPUState to qemu_semihosting_console_inc
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (36 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 37/49] semihosting: Fix docs comment for qemu_semihosting_console_inc Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-23 13:39 ` Peter Maydell
2022-05-21 0:03 ` [PATCH v3 39/49] semihosting: Expand qemu_semihosting_console_inc to read Richard Henderson
` (10 subsequent siblings)
48 siblings, 1 reply; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
We don't need CPUArchState, and we do want the CPUState of the
thread performing the operation -- use this instead of current_cpu.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/console.h | 4 ++--
linux-user/semihost.c | 2 +-
semihosting/arm-compat-semi.c | 2 +-
semihosting/console.c | 12 ++++++------
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/include/semihosting/console.h b/include/semihosting/console.h
index 4f6217bf10..afc961057c 100644
--- a/include/semihosting/console.h
+++ b/include/semihosting/console.h
@@ -39,7 +39,7 @@ void qemu_semihosting_console_outc(CPUArchState *env, target_ulong c);
/**
* qemu_semihosting_console_inc:
- * @env: CPUArchState
+ * @: CPUState
*
* Receive single character from debug console. As this call may block
* if no data is available we suspend the CPU and will re-execute the
@@ -50,7 +50,7 @@ void qemu_semihosting_console_outc(CPUArchState *env, target_ulong c);
*
* Returns: character read OR cpu_loop_exit!
*/
-target_ulong qemu_semihosting_console_inc(CPUArchState *env);
+target_ulong qemu_semihosting_console_inc(CPUState *cs);
/**
* qemu_semihosting_log_out:
diff --git a/linux-user/semihost.c b/linux-user/semihost.c
index 17f074ac56..f14c6ae21d 100644
--- a/linux-user/semihost.c
+++ b/linux-user/semihost.c
@@ -56,7 +56,7 @@ void qemu_semihosting_console_outc(CPUArchState *env, target_ulong addr)
* program is expecting more normal behaviour. This is slow but
* nothing using semihosting console reading is expecting to be fast.
*/
-target_ulong qemu_semihosting_console_inc(CPUArchState *env)
+target_ulong qemu_semihosting_console_inc(CPUState *cs)
{
uint8_t c;
struct termios old_tio, new_tio;
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 3eb9d1c049..5d10a2b932 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -415,7 +415,7 @@ void do_common_semihosting(CPUState *cs)
break;
case TARGET_SYS_READC:
- ret = qemu_semihosting_console_inc(env);
+ ret = qemu_semihosting_console_inc(cs);
common_semi_set_ret(cs, ret);
break;
diff --git a/semihosting/console.c b/semihosting/console.c
index 3dd0ac60e2..7b896fe43b 100644
--- a/semihosting/console.c
+++ b/semihosting/console.c
@@ -144,17 +144,17 @@ static void console_read(void *opaque, const uint8_t *buf, int size)
c->sleeping_cpus = NULL;
}
-target_ulong qemu_semihosting_console_inc(CPUArchState *env)
+target_ulong qemu_semihosting_console_inc(CPUState *cs)
{
uint8_t ch;
SemihostingConsole *c = &console;
+
g_assert(qemu_mutex_iothread_locked());
- g_assert(current_cpu);
if (fifo8_is_empty(&c->fifo)) {
- c->sleeping_cpus = g_slist_prepend(c->sleeping_cpus, current_cpu);
- current_cpu->halted = 1;
- current_cpu->exception_index = EXCP_HALTED;
- cpu_loop_exit(current_cpu);
+ c->sleeping_cpus = g_slist_prepend(c->sleeping_cpus, cs);
+ cs->halted = 1;
+ cs->exception_index = EXCP_HALTED;
+ cpu_loop_exit(cs);
/* never returns */
}
ch = fifo8_pop(&c->fifo);
--
2.34.1
^ permalink raw reply related [flat|nested] 83+ messages in thread* [PATCH v3 39/49] semihosting: Expand qemu_semihosting_console_inc to read
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (37 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 38/49] semihosting: Pass CPUState to qemu_semihosting_console_inc Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 40/49] semihosting: Cleanup chardev init Richard Henderson
` (9 subsequent siblings)
48 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
Allow more than one character to be read at one time.
Will be used by m68k and nios2 semihosting for stdio.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/console.h | 14 ++++++++------
linux-user/semihost.c | 10 ++++++----
semihosting/arm-compat-semi.c | 11 +++++++++--
semihosting/console.c | 16 ++++++++++++----
4 files changed, 35 insertions(+), 16 deletions(-)
diff --git a/include/semihosting/console.h b/include/semihosting/console.h
index afc961057c..39dbf1b062 100644
--- a/include/semihosting/console.h
+++ b/include/semihosting/console.h
@@ -38,19 +38,21 @@ int qemu_semihosting_console_outs(CPUArchState *env, target_ulong s);
void qemu_semihosting_console_outc(CPUArchState *env, target_ulong c);
/**
- * qemu_semihosting_console_inc:
- * @: CPUState
+ * qemu_semihosting_console_read:
+ * @cs: CPUState
+ * @buf: host buffer
+ * @len: buffer size
*
- * Receive single character from debug console. As this call may block
- * if no data is available we suspend the CPU and will re-execute the
+ * Receive at least one character from debug console. As this call may
+ * block if no data is available we suspend the CPU and will re-execute the
* instruction when data is there. Therefore two conditions must be met:
*
* - CPUState is synchronized before calling this function
* - pc is only updated once the character is successfully returned
*
- * Returns: character read OR cpu_loop_exit!
+ * Returns: number of characters read, OR cpu_loop_exit!
*/
-target_ulong qemu_semihosting_console_inc(CPUState *cs);
+int qemu_semihosting_console_read(CPUState *cs, void *buf, int len);
/**
* qemu_semihosting_log_out:
diff --git a/linux-user/semihost.c b/linux-user/semihost.c
index f14c6ae21d..2029fb674c 100644
--- a/linux-user/semihost.c
+++ b/linux-user/semihost.c
@@ -56,21 +56,23 @@ void qemu_semihosting_console_outc(CPUArchState *env, target_ulong addr)
* program is expecting more normal behaviour. This is slow but
* nothing using semihosting console reading is expecting to be fast.
*/
-target_ulong qemu_semihosting_console_inc(CPUState *cs)
+int qemu_semihosting_console_read(CPUState *cs, void *buf, int len)
{
- uint8_t c;
+ int ret;
struct termios old_tio, new_tio;
/* Disable line-buffering and echo */
tcgetattr(STDIN_FILENO, &old_tio);
new_tio = old_tio;
new_tio.c_lflag &= (~ICANON & ~ECHO);
+ new_tio.c_cc[VMIN] = 1;
+ new_tio.c_cc[VTIME] = 0;
tcsetattr(STDIN_FILENO, TCSANOW, &new_tio);
- c = getchar();
+ ret = fread(buf, 1, len, stdin);
/* restore config */
tcsetattr(STDIN_FILENO, TCSANOW, &old_tio);
- return (target_ulong) c;
+ return ret;
}
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 5d10a2b932..20d97290ff 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -415,8 +415,15 @@ void do_common_semihosting(CPUState *cs)
break;
case TARGET_SYS_READC:
- ret = qemu_semihosting_console_inc(cs);
- common_semi_set_ret(cs, ret);
+ {
+ uint8_t ch;
+ int ret = qemu_semihosting_console_read(cs, &ch, 1);
+ if (ret == 1) {
+ common_semi_cb(cs, ch, 0);
+ } else {
+ common_semi_cb(cs, -1, EIO);
+ }
+ }
break;
case TARGET_SYS_ISERROR:
diff --git a/semihosting/console.c b/semihosting/console.c
index 7b896fe43b..df618a28a4 100644
--- a/semihosting/console.c
+++ b/semihosting/console.c
@@ -144,12 +144,14 @@ static void console_read(void *opaque, const uint8_t *buf, int size)
c->sleeping_cpus = NULL;
}
-target_ulong qemu_semihosting_console_inc(CPUState *cs)
+int qemu_semihosting_console_read(CPUState *cs, void *buf, int len)
{
- uint8_t ch;
SemihostingConsole *c = &console;
+ int ret = 0;
g_assert(qemu_mutex_iothread_locked());
+
+ /* Block if the fifo is completely empty. */
if (fifo8_is_empty(&c->fifo)) {
c->sleeping_cpus = g_slist_prepend(c->sleeping_cpus, cs);
cs->halted = 1;
@@ -157,8 +159,14 @@ target_ulong qemu_semihosting_console_inc(CPUState *cs)
cpu_loop_exit(cs);
/* never returns */
}
- ch = fifo8_pop(&c->fifo);
- return (target_ulong) ch;
+
+ /* Read until buffer full or fifo exhausted. */
+ do {
+ *(char *)(buf + ret) = fifo8_pop(&c->fifo);
+ ret++;
+ } while (ret < len && !fifo8_is_empty(&c->fifo));
+
+ return ret;
}
void qemu_semihosting_console_init(void)
--
2.34.1
^ permalink raw reply related [flat|nested] 83+ messages in thread* [PATCH v3 40/49] semihosting: Cleanup chardev init
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (38 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 39/49] semihosting: Expand qemu_semihosting_console_inc to read Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 41/49] semihosting: Create qemu_semihosting_console_write Richard Henderson
` (8 subsequent siblings)
48 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
Rename qemu_semihosting_connect_chardevs to
qemu_semihosting_chardev_init; pass the result
directly to qemu_semihosting_console_init.
Store the chardev in SemihostingConsole instead
of SemihostingConfig, which lets us drop
semihosting_get_chardev.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/semihost.h | 13 ++-----------
semihosting/config.c | 17 +++++++----------
semihosting/console.c | 31 +++++++++++++++----------------
softmmu/vl.c | 3 +--
stubs/semihost.c | 6 +-----
5 files changed, 26 insertions(+), 44 deletions(-)
diff --git a/include/semihosting/semihost.h b/include/semihosting/semihost.h
index 0c55ade3ac..5b36a76f08 100644
--- a/include/semihosting/semihost.h
+++ b/include/semihosting/semihost.h
@@ -51,14 +51,6 @@ static inline const char *semihosting_get_cmdline(void)
{
return NULL;
}
-
-static inline Chardev *semihosting_get_chardev(void)
-{
- return NULL;
-}
-static inline void qemu_semihosting_console_init(void)
-{
-}
#else /* !CONFIG_USER_ONLY */
bool semihosting_enabled(void);
SemihostingTarget semihosting_get_target(void);
@@ -66,12 +58,11 @@ const char *semihosting_get_arg(int i);
int semihosting_get_argc(void);
const char *semihosting_get_cmdline(void);
void semihosting_arg_fallback(const char *file, const char *cmd);
-Chardev *semihosting_get_chardev(void);
/* for vl.c hooks */
void qemu_semihosting_enable(void);
int qemu_semihosting_config_options(const char *opt);
-void qemu_semihosting_connect_chardevs(void);
-void qemu_semihosting_console_init(void);
+void qemu_semihosting_chardev_init(void);
+void qemu_semihosting_console_init(Chardev *);
#endif /* CONFIG_USER_ONLY */
#endif /* SEMIHOST_H */
diff --git a/semihosting/config.c b/semihosting/config.c
index 50d82108e6..4bca769fad 100644
--- a/semihosting/config.c
+++ b/semihosting/config.c
@@ -50,7 +50,6 @@ QemuOptsList qemu_semihosting_config_opts = {
typedef struct SemihostingConfig {
bool enabled;
SemihostingTarget target;
- Chardev *chardev;
char **argv;
int argc;
const char *cmdline; /* concatenated argv */
@@ -121,11 +120,6 @@ void semihosting_arg_fallback(const char *file, const char *cmd)
}
}
-Chardev *semihosting_get_chardev(void)
-{
- return semihosting.chardev;
-}
-
void qemu_semihosting_enable(void)
{
semihosting.enabled = true;
@@ -171,16 +165,19 @@ int qemu_semihosting_config_options(const char *optarg)
return 0;
}
-void qemu_semihosting_connect_chardevs(void)
+/* We had to defer this until chardevs were created */
+void qemu_semihosting_chardev_init(void)
{
- /* We had to defer this until chardevs were created */
+ Chardev *chr = NULL;
+
if (semihost_chardev) {
- Chardev *chr = qemu_chr_find(semihost_chardev);
+ chr = qemu_chr_find(semihost_chardev);
if (chr == NULL) {
error_report("semihosting chardev '%s' not found",
semihost_chardev);
exit(1);
}
- semihosting.chardev = chr;
}
+
+ qemu_semihosting_console_init(chr);
}
diff --git a/semihosting/console.c b/semihosting/console.c
index df618a28a4..4088192842 100644
--- a/semihosting/console.c
+++ b/semihosting/console.c
@@ -27,11 +27,21 @@
#include "qapi/error.h"
#include "qemu/fifo8.h"
+/* Access to this structure is protected by the BQL */
+typedef struct SemihostingConsole {
+ CharBackend backend;
+ Chardev *chr;
+ GSList *sleeping_cpus;
+ bool got;
+ Fifo8 fifo;
+} SemihostingConsole;
+
+static SemihostingConsole console;
+
int qemu_semihosting_log_out(const char *s, int len)
{
- Chardev *chardev = semihosting_get_chardev();
- if (chardev) {
- return qemu_chr_write_all(chardev, (uint8_t *) s, len);
+ if (console.chr) {
+ return qemu_chr_write_all(console.chr, (uint8_t *) s, len);
} else {
return write(STDERR_FILENO, s, len);
}
@@ -106,16 +116,6 @@ void qemu_semihosting_console_outc(CPUArchState *env, target_ulong addr)
#define FIFO_SIZE 1024
-/* Access to this structure is protected by the BQL */
-typedef struct SemihostingConsole {
- CharBackend backend;
- GSList *sleeping_cpus;
- bool got;
- Fifo8 fifo;
-} SemihostingConsole;
-
-static SemihostingConsole console;
-
static int console_can_read(void *opaque)
{
SemihostingConsole *c = opaque;
@@ -169,10 +169,9 @@ int qemu_semihosting_console_read(CPUState *cs, void *buf, int len)
return ret;
}
-void qemu_semihosting_console_init(void)
+void qemu_semihosting_console_init(Chardev *chr)
{
- Chardev *chr = semihosting_get_chardev();
-
+ console.chr = chr;
if (chr) {
fifo8_create(&console.fifo, FIFO_SIZE);
qemu_chr_fe_init(&console.backend, chr, &error_abort);
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 84a31eba76..3395c877aa 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -2041,8 +2041,7 @@ static void qemu_create_late_backends(void)
exit(1);
/* now chardevs have been created we may have semihosting to connect */
- qemu_semihosting_connect_chardevs();
- qemu_semihosting_console_init();
+ qemu_semihosting_chardev_init();
}
static void cxl_set_opts(void)
diff --git a/stubs/semihost.c b/stubs/semihost.c
index 4bf2cf71b9..f486651afb 100644
--- a/stubs/semihost.c
+++ b/stubs/semihost.c
@@ -65,10 +65,6 @@ void semihosting_arg_fallback(const char *file, const char *cmd)
{
}
-void qemu_semihosting_connect_chardevs(void)
-{
-}
-
-void qemu_semihosting_console_init(void)
+void qemu_semihosting_chardev_init(void)
{
}
--
2.34.1
^ permalink raw reply related [flat|nested] 83+ messages in thread* [PATCH v3 41/49] semihosting: Create qemu_semihosting_console_write
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (39 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 40/49] semihosting: Cleanup chardev init Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 42/49] semihosting: Add GuestFDConsole Richard Henderson
` (7 subsequent siblings)
48 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
Will replace qemu_semihosting_console_{outs,outc},
but we need more plumbing first.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/console.h | 12 ++++++++++++
linux-user/semihost.c | 5 +++++
semihosting/console.c | 9 +++++++++
3 files changed, 26 insertions(+)
diff --git a/include/semihosting/console.h b/include/semihosting/console.h
index 39dbf1b062..6994f23c82 100644
--- a/include/semihosting/console.h
+++ b/include/semihosting/console.h
@@ -54,6 +54,18 @@ void qemu_semihosting_console_outc(CPUArchState *env, target_ulong c);
*/
int qemu_semihosting_console_read(CPUState *cs, void *buf, int len);
+/**
+ * qemu_semihosting_console_write:
+ * @buf: host buffer
+ * @len: buffer size
+ *
+ * Write len bytes from buf to the debug console.
+ *
+ * Returns: number of bytes written -- this should only ever be short
+ * on some sort of i/o error.
+ */
+int qemu_semihosting_console_write(void *buf, int len);
+
/**
* qemu_semihosting_log_out:
* @s: pointer to string
diff --git a/linux-user/semihost.c b/linux-user/semihost.c
index 2029fb674c..871edf993a 100644
--- a/linux-user/semihost.c
+++ b/linux-user/semihost.c
@@ -76,3 +76,8 @@ int qemu_semihosting_console_read(CPUState *cs, void *buf, int len)
return ret;
}
+
+int qemu_semihosting_console_write(void *buf, int len)
+{
+ return fwrite(buf, 1, len, stderr);
+}
diff --git a/semihosting/console.c b/semihosting/console.c
index 4088192842..b6a342744d 100644
--- a/semihosting/console.c
+++ b/semihosting/console.c
@@ -169,6 +169,15 @@ int qemu_semihosting_console_read(CPUState *cs, void *buf, int len)
return ret;
}
+int qemu_semihosting_console_write(void *buf, int len)
+{
+ if (console.chr) {
+ return qemu_chr_write_all(console.chr, (uint8_t *)buf, len);
+ } else {
+ return fwrite(buf, 1, len, stderr);
+ }
+}
+
void qemu_semihosting_console_init(Chardev *chr)
{
console.chr = chr;
--
2.34.1
^ permalink raw reply related [flat|nested] 83+ messages in thread* [PATCH v3 42/49] semihosting: Add GuestFDConsole
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (40 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 41/49] semihosting: Create qemu_semihosting_console_write Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 43/49] semihosting: Create qemu_semihosting_guestfd_init Richard Henderson
` (6 subsequent siblings)
48 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
Add a GuestFDType for connecting to the semihosting console.
Hook up to read, write, isatty, and fstat syscalls.
Note that the arm-specific syscall flen cannot be applied
to the console, because the console is not a descriptor
exposed to the guest.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/guestfd.h | 7 ++--
semihosting/syscalls.c | 68 +++++++++++++++++++++++++++++++++++
2 files changed, 72 insertions(+), 3 deletions(-)
diff --git a/include/semihosting/guestfd.h b/include/semihosting/guestfd.h
index ef268abe85..a7ea1041ea 100644
--- a/include/semihosting/guestfd.h
+++ b/include/semihosting/guestfd.h
@@ -13,9 +13,10 @@
typedef enum GuestFDType {
GuestFDUnused = 0,
- GuestFDHost = 1,
- GuestFDGDB = 2,
- GuestFDStatic = 3,
+ GuestFDHost,
+ GuestFDGDB,
+ GuestFDStatic,
+ GuestFDConsole,
} GuestFDType;
/*
diff --git a/semihosting/syscalls.c b/semihosting/syscalls.c
index 4c934654cd..aa4ee47649 100644
--- a/semihosting/syscalls.c
+++ b/semihosting/syscalls.c
@@ -10,6 +10,7 @@
#include "exec/gdbstub.h"
#include "semihosting/guestfd.h"
#include "semihosting/syscalls.h"
+#include "semihosting/console.h"
#ifdef CONFIG_USER_ONLY
#include "qemu.h"
#else
@@ -607,6 +608,56 @@ static void staticfile_flen(CPUState *cs, gdb_syscall_complete_cb complete,
complete(cs, gf->staticfile.len, 0);
}
+/*
+ * Console semihosting syscall implementations.
+ */
+
+static void console_read(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf, target_ulong buf, target_ulong len)
+{
+ CPUArchState *env G_GNUC_UNUSED = cs->env_ptr;
+ char *ptr;
+ int ret;
+
+ ptr = lock_user(VERIFY_WRITE, buf, len, 0);
+ if (!ptr) {
+ complete(cs, -1, EFAULT);
+ return;
+ }
+ ret = qemu_semihosting_console_read(cs, ptr, len);
+ complete(cs, ret, 0);
+ unlock_user(ptr, buf, ret);
+}
+
+static void console_write(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf, target_ulong buf, target_ulong len)
+{
+ CPUArchState *env G_GNUC_UNUSED = cs->env_ptr;
+ char *ptr = lock_user(VERIFY_READ, buf, len, 1);
+ int ret;
+
+ if (!ptr) {
+ complete(cs, -1, EFAULT);
+ return;
+ }
+ ret = qemu_semihosting_console_write(ptr, len);
+ complete(cs, ret ? ret : -1, ret ? 0 : EIO);
+ unlock_user(ptr, buf, ret);
+}
+
+static void console_fstat(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf, target_ulong addr)
+{
+ static const struct stat tty_buf = {
+ .st_mode = 020666, /* S_IFCHR, ugo+rw */
+ .st_rdev = 5, /* makedev(5, 0) -- linux /dev/tty */
+ };
+ int ret;
+
+ ret = copy_stat_to_user(cs, addr, &tty_buf);
+ complete(cs, ret ? -1 : 0, ret ? -ret : 0);
+}
+
/*
* Syscall entry points.
*/
@@ -638,6 +689,7 @@ void semihost_sys_close(CPUState *cs, gdb_syscall_complete_cb complete, int fd)
host_close(cs, complete, gf);
break;
case GuestFDStatic:
+ case GuestFDConsole:
complete(cs, 0, 0);
break;
default:
@@ -667,6 +719,9 @@ void semihost_sys_read_gf(CPUState *cs, gdb_syscall_complete_cb complete,
case GuestFDStatic:
staticfile_read(cs, complete, gf, buf, len);
break;
+ case GuestFDConsole:
+ console_read(cs, complete, gf, buf, len);
+ break;
default:
g_assert_not_reached();
}
@@ -702,6 +757,9 @@ void semihost_sys_write_gf(CPUState *cs, gdb_syscall_complete_cb complete,
case GuestFDHost:
host_write(cs, complete, gf, buf, len);
break;
+ case GuestFDConsole:
+ console_write(cs, complete, gf, buf, len);
+ break;
case GuestFDStatic:
/* Static files are never open for writing: EBADF. */
complete(cs, -1, GDB_EBADF);
@@ -742,6 +800,9 @@ void semihost_sys_lseek(CPUState *cs, gdb_syscall_complete_cb complete,
case GuestFDStatic:
staticfile_lseek(cs, complete, gf, off, gdb_whence);
break;
+ case GuestFDConsole:
+ complete(cs, -1, ESPIPE);
+ break;
default:
g_assert_not_reached();
}
@@ -765,6 +826,9 @@ void semihost_sys_isatty(CPUState *cs, gdb_syscall_complete_cb complete, int fd)
case GuestFDStatic:
complete(cs, 0, GDB_ENOTTY);
break;
+ case GuestFDConsole:
+ complete(cs, 1, 0);
+ break;
default:
g_assert_not_reached();
}
@@ -790,6 +854,7 @@ void semihost_sys_flen(CPUState *cs, gdb_syscall_complete_cb fstat_cb,
case GuestFDStatic:
staticfile_flen(cs, flen_cb, gf);
break;
+ case GuestFDConsole:
default:
g_assert_not_reached();
}
@@ -811,6 +876,9 @@ void semihost_sys_fstat(CPUState *cs, gdb_syscall_complete_cb complete,
case GuestFDHost:
host_fstat(cs, complete, gf, addr);
break;
+ case GuestFDConsole:
+ console_fstat(cs, complete, gf, addr);
+ break;
case GuestFDStatic:
default:
g_assert_not_reached();
--
2.34.1
^ permalink raw reply related [flat|nested] 83+ messages in thread* [PATCH v3 43/49] semihosting: Create qemu_semihosting_guestfd_init
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (41 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 42/49] semihosting: Add GuestFDConsole Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 44/49] semihosting: Use console_in_gf for SYS_READC Richard Henderson
` (5 subsequent siblings)
48 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
For arm-compat, initialize console_{in,out}_gf;
otherwise, initialize stdio file descriptors.
This will go some way to cleaning up arm-compat, and
will allow other semihosting to use normal stdio.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/guestfd.h | 7 +++++
include/semihosting/semihost.h | 1 +
linux-user/main.c | 9 ++++++
semihosting/console.c | 2 ++
semihosting/guestfd.c | 52 +++++++++++++++++++++++++++-------
5 files changed, 61 insertions(+), 10 deletions(-)
diff --git a/include/semihosting/guestfd.h b/include/semihosting/guestfd.h
index a7ea1041ea..3d426fedab 100644
--- a/include/semihosting/guestfd.h
+++ b/include/semihosting/guestfd.h
@@ -35,6 +35,13 @@ typedef struct GuestFD {
};
} GuestFD;
+/*
+ * For ARM semihosting, we have a separate structure for routing
+ * data for the console which is outside the guest fd address space.
+ */
+extern GuestFD console_in_gf;
+extern GuestFD console_out_gf;
+
/**
* alloc_guestfd:
*
diff --git a/include/semihosting/semihost.h b/include/semihosting/semihost.h
index 5b36a76f08..93a3c21b44 100644
--- a/include/semihosting/semihost.h
+++ b/include/semihosting/semihost.h
@@ -64,5 +64,6 @@ int qemu_semihosting_config_options(const char *opt);
void qemu_semihosting_chardev_init(void);
void qemu_semihosting_console_init(Chardev *);
#endif /* CONFIG_USER_ONLY */
+void qemu_semihosting_guestfd_init(void);
#endif /* SEMIHOST_H */
diff --git a/linux-user/main.c b/linux-user/main.c
index 7ca48664e4..7faf390df9 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -54,6 +54,10 @@
#include "loader.h"
#include "user-mmap.h"
+#ifdef CONFIG_SEMIHOSTING
+#include "semihosting/semihost.h"
+#endif
+
#ifndef AT_FLAGS_PRESERVE_ARGV0
#define AT_FLAGS_PRESERVE_ARGV0_BIT 0
#define AT_FLAGS_PRESERVE_ARGV0 (1 << AT_FLAGS_PRESERVE_ARGV0_BIT)
@@ -906,6 +910,11 @@ int main(int argc, char **argv, char **envp)
}
gdb_handlesig(cpu, 0);
}
+
+#ifdef CONFIG_SEMIHOSTING
+ qemu_semihosting_guestfd_init();
+#endif
+
cpu_loop(env);
/* never exits */
return 0;
diff --git a/semihosting/console.c b/semihosting/console.c
index b6a342744d..677ec2b176 100644
--- a/semihosting/console.c
+++ b/semihosting/console.c
@@ -190,4 +190,6 @@ void qemu_semihosting_console_init(Chardev *chr)
NULL, NULL, &console,
NULL, true);
}
+
+ qemu_semihosting_guestfd_init();
}
diff --git a/semihosting/guestfd.c b/semihosting/guestfd.c
index e3122ebba9..b05c52f26f 100644
--- a/semihosting/guestfd.c
+++ b/semihosting/guestfd.c
@@ -10,15 +10,56 @@
#include "qemu/osdep.h"
#include "exec/gdbstub.h"
+#include "semihosting/semihost.h"
#include "semihosting/guestfd.h"
#ifdef CONFIG_USER_ONLY
#include "qemu.h"
#else
#include "semihosting/softmmu-uaccess.h"
+#include CONFIG_DEVICES
#endif
static GArray *guestfd_array;
+#ifdef CONFIG_ARM_COMPATIBLE_SEMIHOSTING
+GuestFD console_in_gf;
+GuestFD console_out_gf;
+#endif
+
+void qemu_semihosting_guestfd_init(void)
+{
+ /* New entries zero-initialized, i.e. type GuestFDUnused */
+ guestfd_array = g_array_new(FALSE, TRUE, sizeof(GuestFD));
+
+#ifdef CONFIG_ARM_COMPATIBLE_SEMIHOSTING
+ /* For ARM-compat, the console is in a separate namespace. */
+ if (use_gdb_syscalls()) {
+ console_in_gf.type = GuestFDGDB;
+ console_in_gf.hostfd = 0;
+ console_out_gf.type = GuestFDGDB;
+ console_out_gf.hostfd = 2;
+ } else {
+ console_in_gf.type = GuestFDConsole;
+ console_out_gf.type = GuestFDConsole;
+ }
+#else
+ /* Otherwise, the stdio file descriptors apply. */
+ guestfd_array = g_array_set_size(guestfd_array, 3);
+#ifndef CONFIG_USER_ONLY
+ if (!use_gdb_syscalls()) {
+ GuestFD *gf = &g_array_index(guestfd_array, GuestFD, 0);
+ gf[0].type = GuestFDConsole;
+ gf[1].type = GuestFDConsole;
+ gf[2].type = GuestFDConsole;
+ return;
+ }
+#endif
+ associate_guestfd(0, 0);
+ associate_guestfd(1, 1);
+ associate_guestfd(2, 2);
+#endif
+}
+
/*
* Allocate a new guest file descriptor and return it; if we
* couldn't allocate a new fd then return -1.
@@ -30,11 +71,6 @@ 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);
@@ -61,11 +97,7 @@ static void do_dealloc_guestfd(GuestFD *gf)
*/
static GuestFD *do_get_guestfd(int guestfd)
{
- if (!guestfd_array) {
- return NULL;
- }
-
- if (guestfd <= 0 || guestfd >= guestfd_array->len) {
+ if (guestfd < 0 || guestfd >= guestfd_array->len) {
return NULL;
}
--
2.34.1
^ permalink raw reply related [flat|nested] 83+ messages in thread* [PATCH v3 44/49] semihosting: Use console_in_gf for SYS_READC
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (42 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 43/49] semihosting: Create qemu_semihosting_guestfd_init Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 45/49] semihosting: Use console_out_gf for SYS_WRITEC Richard Henderson
` (4 subsequent siblings)
48 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
semihosting/arm-compat-semi.c | 27 ++++++++++++++++++---------
1 file changed, 18 insertions(+), 9 deletions(-)
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 20d97290ff..9230c69ff2 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -290,6 +290,22 @@ common_semi_flen_fstat_cb(CPUState *cs, uint64_t ret, int err)
common_semi_cb(cs, ret, err);
}
+static void
+common_semi_readc_cb(CPUState *cs, uint64_t ret, int err)
+{
+ if (!err) {
+ CPUArchState *env G_GNUC_UNUSED = cs->env_ptr;
+ uint8_t ch;
+
+ if (get_user_u8(ch, common_semi_stack_bottom(cs) - 1)) {
+ ret = -1, err = EFAULT;
+ } else {
+ ret = ch;
+ }
+ }
+ common_semi_cb(cs, ret, err);
+}
+
#define SHFB_MAGIC_0 0x53
#define SHFB_MAGIC_1 0x48
#define SHFB_MAGIC_2 0x46
@@ -415,15 +431,8 @@ void do_common_semihosting(CPUState *cs)
break;
case TARGET_SYS_READC:
- {
- uint8_t ch;
- int ret = qemu_semihosting_console_read(cs, &ch, 1);
- if (ret == 1) {
- common_semi_cb(cs, ch, 0);
- } else {
- common_semi_cb(cs, -1, EIO);
- }
- }
+ semihost_sys_read_gf(cs, common_semi_readc_cb, &console_in_gf,
+ common_semi_stack_bottom(cs) - 1, 1);
break;
case TARGET_SYS_ISERROR:
--
2.34.1
^ permalink raw reply related [flat|nested] 83+ messages in thread* [PATCH v3 45/49] semihosting: Use console_out_gf for SYS_WRITEC
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (43 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 44/49] semihosting: Use console_in_gf for SYS_READC Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 46/49] semihosting: Remove qemu_semihosting_console_outc Richard Henderson
` (3 subsequent siblings)
48 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
semihosting/arm-compat-semi.c | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 9230c69ff2..e24e9284c2 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -228,6 +228,15 @@ static void common_semi_cb(CPUState *cs, uint64_t ret, int err)
common_semi_set_ret(cs, ret);
}
+/*
+ * Use 0xdeadbeef as the return value when there isn't a defined
+ * return value for the call.
+ */
+static void common_semi_dead_cb(CPUState *cs, uint64_t ret, int err)
+{
+ common_semi_set_ret(cs, 0xdeadbeef);
+}
+
/*
* 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.
@@ -329,8 +338,7 @@ static const uint8_t featurefile_data[] = {
* The specification always says that the "return register" either
* returns a specific value or is corrupted, so we don't need to
* report to our caller whether we are returning a value or trying to
- * leave the register unchanged. We use 0xdeadbeef as the return value
- * when there isn't a defined return value for the call.
+ * leave the register unchanged.
*/
void do_common_semihosting(CPUState *cs)
{
@@ -407,8 +415,12 @@ void do_common_semihosting(CPUState *cs)
break;
case TARGET_SYS_WRITEC:
- qemu_semihosting_console_outc(env, args);
- common_semi_set_ret(cs, 0xdeadbeef);
+ /*
+ * FIXME: the byte to be written is in a target_ulong slot,
+ * which means this is wrong for a big-endian guest.
+ */
+ semihost_sys_write_gf(cs, common_semi_dead_cb,
+ &console_out_gf, args, 1);
break;
case TARGET_SYS_WRITE0:
--
2.34.1
^ permalink raw reply related [flat|nested] 83+ messages in thread* [PATCH v3 46/49] semihosting: Remove qemu_semihosting_console_outc
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (44 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 45/49] semihosting: Use console_out_gf for SYS_WRITEC Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 47/49] semihosting: Use console_out_gf for SYS_WRITE0 Richard Henderson
` (2 subsequent siblings)
48 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
This function has been replaced by *_write.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/console.h | 13 -------------
linux-user/semihost.c | 16 ----------------
semihosting/console.c | 18 ------------------
3 files changed, 47 deletions(-)
diff --git a/include/semihosting/console.h b/include/semihosting/console.h
index 6994f23c82..d6c1cc58ab 100644
--- a/include/semihosting/console.h
+++ b/include/semihosting/console.h
@@ -24,19 +24,6 @@
*/
int qemu_semihosting_console_outs(CPUArchState *env, target_ulong s);
-/**
- * qemu_semihosting_console_outc:
- * @env: CPUArchState
- * @s: host address of null terminated guest string
- *
- * Send single character from guest memory to the debug console. This
- * may be the remote gdb session if a softmmu guest is currently being
- * debugged.
- *
- * Returns: nothing
- */
-void qemu_semihosting_console_outc(CPUArchState *env, target_ulong c);
-
/**
* qemu_semihosting_console_read:
* @cs: CPUState
diff --git a/linux-user/semihost.c b/linux-user/semihost.c
index 871edf993a..f8bc8889f3 100644
--- a/linux-user/semihost.c
+++ b/linux-user/semihost.c
@@ -33,22 +33,6 @@ int qemu_semihosting_console_outs(CPUArchState *env, target_ulong addr)
return len;
}
-void qemu_semihosting_console_outc(CPUArchState *env, target_ulong addr)
-{
- char c;
-
- if (get_user_u8(c, addr)) {
- qemu_log_mask(LOG_GUEST_ERROR,
- "%s: passed inaccessible address " TARGET_FMT_lx,
- __func__, addr);
- } else {
- if (write(STDERR_FILENO, &c, 1) != 1) {
- qemu_log_mask(LOG_UNIMP, "%s: unexpected write to stdout failure",
- __func__);
- }
- }
-}
-
/*
* For linux-user we can safely block. However as we want to return as
* soon as a character is read we need to tweak the termio to disable
diff --git a/semihosting/console.c b/semihosting/console.c
index 677ec2b176..f6fab5933a 100644
--- a/semihosting/console.c
+++ b/semihosting/console.c
@@ -96,24 +96,6 @@ int qemu_semihosting_console_outs(CPUArchState *env, target_ulong addr)
return out;
}
-void qemu_semihosting_console_outc(CPUArchState *env, target_ulong addr)
-{
- CPUState *cpu = env_cpu(env);
- uint8_t c;
-
- if (cpu_memory_rw_debug(cpu, addr, &c, 1, 0) == 0) {
- if (use_gdb_syscalls()) {
- gdb_do_syscall(semihosting_cb, "write,2,%x,%x", addr, 1);
- } else {
- qemu_semihosting_log_out((const char *) &c, 1);
- }
- } else {
- qemu_log_mask(LOG_GUEST_ERROR,
- "%s: passed inaccessible address " TARGET_FMT_lx,
- __func__, addr);
- }
-}
-
#define FIFO_SIZE 1024
static int console_can_read(void *opaque)
--
2.34.1
^ permalink raw reply related [flat|nested] 83+ messages in thread* [PATCH v3 47/49] semihosting: Use console_out_gf for SYS_WRITE0
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (45 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 46/49] semihosting: Remove qemu_semihosting_console_outc Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-21 0:03 ` [PATCH v3 48/49] semihosting: Remove qemu_semihosting_console_outs Richard Henderson
2022-05-21 0:04 ` [PATCH v3 49/49] semihosting: Create semihost_sys_poll_one Richard Henderson
48 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
semihosting/arm-compat-semi.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index e24e9284c2..1e4c931327 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -424,8 +424,15 @@ void do_common_semihosting(CPUState *cs)
break;
case TARGET_SYS_WRITE0:
- ret = qemu_semihosting_console_outs(env, args);
- common_semi_set_ret(cs, ret);
+ {
+ ssize_t len = target_strlen(args);
+ if (len < 0) {
+ common_semi_dead_cb(cs, -1, EFAULT);
+ } else {
+ semihost_sys_write_gf(cs, common_semi_dead_cb,
+ &console_out_gf, args, len);
+ }
+ }
break;
case TARGET_SYS_WRITE:
--
2.34.1
^ permalink raw reply related [flat|nested] 83+ messages in thread* [PATCH v3 48/49] semihosting: Remove qemu_semihosting_console_outs
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (46 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 47/49] semihosting: Use console_out_gf for SYS_WRITE0 Richard Henderson
@ 2022-05-21 0:03 ` Richard Henderson
2022-05-21 0:04 ` [PATCH v3 49/49] semihosting: Create semihost_sys_poll_one Richard Henderson
48 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:03 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
This function has been replaced by *_write.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/console.h | 13 ----------
linux-user/semihost.c | 17 ------------
semihosting/console.c | 49 -----------------------------------
3 files changed, 79 deletions(-)
diff --git a/include/semihosting/console.h b/include/semihosting/console.h
index d6c1cc58ab..20c31d89d4 100644
--- a/include/semihosting/console.h
+++ b/include/semihosting/console.h
@@ -11,19 +11,6 @@
#include "cpu.h"
-/**
- * qemu_semihosting_console_outs:
- * @env: CPUArchState
- * @s: host address of null terminated guest string
- *
- * Send a null terminated guest string to the debug console. This may
- * be the remote gdb session if a softmmu guest is currently being
- * debugged.
- *
- * Returns: number of bytes written.
- */
-int qemu_semihosting_console_outs(CPUArchState *env, target_ulong s);
-
/**
* qemu_semihosting_console_read:
* @cs: CPUState
diff --git a/linux-user/semihost.c b/linux-user/semihost.c
index f8bc8889f3..cee62a365c 100644
--- a/linux-user/semihost.c
+++ b/linux-user/semihost.c
@@ -16,23 +16,6 @@
#include "user-internals.h"
#include <termios.h>
-int qemu_semihosting_console_outs(CPUArchState *env, target_ulong addr)
-{
- int len = target_strlen(addr);
- void *s;
- if (len < 0){
- qemu_log_mask(LOG_GUEST_ERROR,
- "%s: passed inaccessible address " TARGET_FMT_lx,
- __func__, addr);
- return 0;
- }
- s = lock_user(VERIFY_READ, addr, (long)(len + 1), 1);
- g_assert(s); /* target_strlen has already verified this will work */
- len = write(STDERR_FILENO, s, len);
- unlock_user(s, addr, 0);
- return len;
-}
-
/*
* For linux-user we can safely block. However as we want to return as
* soon as a character is read we need to tweak the termio to disable
diff --git a/semihosting/console.c b/semihosting/console.c
index f6fab5933a..c84ab97ab6 100644
--- a/semihosting/console.c
+++ b/semihosting/console.c
@@ -47,55 +47,6 @@ int qemu_semihosting_log_out(const char *s, int len)
}
}
-/*
- * A re-implementation of lock_user_string that we can use locally
- * instead of relying on softmmu-semi. Hopefully we can deprecate that
- * in time. Copy string until we find a 0 or address error.
- */
-static GString *copy_user_string(CPUArchState *env, target_ulong addr)
-{
- CPUState *cpu = env_cpu(env);
- GString *s = g_string_sized_new(128);
- uint8_t c;
-
- do {
- if (cpu_memory_rw_debug(cpu, addr++, &c, 1, 0) == 0) {
- if (c) {
- s = g_string_append_c(s, c);
- }
- } else {
- qemu_log_mask(LOG_GUEST_ERROR,
- "%s: passed inaccessible address " TARGET_FMT_lx,
- __func__, addr);
- break;
- }
- } while (c!=0);
-
- return s;
-}
-
-static void semihosting_cb(CPUState *cs, uint64_t ret, int err)
-{
- if (err) {
- qemu_log("%s: gdb console output failed (%d)", __func__, err);
- }
-}
-
-int qemu_semihosting_console_outs(CPUArchState *env, target_ulong addr)
-{
- GString *s = copy_user_string(env, addr);
- int out = s->len;
-
- if (use_gdb_syscalls()) {
- gdb_do_syscall(semihosting_cb, "write,2,%x,%x", addr, s->len);
- } else {
- out = qemu_semihosting_log_out(s->str, s->len);
- }
-
- g_string_free(s, true);
- return out;
-}
-
#define FIFO_SIZE 1024
static int console_can_read(void *opaque)
--
2.34.1
^ permalink raw reply related [flat|nested] 83+ messages in thread* [PATCH v3 49/49] semihosting: Create semihost_sys_poll_one
2022-05-21 0:03 [PATCH v3 00/49] semihosting cleanup Richard Henderson
` (47 preceding siblings ...)
2022-05-21 0:03 ` [PATCH v3 48/49] semihosting: Remove qemu_semihosting_console_outs Richard Henderson
@ 2022-05-21 0:04 ` Richard Henderson
48 siblings, 0 replies; 83+ messages in thread
From: Richard Henderson @ 2022-05-21 0:04 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee
This will be used for implementing the xtensa select_one
system call. Choose "poll" over "select" so that we can
reuse Glib's g_poll constants and to avoid struct timeval.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/console.h | 16 ++++++++
include/semihosting/syscalls.h | 3 ++
semihosting/console.c | 19 ++++++++-
semihosting/syscalls.c | 70 ++++++++++++++++++++++++++++++++++
4 files changed, 106 insertions(+), 2 deletions(-)
diff --git a/include/semihosting/console.h b/include/semihosting/console.h
index 20c31d89d4..61b0cb3a94 100644
--- a/include/semihosting/console.h
+++ b/include/semihosting/console.h
@@ -53,4 +53,20 @@ int qemu_semihosting_console_write(void *buf, int len);
*/
int qemu_semihosting_log_out(const char *s, int len);
+/*
+ * qemu_semihosting_console_block_until_ready:
+ * @cs: CPUState
+ *
+ * If no data is available we suspend the CPU and will re-execute the
+ * instruction when data is available.
+ */
+void qemu_semihosting_console_block_until_ready(CPUState *cs);
+
+/**
+ * qemu_semihosting_console_ready:
+ *
+ * Return true if characters are available for read; does not block.
+ */
+bool qemu_semihosting_console_ready(void);
+
#endif /* SEMIHOST_CONSOLE_H */
diff --git a/include/semihosting/syscalls.h b/include/semihosting/syscalls.h
index 347200cb9f..3a5ec229eb 100644
--- a/include/semihosting/syscalls.h
+++ b/include/semihosting/syscalls.h
@@ -69,4 +69,7 @@ void semihost_sys_system(CPUState *cs, gdb_syscall_complete_cb complete,
void semihost_sys_gettimeofday(CPUState *cs, gdb_syscall_complete_cb complete,
target_ulong tv_addr, target_ulong tz_addr);
+void semihost_sys_poll_one(CPUState *cs, gdb_syscall_complete_cb complete,
+ int fd, GIOCondition cond, int timeout);
+
#endif /* SEMIHOSTING_SYSCALLS_H */
diff --git a/semihosting/console.c b/semihosting/console.c
index c84ab97ab6..cda7cf1905 100644
--- a/semihosting/console.c
+++ b/semihosting/console.c
@@ -77,10 +77,17 @@ static void console_read(void *opaque, const uint8_t *buf, int size)
c->sleeping_cpus = NULL;
}
-int qemu_semihosting_console_read(CPUState *cs, void *buf, int len)
+bool qemu_semihosting_console_ready(void)
+{
+ SemihostingConsole *c = &console;
+
+ g_assert(qemu_mutex_iothread_locked());
+ return !fifo8_is_empty(&c->fifo);
+}
+
+void qemu_semihosting_console_block_until_ready(CPUState *cs)
{
SemihostingConsole *c = &console;
- int ret = 0;
g_assert(qemu_mutex_iothread_locked());
@@ -92,6 +99,14 @@ int qemu_semihosting_console_read(CPUState *cs, void *buf, int len)
cpu_loop_exit(cs);
/* never returns */
}
+}
+
+int qemu_semihosting_console_read(CPUState *cs, void *buf, int len)
+{
+ SemihostingConsole *c = &console;
+ int ret = 0;
+
+ qemu_semihosting_console_block_until_ready(cs);
/* Read until buffer full or fifo exhausted. */
do {
diff --git a/semihosting/syscalls.c b/semihosting/syscalls.c
index aa4ee47649..1b87c37437 100644
--- a/semihosting/syscalls.c
+++ b/semihosting/syscalls.c
@@ -550,6 +550,21 @@ static void host_gettimeofday(CPUState *cs, gdb_syscall_complete_cb complete,
unlock_user(p, tv_addr, sizeof(struct gdb_timeval));
}
+#ifndef CONFIG_USER_ONLY
+static void host_poll_one(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf, GIOCondition cond, int timeout)
+{
+ /*
+ * Since this is only used by xtensa in system mode, and stdio is
+ * handled through GuestFDConsole, and there are no semihosting
+ * system calls for sockets and the like, that means this descriptor
+ * must be a normal file. Normal files never block and are thus
+ * always ready.
+ */
+ complete(cs, cond & (G_IO_IN | G_IO_OUT), 0);
+}
+#endif
+
/*
* Static file semihosting syscall implementations.
*/
@@ -658,6 +673,34 @@ static void console_fstat(CPUState *cs, gdb_syscall_complete_cb complete,
complete(cs, ret ? -1 : 0, ret ? -ret : 0);
}
+#ifndef CONFIG_USER_ONLY
+static void console_poll_one(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf, GIOCondition cond, int timeout)
+{
+ /* The semihosting console does not support urgent data or errors. */
+ cond &= G_IO_IN | G_IO_OUT;
+
+ /*
+ * Since qemu_semihosting_console_write never blocks, we can
+ * consider output always ready -- leave G_IO_OUT alone.
+ * All that remains is to conditionally signal input ready.
+ * Since output ready causes an immediate return, only block
+ * for G_IO_IN alone.
+ *
+ * TODO: Implement proper timeout. For now, only support
+ * indefinite wait or immediate poll.
+ */
+ if (cond == G_IO_IN && timeout < 0) {
+ qemu_semihosting_console_block_until_ready(cs);
+ /* We returned -- input must be ready. */
+ } else if ((cond & G_IO_IN) && !qemu_semihosting_console_ready()) {
+ cond &= ~G_IO_IN;
+ }
+
+ complete(cs, cond, 0);
+}
+#endif
+
/*
* Syscall entry points.
*/
@@ -936,3 +979,30 @@ void semihost_sys_gettimeofday(CPUState *cs, gdb_syscall_complete_cb complete,
host_gettimeofday(cs, complete, tv_addr, tz_addr);
}
}
+
+#ifndef CONFIG_USER_ONLY
+void semihost_sys_poll_one(CPUState *cs, gdb_syscall_complete_cb complete,
+ int fd, GIOCondition cond, int timeout)
+{
+ GuestFD *gf = get_guestfd(fd);
+
+ if (!gf) {
+ complete(cs, G_IO_NVAL, 1);
+ return;
+ }
+ switch (gf->type) {
+ case GuestFDGDB:
+ complete(cs, G_IO_NVAL, 1);
+ break;
+ case GuestFDHost:
+ host_poll_one(cs, complete, gf, cond, timeout);
+ break;
+ case GuestFDConsole:
+ console_poll_one(cs, complete, gf, cond, timeout);
+ break;
+ case GuestFDStatic:
+ default:
+ g_assert_not_reached();
+ }
+}
+#endif
--
2.34.1
^ permalink raw reply related [flat|nested] 83+ messages in thread