SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/m68k: Eliminate m68k_semi_is_fseek

Browse Source 
Reorg m68k_semi_return_* to gdb_syscall_complete_cb.
Use the 32-bit version normally, and the 64-bit version
for HOSTED_LSEEK.

Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2022-04-29 16:44:44 -07:00
parent 1b9177f749
commit ab294b6c3a
1 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,8 +95,11 @@ static void translate_stat(CPUM68KState *env, target_ulong addr, struct stat *s)
unlock_user(p, addr, sizeof(struct gdb_stat)); unlock_user(p, addr, sizeof(struct gdb_stat));
} }
static void m68k_semi_return_u32(CPUM68KState *env, uint32_t ret, int err) static void m68k_semi_u32_cb(CPUState *cs, uint64_t ret, int err)
{ {
M68kCPU *cpu = M68K_CPU(cs);
CPUM68KState *env = &cpu->env;
target_ulong args = env->dregs[1]; target_ulong args = env->dregs[1];
if (put_user_u32(ret, args) || if (put_user_u32(ret, args) ||
put_user_u32(err, args + 4)) { put_user_u32(err, args + 4)) {
@ -110,8 +113,11 @@ static void m68k_semi_return_u32(CPUM68KState *env, uint32_t ret, int err)
} }
} }
static void m68k_semi_return_u64(CPUM68KState *env, uint64_t ret, int err) static void m68k_semi_u64_cb(CPUState *cs, uint64_t ret, int err)
{ {
M68kCPU *cpu = M68K_CPU(cs);
CPUM68KState *env = &cpu->env;
target_ulong args = env->dregs[1]; target_ulong args = env->dregs[1];
if (put_user_u32(ret >> 32, args) || if (put_user_u32(ret >> 32, args) ||
put_user_u32(ret, args + 4) || put_user_u32(ret, args + 4) ||
@ -122,21 +128,6 @@ static void m68k_semi_return_u64(CPUM68KState *env, uint64_t ret, int err)
} }
} }
static int m68k_semi_is_fseek;
static void m68k_semi_cb(CPUState *cs, uint64_t ret, int err)
{
M68kCPU *cpu = M68K_CPU(cs);
CPUM68KState *env = &cpu->env;
if (m68k_semi_is_fseek) {
m68k_semi_return_u64(env, ret, err);
m68k_semi_is_fseek = 0;
} else {
m68k_semi_return_u32(env, ret, err);
}
}
/* /*
* Read the input value from the argument block; fail the semihosting * Read the input value from the argument block; fail the semihosting
* call if the memory read fails. * call if the memory read fails.
@ -151,6 +142,7 @@ static void m68k_semi_cb(CPUState *cs, uint64_t ret, int err)
void do_m68k_semihosting(CPUM68KState *env, int nr) void do_m68k_semihosting(CPUM68KState *env, int nr)
{ {
CPUState *cs = env_cpu(env);
uint32_t args; uint32_t args;
target_ulong arg0, arg1, arg2, arg3; target_ulong arg0, arg1, arg2, arg3;
void *p; void *p;
@ -169,7 +161,7 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
GET_ARG(2); GET_ARG(2);
GET_ARG(3); GET_ARG(3);
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
gdb_do_syscall(m68k_semi_cb, "open,%s,%x,%x", arg0, (int)arg1, gdb_do_syscall(m68k_semi_u32_cb, "open,%s,%x,%x", arg0, (int)arg1,
arg2, arg3); arg2, arg3);
return; return;
} else { } else {
@ -190,7 +182,7 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
int fd = arg0; int fd = arg0;
if (fd > 2) { if (fd > 2) {
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
gdb_do_syscall(m68k_semi_cb, "close,%x", arg0); gdb_do_syscall(m68k_semi_u32_cb, "close,%x", arg0);
return; return;
} else { } else {
result = close(fd); result = close(fd);
@ -206,7 +198,7 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
GET_ARG(2); GET_ARG(2);
len = arg2; len = arg2;
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
gdb_do_syscall(m68k_semi_cb, "read,%x,%x,%x", gdb_do_syscall(m68k_semi_u32_cb, "read,%x,%x,%x",
arg0, arg1, len); arg0, arg1, len);
return; return;
} else { } else {
@ -226,7 +218,7 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
GET_ARG(2); GET_ARG(2);
len = arg2; len = arg2;
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
gdb_do_syscall(m68k_semi_cb, "write,%x,%x,%x", gdb_do_syscall(m68k_semi_u32_cb, "write,%x,%x,%x",
arg0, arg1, len); arg0, arg1, len);
return; return;
} else { } else {
@ -249,12 +241,11 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
GET_ARG(3); GET_ARG(3);
off = (uint32_t)arg2 | ((uint64_t)arg1 << 32); off = (uint32_t)arg2 | ((uint64_t)arg1 << 32);
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
m68k_semi_is_fseek = 1; gdb_do_syscall(m68k_semi_u64_cb, "fseek,%x,%lx,%x",
gdb_do_syscall(m68k_semi_cb, "fseek,%x,%lx,%x",
arg0, off, arg3); arg0, off, arg3);
} else { } else {
off = lseek(arg0, off, arg3); off = lseek(arg0, off, arg3);
m68k_semi_return_u64(env, off, errno); m68k_semi_u64_cb(cs, off, errno);
} }
return; return;
} }
@ -264,7 +255,7 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
GET_ARG(2); GET_ARG(2);
GET_ARG(3); GET_ARG(3);
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
gdb_do_syscall(m68k_semi_cb, "rename,%s,%s", gdb_do_syscall(m68k_semi_u32_cb, "rename,%s,%s",
arg0, (int)arg1, arg2, (int)arg3); arg0, (int)arg1, arg2, (int)arg3);
return; return;
} else { } else {
@ -284,7 +275,7 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
GET_ARG(0); GET_ARG(0);
GET_ARG(1); GET_ARG(1);
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
gdb_do_syscall(m68k_semi_cb, "unlink,%s", gdb_do_syscall(m68k_semi_u32_cb, "unlink,%s",
arg0, (int)arg1); arg0, (int)arg1);
return; return;
} else { } else {
@ -303,7 +294,7 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
GET_ARG(1); GET_ARG(1);
GET_ARG(2); GET_ARG(2);
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
gdb_do_syscall(m68k_semi_cb, "stat,%s,%x", gdb_do_syscall(m68k_semi_u32_cb, "stat,%s,%x",
arg0, (int)arg1, arg2); arg0, (int)arg1, arg2);
return; return;
} else { } else {
@ -325,7 +316,7 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
GET_ARG(0); GET_ARG(0);
GET_ARG(1); GET_ARG(1);
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
gdb_do_syscall(m68k_semi_cb, "fstat,%x,%x", gdb_do_syscall(m68k_semi_u32_cb, "fstat,%x,%x",
arg0, arg1); arg0, arg1);
return; return;
} else { } else {
@ -340,7 +331,7 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
GET_ARG(0); GET_ARG(0);
GET_ARG(1); GET_ARG(1);
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
gdb_do_syscall(m68k_semi_cb, "gettimeofday,%x,%x", gdb_do_syscall(m68k_semi_u32_cb, "gettimeofday,%x,%x",
arg0, arg1); arg0, arg1);
return; return;
} else { } else {
@ -361,7 +352,7 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
case HOSTED_ISATTY: case HOSTED_ISATTY:
GET_ARG(0); GET_ARG(0);
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
gdb_do_syscall(m68k_semi_cb, "isatty,%x", arg0); gdb_do_syscall(m68k_semi_u32_cb, "isatty,%x", arg0);
return; return;
} else { } else {
result = isatty(arg0); result = isatty(arg0);
@ -371,7 +362,7 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
GET_ARG(0); GET_ARG(0);
GET_ARG(1); GET_ARG(1);
if (use_gdb_syscalls()) { if (use_gdb_syscalls()) {
gdb_do_syscall(m68k_semi_cb, "system,%s", gdb_do_syscall(m68k_semi_u32_cb, "system,%s",
arg0, (int)arg1); arg0, (int)arg1);
return; return;
} else { } else {
@ -429,5 +420,5 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
result = 0; result = 0;
} }
failed: failed:
m68k_semi_return_u32(env, result, errno); m68k_semi_u32_cb(cs, result, errno);
} }