[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH 06/13] target/arm/arm-semi: Factor out implementation
From: |
Peter Maydell |
Subject: |
[Qemu-arm] [PATCH 06/13] target/arm/arm-semi: Factor out implementation of SYS_WRITE |
Date: |
Tue, 10 Sep 2019 15:44:21 +0100 |
Factor out the implementation of SYS_WRITE via the
new function tables.
The #ifdef around the declaration/initialization of the
local 'env' variable is unfortunate but necessary, because
the softmmu-semi.h version of lock_user implicitly uses 'env',
but the user-only version doesn't need it. Without the ifdefs
we'd get a warning about the unused variable for the user-only
compilation.
Signed-off-by: Peter Maydell <address@hidden>
---
target/arm/arm-semi.c | 53 ++++++++++++++++++++++++++++---------------
1 file changed, 35 insertions(+), 18 deletions(-)
diff --git a/target/arm/arm-semi.c b/target/arm/arm-semi.c
index f3e0bf77cd3..0dec4c04e2f 100644
--- a/target/arm/arm-semi.c
+++ b/target/arm/arm-semi.c
@@ -345,27 +345,61 @@ static target_ulong arm_gdb_syscall(ARMCPU *cpu,
gdb_syscall_complete_cb cb,
* setting the guest errno if appropriate.
*/
typedef uint32_t sys_closefn(TaskState *ts, ARMCPU *cpu, GuestFD *gf);
+typedef uint32_t sys_writefn(TaskState *ts, ARMCPU *cpu, GuestFD *gf,
+ target_ulong buf, uint32_t len);
static uint32_t host_closefn(TaskState *ts, ARMCPU *cpu, GuestFD *gf)
{
return set_swi_errno(ts, close(gf->hostfd));
}
+static uint32_t host_writefn(TaskState *ts, ARMCPU *cpu, GuestFD *gf,
+ target_ulong buf, uint32_t len)
+{
+ uint32_t ret;
+#ifndef CONFIG_USER_ONLY
+ CPUARMState *env = &cpu->env;
+#endif
+ char *s = lock_user(VERIFY_READ, buf, len, 1);
+ if (!s) {
+ /* Return bytes not written on error */
+ return len;
+ }
+ ret = set_swi_errno(ts, write(gf->hostfd, s, len));
+ unlock_user(s, buf, 0);
+ if (ret == (uint32_t)-1) {
+ ret = 0;
+ }
+ /* Return bytes not written */
+ return len - ret;
+}
+
static uint32_t gdb_closefn(TaskState *ts, ARMCPU *cpu, GuestFD *gf)
{
return arm_gdb_syscall(cpu, arm_semi_cb, "close,%x", gf->hostfd);
}
+static uint32_t gdb_writefn(TaskState *ts, ARMCPU *cpu, GuestFD *gf,
+ target_ulong buf, uint32_t len)
+{
+ arm_semi_syscall_len = len;
+ return arm_gdb_syscall(cpu, arm_semi_cb, "write,%x,%x,%x",
+ gf->hostfd, buf, len);
+}
+
typedef struct GuestFDFunctions {
sys_closefn *closefn;
+ sys_writefn *writefn;
} GuestFDFunctions;
static const GuestFDFunctions guestfd_fns[] = {
[GuestFDHost] = {
.closefn = host_closefn,
+ .writefn = host_writefn,
},
[GuestFDGDB] = {
.closefn = gdb_closefn,
+ .writefn = gdb_writefn,
},
};
@@ -504,24 +538,7 @@ target_ulong do_arm_semihosting(CPUARMState *env)
return set_swi_errno(ts, -1);
}
- if (use_gdb_syscalls()) {
- arm_semi_syscall_len = len;
- return arm_gdb_syscall(cpu, arm_semi_cb, "write,%x,%x,%x",
- gf->hostfd, arg1, len);
- } else {
- s = lock_user(VERIFY_READ, arg1, len, 1);
- if (!s) {
- /* Return bytes not written on error */
- return len;
- }
- ret = set_swi_errno(ts, write(gf->hostfd, s, len));
- unlock_user(s, arg1, 0);
- if (ret == (uint32_t)-1) {
- ret = 0;
- }
- /* Return bytes not written */
- return len - ret;
- }
+ return guestfd_fns[gf->type].writefn(ts, cpu, gf, arg1, len);
case TARGET_SYS_READ:
GET_ARG(0);
GET_ARG(1);
--
2.20.1
- Re: [Qemu-arm] [PATCH 02/13] target/arm/arm-semi: Always set some kind of errno for failed calls, (continued)
[Qemu-arm] [PATCH 03/13] target/arm/arm-semi: Make semihosting code hand out its own file descriptors, Peter Maydell, 2019/09/10
[Qemu-arm] [PATCH 04/13] target/arm/arm-semi: clean up TaskState* usage in non-user-only code, Peter Maydell, 2019/09/10
[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 <=
[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, 2019/09/10
[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