ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/arm/arm-semi: Factor out implementation of SYS_WRITE 

Factor out the implementation of SYS_WRITE via the
new function tables.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20190916141544.17540-9-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2019-09-16 15:15:37 +01:00
parent 263eb621de
commit 52c8a163c1
1 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
target/arm/arm-semi.c
View File

@ -384,6 +384,8 @@ static target_ulong arm_gdb_syscall(ARMCPU *cpu, gdb_syscall_complete_cb cb,
* setting the guest errno if appropriate. * setting the guest errno if appropriate.
*/ */
typedef uint32_t sys_closefn(ARMCPU *cpu, GuestFD *gf); typedef uint32_t sys_closefn(ARMCPU *cpu, GuestFD *gf);
typedef uint32_t sys_writefn(ARMCPU *cpu, GuestFD *gf,
target_ulong buf, uint32_t len);
static uint32_t host_closefn(ARMCPU *cpu, GuestFD *gf) static uint32_t host_closefn(ARMCPU *cpu, GuestFD *gf)
{ {
@ -392,21 +394,51 @@ static uint32_t host_closefn(ARMCPU *cpu, GuestFD *gf)
return set_swi_errno(env, close(gf->hostfd)); return set_swi_errno(env, close(gf->hostfd));
} }
static uint32_t host_writefn(ARMCPU *cpu, GuestFD *gf,
target_ulong buf, uint32_t len)
{
uint32_t ret;
CPUARMState *env = &cpu->env;
char *s = lock_user(VERIFY_READ, buf, len, 1);
if (!s) {
/* Return bytes not written on error */
return len;
}
ret = set_swi_errno(env, 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(ARMCPU *cpu, GuestFD *gf) static uint32_t gdb_closefn(ARMCPU *cpu, GuestFD *gf)
{ {
return arm_gdb_syscall(cpu, arm_semi_cb, "close,%x", gf->hostfd); return arm_gdb_syscall(cpu, arm_semi_cb, "close,%x", gf->hostfd);
} }
static uint32_t gdb_writefn(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 { typedef struct GuestFDFunctions {
sys_closefn *closefn; sys_closefn *closefn;
sys_writefn *writefn;
} GuestFDFunctions; } GuestFDFunctions;
static const GuestFDFunctions guestfd_fns[] = { static const GuestFDFunctions guestfd_fns[] = {
[GuestFDHost] = { [GuestFDHost] = {
.closefn = host_closefn, .closefn = host_closefn,
.writefn = host_writefn,
}, },
[GuestFDGDB] = { [GuestFDGDB] = {
.closefn = gdb_closefn, .closefn = gdb_closefn,
.writefn = gdb_writefn,
}, },
}; };
@ -539,24 +571,7 @@ target_ulong do_arm_semihosting(CPUARMState *env)
return set_swi_errno(env, -1); return set_swi_errno(env, -1);
} }
if (use_gdb_syscalls()) { return guestfd_fns[gf->type].writefn(cpu, gf, arg1, len);
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(env, write(gf->hostfd, s, len));
unlock_user(s, arg1, 0);
if (ret == (uint32_t)-1) {
ret = 0;
}
/* Return bytes not written */
return len - ret;
}
case TARGET_SYS_READ: case TARGET_SYS_READ:
GET_ARG(0); GET_ARG(0);
GET_ARG(1); GET_ARG(1);