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_READ 

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

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20190916141544.17540-10-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2019-09-16 15:15:38 +01:00
parent 52c8a163c1
commit 2c3a09a620
1 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -386,6 +386,8 @@ static target_ulong arm_gdb_syscall(ARMCPU *cpu, gdb_syscall_complete_cb cb,
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, typedef uint32_t sys_writefn(ARMCPU *cpu, GuestFD *gf,
target_ulong buf, uint32_t len); target_ulong buf, uint32_t len);
typedef uint32_t sys_readfn(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)
{ {
@ -413,6 +415,27 @@ static uint32_t host_writefn(ARMCPU *cpu, GuestFD *gf,
return len - ret; return len - ret;
} }
static uint32_t host_readfn(ARMCPU *cpu, GuestFD *gf,
target_ulong buf, uint32_t len)
{
uint32_t ret;
CPUARMState *env = &cpu->env;
char *s = lock_user(VERIFY_WRITE, buf, len, 0);
if (!s) {
/* return bytes not read */
return len;
}
do {
ret = set_swi_errno(env, read(gf->hostfd, s, len));
} while (ret == -1 && errno == EINTR);
unlock_user(s, buf, len);
if (ret == (uint32_t)-1) {
ret = 0;
}
/* Return bytes not read */
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);
@ -426,19 +449,30 @@ static uint32_t gdb_writefn(ARMCPU *cpu, GuestFD *gf,
gf->hostfd, buf, len); gf->hostfd, buf, len);
} }
static uint32_t gdb_readfn(ARMCPU *cpu, GuestFD *gf,
target_ulong buf, uint32_t len)
{
arm_semi_syscall_len = len;
return arm_gdb_syscall(cpu, arm_semi_cb, "read,%x,%x,%x",
gf->hostfd, buf, len);
}
typedef struct GuestFDFunctions { typedef struct GuestFDFunctions {
sys_closefn *closefn; sys_closefn *closefn;
sys_writefn *writefn; sys_writefn *writefn;
sys_readfn *readfn;
} GuestFDFunctions; } GuestFDFunctions;
static const GuestFDFunctions guestfd_fns[] = { static const GuestFDFunctions guestfd_fns[] = {
[GuestFDHost] = { [GuestFDHost] = {
.closefn = host_closefn, .closefn = host_closefn,
.writefn = host_writefn, .writefn = host_writefn,
.readfn = host_readfn,
}, },
[GuestFDGDB] = { [GuestFDGDB] = {
.closefn = gdb_closefn, .closefn = gdb_closefn,
.writefn = gdb_writefn, .writefn = gdb_writefn,
.readfn = gdb_readfn,
}, },
}; };
@ -584,26 +618,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].readfn(cpu, gf, arg1, len);
arm_semi_syscall_len = len;
return arm_gdb_syscall(cpu, arm_semi_cb, "read,%x,%x,%x",
gf->hostfd, arg1, len);
} else {
s = lock_user(VERIFY_WRITE, arg1, len, 0);
if (!s) {
/* return bytes not read */
return len;
}
do {
ret = set_swi_errno(env, read(gf->hostfd, s, len));
} while (ret == -1 && errno == EINTR);
unlock_user(s, arg1, len);
if (ret == (uint32_t)-1) {
ret = 0;
}
/* Return bytes not read */
return len - ret;
}
case TARGET_SYS_READC: case TARGET_SYS_READC:
qemu_log_mask(LOG_UNIMP, "%s: SYS_READC not implemented", __func__); qemu_log_mask(LOG_UNIMP, "%s: SYS_READC not implemented", __func__);
return 0; return 0;