[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v2 12/15] target/arm/arm-semi: Factor out implementati
From: |
Peter Maydell |
Subject: |
[Qemu-arm] [PATCH v2 12/15] target/arm/arm-semi: Factor out implementation of SYS_FLEN |
Date: |
Mon, 16 Sep 2019 15:15:41 +0100 |
Factor out the implementation of SYS_FLEN via the new
function tables.
Signed-off-by: Peter Maydell <address@hidden>
---
target/arm/arm-semi.c | 32 ++++++++++++++++++++++----------
1 file changed, 22 insertions(+), 10 deletions(-)
diff --git a/target/arm/arm-semi.c b/target/arm/arm-semi.c
index b5e1d73eb80..87c911f0187 100644
--- a/target/arm/arm-semi.c
+++ b/target/arm/arm-semi.c
@@ -391,6 +391,7 @@ typedef uint32_t sys_readfn(ARMCPU *cpu, GuestFD *gf,
typedef uint32_t sys_isattyfn(ARMCPU *cpu, GuestFD *gf);
typedef uint32_t sys_seekfn(ARMCPU *cpu, GuestFD *gf,
target_ulong offset);
+typedef uint32_t sys_flenfn(ARMCPU *cpu, GuestFD *gf);
static uint32_t host_closefn(ARMCPU *cpu, GuestFD *gf)
{
@@ -454,6 +455,17 @@ static uint32_t host_seekfn(ARMCPU *cpu, GuestFD *gf,
target_ulong offset)
return 0;
}
+static uint32_t host_flenfn(ARMCPU *cpu, GuestFD *gf)
+{
+ CPUARMState *env = &cpu->env;
+ struct stat buf;
+ uint32_t ret = set_swi_errno(env, fstat(gf->hostfd, &buf));
+ if (ret == (uint32_t)-1) {
+ return -1;
+ }
+ return buf.st_size;
+}
+
static uint32_t gdb_closefn(ARMCPU *cpu, GuestFD *gf)
{
return arm_gdb_syscall(cpu, arm_semi_cb, "close,%x", gf->hostfd);
@@ -486,12 +498,19 @@ static uint32_t gdb_seekfn(ARMCPU *cpu, GuestFD *gf,
target_ulong offset)
gf->hostfd, offset);
}
+static uint32_t gdb_flenfn(ARMCPU *cpu, GuestFD *gf)
+{
+ return arm_gdb_syscall(cpu, arm_semi_flen_cb, "fstat,%x,%x",
+ gf->hostfd, arm_flen_buf(cpu));
+}
+
typedef struct GuestFDFunctions {
sys_closefn *closefn;
sys_writefn *writefn;
sys_readfn *readfn;
sys_isattyfn *isattyfn;
sys_seekfn *seekfn;
+ sys_flenfn *flenfn;
} GuestFDFunctions;
static const GuestFDFunctions guestfd_fns[] = {
@@ -501,6 +520,7 @@ static const GuestFDFunctions guestfd_fns[] = {
.readfn = host_readfn,
.isattyfn = host_isattyfn,
.seekfn = host_seekfn,
+ .flenfn = host_flenfn,
},
[GuestFDGDB] = {
.closefn = gdb_closefn,
@@ -508,6 +528,7 @@ static const GuestFDFunctions guestfd_fns[] = {
.readfn = gdb_readfn,
.isattyfn = gdb_isattyfn,
.seekfn = gdb_seekfn,
+ .flenfn = gdb_flenfn,
},
};
@@ -687,16 +708,7 @@ target_ulong do_arm_semihosting(CPUARMState *env)
return set_swi_errno(env, -1);
}
- if (use_gdb_syscalls()) {
- return arm_gdb_syscall(cpu, arm_semi_flen_cb, "fstat,%x,%x",
- gf->hostfd, arm_flen_buf(cpu));
- } else {
- struct stat buf;
- ret = set_swi_errno(env, fstat(gf->hostfd, &buf));
- if (ret == (uint32_t)-1)
- return -1;
- return buf.st_size;
- }
+ return guestfd_fns[gf->type].flenfn(cpu, gf);
case TARGET_SYS_TMPNAM:
qemu_log_mask(LOG_UNIMP, "%s: SYS_TMPNAM not implemented", __func__);
return -1;
--
2.20.1
- [Qemu-arm] [PATCH v2 02/15] target/arm/arm-semi: Always set some kind of errno for failed calls, (continued)
- [Qemu-arm] [PATCH v2 02/15] target/arm/arm-semi: Always set some kind of errno for failed calls, Peter Maydell, 2019/09/16
- [Qemu-arm] [PATCH v2 03/15] target/arm/arm-semi: Correct comment about gdb syscall races, Peter Maydell, 2019/09/16
- [Qemu-arm] [PATCH v2 06/15] target/arm/arm-semi: Use set_swi_errno() in gdbstub callback functions, Peter Maydell, 2019/09/16
- [Qemu-arm] [PATCH v2 04/15] target/arm/arm-semi: Make semihosting code hand out its own file descriptors, Peter Maydell, 2019/09/16
- [Qemu-arm] [PATCH v2 05/15] target/arm/arm-semi: Restrict use of TaskState*, Peter Maydell, 2019/09/16
- [Qemu-arm] [PATCH v2 07/15] target/arm/arm-semi: Factor out implementation of SYS_CLOSE, Peter Maydell, 2019/09/16
- [Qemu-arm] [PATCH v2 10/15] target/arm/arm-semi: Factor out implementation of SYS_ISTTY, Peter Maydell, 2019/09/16
- [Qemu-arm] [PATCH v2 09/15] target/arm/arm-semi: Factor out implementation of SYS_READ, Peter Maydell, 2019/09/16
- [Qemu-arm] [PATCH v2 11/15] target/arm/arm-semi: Factor out implementation of SYS_SEEK, Peter Maydell, 2019/09/16
- [Qemu-arm] [PATCH v2 08/15] target/arm/arm-semi: Factor out implementation of SYS_WRITE, Peter Maydell, 2019/09/16
- [Qemu-arm] [PATCH v2 12/15] target/arm/arm-semi: Factor out implementation of SYS_FLEN,
Peter Maydell <=
- [Qemu-arm] [PATCH v2 13/15] target/arm/arm-semi: Implement support for semihosting feature detection, Peter Maydell, 2019/09/16
- [Qemu-arm] [PATCH v2 15/15] target/arm/arm-semi: Implement SH_EXT_STDOUT_STDERR extension, Peter Maydell, 2019/09/16
- [Qemu-arm] [PATCH v2 14/15] target/arm/arm-semi: Implement SH_EXT_EXIT_EXTENDED extension, Peter Maydell, 2019/09/16