[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH 09/13] target/arm/arm-semi: Factor out implementation
From: |
Peter Maydell |
Subject: |
[Qemu-arm] [PATCH 09/13] target/arm/arm-semi: Factor out implementation of SYS_SEEK |
Date: |
Tue, 10 Sep 2019 15:44:24 +0100 |
Factor out the implementation of SYS_SEEK via the new function
tables.
Signed-off-by: Peter Maydell <address@hidden>
---
target/arm/arm-semi.c | 32 +++++++++++++++++++++++---------
1 file changed, 23 insertions(+), 9 deletions(-)
diff --git a/target/arm/arm-semi.c b/target/arm/arm-semi.c
index 64ed39fc075..c548ce849e7 100644
--- a/target/arm/arm-semi.c
+++ b/target/arm/arm-semi.c
@@ -350,6 +350,8 @@ typedef uint32_t sys_writefn(TaskState *ts, ARMCPU *cpu,
GuestFD *gf,
typedef uint32_t sys_readfn(TaskState *ts, ARMCPU *cpu, GuestFD *gf,
target_ulong buf, uint32_t len);
typedef uint32_t sys_isattyfn(TaskState *ts, ARMCPU *cpu, GuestFD *gf);
+typedef uint32_t sys_seekfn(TaskState *ts, ARMCPU *cpu, GuestFD *gf,
+ target_ulong offset);
static uint32_t host_closefn(TaskState *ts, ARMCPU *cpu, GuestFD *gf)
{
@@ -405,6 +407,16 @@ static uint32_t host_isattyfn(TaskState *ts, ARMCPU *cpu,
GuestFD *gf)
return isatty(gf->hostfd);
}
+static uint32_t host_seekfn(TaskState *ts, ARMCPU *cpu, GuestFD *gf,
+ target_ulong offset)
+{
+ uint32_t ret = set_swi_errno(ts, lseek(gf->hostfd, offset, SEEK_SET));
+ if (ret == (uint32_t)-1) {
+ return -1;
+ }
+ return 0;
+}
+
static uint32_t gdb_closefn(TaskState *ts, ARMCPU *cpu, GuestFD *gf)
{
return arm_gdb_syscall(cpu, arm_semi_cb, "close,%x", gf->hostfd);
@@ -431,11 +443,19 @@ static uint32_t gdb_isattyfn(TaskState *ts, ARMCPU *cpu,
GuestFD *gf)
return arm_gdb_syscall(cpu, arm_semi_cb, "isatty,%x", gf->hostfd);
}
+static uint32_t gdb_seekfn(TaskState *ts, ARMCPU *cpu, GuestFD *gf,
+ target_ulong offset)
+{
+ return arm_gdb_syscall(cpu, arm_semi_cb, "lseek,%x,%x,0",
+ gf->hostfd, offset);
+}
+
typedef struct GuestFDFunctions {
sys_closefn *closefn;
sys_writefn *writefn;
sys_readfn *readfn;
sys_isattyfn *isattyfn;
+ sys_seekfn *seekfn;
} GuestFDFunctions;
static const GuestFDFunctions guestfd_fns[] = {
@@ -444,12 +464,14 @@ static const GuestFDFunctions guestfd_fns[] = {
.writefn = host_writefn,
.readfn = host_readfn,
.isattyfn = host_isattyfn,
+ .seekfn = host_seekfn,
},
[GuestFDGDB] = {
.closefn = gdb_closefn,
.writefn = gdb_writefn,
.readfn = gdb_readfn,
.isattyfn = gdb_isattyfn,
+ .seekfn = gdb_seekfn,
},
};
@@ -625,15 +647,7 @@ target_ulong do_arm_semihosting(CPUARMState *env)
return set_swi_errno(ts, -1);
}
- if (use_gdb_syscalls()) {
- return arm_gdb_syscall(cpu, arm_semi_cb, "lseek,%x,%x,0",
- gf->hostfd, arg1);
- } else {
- ret = set_swi_errno(ts, lseek(gf->hostfd, arg1, SEEK_SET));
- if (ret == (uint32_t)-1)
- return -1;
- return 0;
- }
+ return guestfd_fns[gf->type].seekfn(ts, cpu, gf, arg1);
case TARGET_SYS_FLEN:
GET_ARG(0);
--
2.20.1
- Re: [Qemu-arm] [PATCH 04/13] target/arm/arm-semi: clean up TaskState* usage in non-user-only code, (continued)
- [Qemu-arm] [PATCH 05/13] target/arm/arm-semi: Factor out implementation of SYS_CLOSE, Peter Maydell, 2019/09/10
- [Qemu-arm] [PATCH 06/13] target/arm/arm-semi: Factor out implementation of SYS_WRITE, Peter Maydell, 2019/09/10
- [Qemu-arm] [PATCH 07/13] target/arm/arm-semi: Factor out implementation of SYS_READ, Peter Maydell, 2019/09/10
- [Qemu-arm] [PATCH 08/13] target/arm/arm-semi: Factor out implementation of SYS_ISTTY, Peter Maydell, 2019/09/10
- [Qemu-arm] [PATCH 09/13] target/arm/arm-semi: Factor out implementation of SYS_SEEK,
Peter Maydell <=
- [Qemu-arm] [PATCH 10/13] target/arm/arm-semi: Factor out implementation of SYS_FLEN, Peter Maydell, 2019/09/10
- [Qemu-arm] [PATCH 13/13] target/arm/arm-semi: Implement SH_EXT_EXIT_EXTENDED extension, Peter Maydell, 2019/09/10
- [Qemu-arm] [PATCH 11/13] target/arm/arm-semi: Implement support for semihosting feature detection, Peter Maydell, 2019/09/10
- [Qemu-arm] [PATCH 12/13] target/arm/arm-semi: Implement SH_EXT_STDOUT_STDERR extension, Peter Maydell, 2019/09/10