The ARM-specific SYS_FLEN isn't really something that can be
reused by other semihosting apis, but moving the implementation
to guestfd.c means that we can keep the GuestFD stuff together.
Signed-off-by: Richard Henderson <richard.hender...@linaro.org>
---
include/semihosting/guestfd.h | 4 ++
semihosting/arm-compat-semi.c | 83 ++++++++---------------------------
semihosting/guestfd.c | 55 +++++++++++++++++++++++
3 files changed, 78 insertions(+), 64 deletions(-)
diff --git a/include/semihosting/guestfd.h b/include/semihosting/guestfd.h
index d3dd081e81..d362b7ccf0 100644
--- a/include/semihosting/guestfd.h
+++ b/include/semihosting/guestfd.h
@@ -68,4 +68,8 @@ void semihost_sys_lseek(CPUState *cs, gdb_syscall_complete_cb
complete,
void semihost_sys_isatty(CPUState *cs, gdb_syscall_complete_cb complete,
int fd);
+void semihost_sys_flen(CPUState *cs, gdb_syscall_complete_cb fstat_cb,
+ gdb_syscall_complete_cb flen_cb,
+ int fd, target_ulong fstat_addr);
+
#endif /* SEMIHOSTING_GUESTFD_H */
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 3844d0e376..f9938ac879 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -272,41 +272,25 @@ static target_ulong common_semi_flen_buf(CPUState *cs)
}
static void
-common_semi_flen_cb(CPUState *cs, target_ulong ret, target_ulong err)
+common_semi_flen_fstat_cb(CPUState *cs, target_ulong ret, target_ulong err)
{
- /* The size is always stored in big-endian order, extract the value. */
- uint64_t size;
- cpu_memory_rw_debug(cs, common_semi_flen_buf(cs) +
- offsetof(struct gdb_stat, gdb_st_size),
- &size, 8, 0);
- size = be64_to_cpu(size);
- common_semi_cb(cs, -1, err);
- common_semi_set_ret(cs, size);
-}
-
-/*
- * Types for functions implementing various semihosting calls
- * for specific types of guest file descriptor. These must all
- * do the work and return the required return value to the guest
- * via common_semi_cb.
- */
-typedef void sys_flenfn(CPUState *cs, GuestFD *gf);
-
-static void host_flenfn(CPUState *cs, GuestFD *gf)
-{
- struct stat buf;
-
- if (fstat(gf->hostfd, &buf)) {
- common_semi_cb(cs, -1, errno);
- } else {
- common_semi_cb(cs, buf.st_size, 0);
+ if (!err) {
+ /* The size is always stored in big-endian order, extract the value. */
+ CPUArchState *env G_GNUC_UNUSED = cs->env_ptr;
+ uint64_t size;
+ if (get_user_u64(size, common_semi_flen_buf(cs) +
+ offsetof(struct gdb_stat, gdb_st_size))) {
+ ret = -1, err = EFAULT;
+ } else {
+ /* Undo the tswap from get_user_u64, then swap from BE. */
+ size = be64_to_cpu(tswap64(size));
+ ret = size;
+ if (ret != size) {
+ ret = -1, err = EOVERFLOW;
+ }
+ }
}
-}
-
-static void gdb_flenfn(CPUState *cs, GuestFD *gf)
-{
- gdb_do_syscall(common_semi_flen_cb, "fstat,%x,%x",
- gf->hostfd, common_semi_flen_buf(cs));
+ common_semi_cb(cs, ret, err);
}
#define SHFB_MAGIC_0 0x53
@@ -326,27 +310,6 @@ static const uint8_t featurefile_data[] = {
SH_EXT_EXIT_EXTENDED | SH_EXT_STDOUT_STDERR, /* Feature byte 0 */
};
-static void staticfile_flenfn(CPUState *cs, GuestFD *gf)
-{
- common_semi_cb(cs, gf->staticfile.len, 0);
-}
-
-typedef struct GuestFDFunctions {
- sys_flenfn *flenfn;
-} GuestFDFunctions;
-
-static const GuestFDFunctions guestfd_fns[] = {
- [GuestFDHost] = {
- .flenfn = host_flenfn,
- },
- [GuestFDGDB] = {
- .flenfn = gdb_flenfn,
- },
- [GuestFDStatic] = {
- .flenfn = staticfile_flenfn,
- },
-};
-
/*
* Do a semihosting call.
*
@@ -365,7 +328,6 @@ void do_common_semihosting(CPUState *cs)
char * s;
int nr;
uint32_t ret;
- GuestFD *gf;
int64_t elapsed;
nr = common_semi_arg(cs, 0) & 0xffffffffU;
@@ -478,12 +440,8 @@ void do_common_semihosting(CPUState *cs)
case TARGET_SYS_FLEN:
GET_ARG(0);
-
- gf = get_guestfd(arg0);
- if (!gf) {
- goto do_badf;
- }
- guestfd_fns[gf->type].flenfn(cs, gf);
+ semihost_sys_flen(cs, common_semi_flen_fstat_cb, common_semi_cb,
+ arg0, common_semi_flen_buf(cs));
break;
case TARGET_SYS_TMPNAM:
@@ -805,9 +763,6 @@ void do_common_semihosting(CPUState *cs)
cpu_dump_state(cs, stderr, 0);
abort();
- do_badf:
- common_semi_cb(cs, -1, EBADF);
- break;
do_fault:
common_semi_cb(cs, -1, EFAULT);
break;
diff --git a/semihosting/guestfd.c b/semihosting/guestfd.c
index 6ed4a9162d..3a2100585d 100644
--- a/semihosting/guestfd.c
+++ b/semihosting/guestfd.c
@@ -562,3 +562,58 @@ void semihost_sys_isatty(CPUState *cs,
gdb_syscall_complete_cb complete, int fd)
g_assert_not_reached();
}
}
+
+static void gdb_fstat(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf, target_ulong addr)
+{
+ gdb_do_syscall(complete, "fstat,%x,%x", (target_ulong)gf->hostfd, addr);
+}
+
+static void host_flen(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf)
+{
+ struct stat buf;
+ target_ulong ret;
+
+ if (fstat(gf->hostfd, &buf) < 0) {
+ complete(cs, -1, errno);
+ } else {
+ ret = buf.st_size;
+ if (ret != buf.st_size) {
+ complete(cs, -1, EOVERFLOW);
+ } else {
+ complete(cs, ret, 0);
+ }
+ }
+}
+
+static void staticfile_flen(CPUState *cs, gdb_syscall_complete_cb complete,
+ GuestFD *gf)
+{
+ complete(cs, gf->staticfile.len, 0);
+}
+
+void semihost_sys_flen(CPUState *cs, gdb_syscall_complete_cb fstat_cb,
+ gdb_syscall_complete_cb flen_cb, int fd,
+ target_ulong fstat_addr)
+{
+ GuestFD *gf = get_guestfd(fd);
+
+ if (!gf) {
+ flen_cb(cs, -1, EBADF);
+ return;
+ }
+ switch (gf->type) {
+ case GuestFDGDB:
+ gdb_fstat(cs, fstat_cb, gf, fstat_addr);
+ break;
+ case GuestFDHost:
+ host_flen(cs, flen_cb, gf);
+ break;
+ case GuestFDStatic:
+ staticfile_flen(cs, flen_cb, gf);
+ break;
+ default:
+ g_assert_not_reached();
+ }
+}
--
2.34.1
