mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/mips: Create report_fault for semihosting

Browse Source 
The UHI specification does not have an EFAULT value,
and further specifies that "undefined UHI operations
should not return control to the target".

So, log the error and abort.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220628111701.677216-2-richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
Richard Henderson 2022-06-28 16:46:54 +05:30 committed by Philippe Mathieu-Daudé
parent 9a6046a655
commit d53a3ed446
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
target/mips/tcg/sysemu/mips-semi.c
View File

@ -114,6 +114,13 @@ enum UHIErrno {
UHI_EXDEV = 18, UHI_EXDEV = 18,
}; };
static void report_fault(CPUMIPSState *env)
{
int op = env->active_tc.gpr[25];
error_report("Fault during UHI operation %d", op);
abort();
}
static int errno_mips(int host_errno) static int errno_mips(int host_errno)
{ {
/* Errno values taken from asm-mips/errno.h */ /* Errno values taken from asm-mips/errno.h */
@ -136,8 +143,7 @@ static int copy_stat_to_target(CPUMIPSState *env, const struct stat *src,
hwaddr len = sizeof(struct UHIStat); hwaddr len = sizeof(struct UHIStat);
UHIStat *dst = lock_user(VERIFY_WRITE, vaddr, len, 0); UHIStat *dst = lock_user(VERIFY_WRITE, vaddr, len, 0);
if (!dst) { if (!dst) {
errno = EFAULT; report_fault(env);
return -1;
} }
dst->uhi_st_dev = tswap16(src->st_dev); dst->uhi_st_dev = tswap16(src->st_dev);
@ -188,8 +194,7 @@ static int write_to_file(CPUMIPSState *env, target_ulong fd,
int num_of_bytes; int num_of_bytes;
void *dst = lock_user(VERIFY_READ, vaddr, len, 1); void *dst = lock_user(VERIFY_READ, vaddr, len, 1);
if (!dst) { if (!dst) {
errno = EFAULT; report_fault(env);
return -1;
} }
num_of_bytes = write(fd, dst, len); num_of_bytes = write(fd, dst, len);
@ -204,8 +209,7 @@ static int read_from_file(CPUMIPSState *env, target_ulong fd,
int num_of_bytes; int num_of_bytes;
void *dst = lock_user(VERIFY_WRITE, vaddr, len, 0); void *dst = lock_user(VERIFY_WRITE, vaddr, len, 0);
if (!dst) { if (!dst) {
errno = EFAULT; report_fault(env);
return -1;
} }
num_of_bytes = read(fd, dst, len); num_of_bytes = read(fd, dst, len);
@ -220,7 +224,7 @@ static int copy_argn_to_target(CPUMIPSState *env, int arg_num,
int strsize = strlen(semihosting_get_arg(arg_num)) + 1; int strsize = strlen(semihosting_get_arg(arg_num)) + 1;
char *dst = lock_user(VERIFY_WRITE, vaddr, strsize, 0); char *dst = lock_user(VERIFY_WRITE, vaddr, strsize, 0);
if (!dst) { if (!dst) {
return -1; report_fault(env);
} }
strcpy(dst, semihosting_get_arg(arg_num)); strcpy(dst, semihosting_get_arg(arg_num));
@ -233,9 +237,7 @@ static int copy_argn_to_target(CPUMIPSState *env, int arg_num,
do { \ do { \
p = lock_user_string(addr); \ p = lock_user_string(addr); \
if (!p) { \ if (!p) { \
gpr[2] = -1; \ report_fault(env); \
gpr[3] = EFAULT; \
return; \
} \ } \
} while (0) } while (0)
@ -243,16 +245,11 @@ static int copy_argn_to_target(CPUMIPSState *env, int arg_num,
do { \ do { \
p = lock_user_string(addr); \ p = lock_user_string(addr); \
if (!p) { \ if (!p) { \
gpr[2] = -1; \ report_fault(env); \
gpr[3] = EFAULT; \
return; \
} \ } \
p2 = lock_user_string(addr2); \ p2 = lock_user_string(addr2); \
if (!p2) { \ if (!p2) { \
unlock_user(p, addr, 0); \ report_fault(env); \
gpr[2] = -1; \
gpr[3] = EFAULT; \
return; \
} \ } \
} while (0) } while (0)
@ -375,7 +372,7 @@ void mips_semihosting(CPUMIPSState *env)
break; break;
#endif #endif
default: default:
fprintf(stderr, "Unknown UHI operation %d\n", op); error_report("Unknown UHI operation %d", op);
abort(); abort();
} }
return; return;