OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

semihosting: Split out semihost_sys_isatty

Browse Source 
Split out the non-ARM specific portions of SYS_ISTTY to a
reusable function.  This handles all GuestFD.

Add a common_semi_istty_cb helper to translate the Posix
error return, 0+ENOTTY, to the Arm semihosting not-a-file
success result.

Reviewed-by: Luc Michel <lmichel@kalray.eu>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2022-04-28 12:31:25 -07:00
parent 9a89470449
commit a221247430
3 changed files with 53 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/semihosting/syscalls.h
View File

@ -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 */

40
semihosting/arm-compat-semi.c
View File

@ -247,6 +247,19 @@ static void common_semi_rw_cb(CPUState *cs, target_ulong ret, target_ulong err)
common_semi_set_ret(cs, arg2 - ret);
}
/*
* Convert from Posix ret+errno to Arm SYS_ISTTY return values.
* With gdbstub, err is only ever set for protocol errors to EIO.
*/
static void common_semi_istty_cb(CPUState *cs, target_ulong ret,
target_ulong err)
{
if (err) {
ret = (err == ENOTTY ? 0 : -1);
}
common_semi_cb(cs, ret, err);
}
/*
* SYS_SEEK returns 0 on success, not the resulting offset.
*/
@ -291,14 +304,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 +317,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 +340,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,
},
};
@ -489,12 +482,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_istty_cb, arg0);
break;
case TARGET_SYS_SEEK:

36
semihosting/syscalls.c
View File

@ -121,6 +121,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.
*/
@ -246,6 +252,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);
}
/*
* Static file semihosting syscall implementations.
*/
@ -437,3 +450,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, EBADF);
return;
}
switch (gf->type) {
case GuestFDGDB:
gdb_isatty(cs, complete, gf);
break;
case GuestFDHost:
host_isatty(cs, complete, gf);
break;
case GuestFDStatic:
complete(cs, 0, ENOTTY);
break;
default:
g_assert_not_reached();
}
}