[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/12] target/mips: Create report_fault for semihosting
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 05/12] target/mips: Create report_fault for semihosting |
Date: |
Tue, 12 Jul 2022 22:53:40 +0200 |
From: Richard Henderson <richard.henderson@linaro.org>
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>
---
target/mips/tcg/sysemu/mips-semi.c | 33 ++++++++++++++----------------
1 file changed, 15 insertions(+), 18 deletions(-)
diff --git a/target/mips/tcg/sysemu/mips-semi.c
b/target/mips/tcg/sysemu/mips-semi.c
index 67c35fe7f9..153df1fa15 100644
--- a/target/mips/tcg/sysemu/mips-semi.c
+++ b/target/mips/tcg/sysemu/mips-semi.c
@@ -114,6 +114,13 @@ enum UHIErrno {
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)
{
/* 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);
UHIStat *dst = lock_user(VERIFY_WRITE, vaddr, len, 0);
if (!dst) {
- errno = EFAULT;
- return -1;
+ report_fault(env);
}
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;
void *dst = lock_user(VERIFY_READ, vaddr, len, 1);
if (!dst) {
- errno = EFAULT;
- return -1;
+ report_fault(env);
}
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;
void *dst = lock_user(VERIFY_WRITE, vaddr, len, 0);
if (!dst) {
- errno = EFAULT;
- return -1;
+ report_fault(env);
}
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;
char *dst = lock_user(VERIFY_WRITE, vaddr, strsize, 0);
if (!dst) {
- return -1;
+ report_fault(env);
}
strcpy(dst, semihosting_get_arg(arg_num));
@@ -233,9 +237,7 @@ static int copy_argn_to_target(CPUMIPSState *env, int
arg_num,
do { \
p = lock_user_string(addr); \
if (!p) { \
- gpr[2] = -1; \
- gpr[3] = EFAULT; \
- return; \
+ report_fault(env); \
} \
} while (0)
@@ -243,16 +245,11 @@ static int copy_argn_to_target(CPUMIPSState *env, int
arg_num,
do { \
p = lock_user_string(addr); \
if (!p) { \
- gpr[2] = -1; \
- gpr[3] = EFAULT; \
- return; \
+ report_fault(env); \
} \
p2 = lock_user_string(addr2); \
if (!p2) { \
- unlock_user(p, addr, 0); \
- gpr[2] = -1; \
- gpr[3] = EFAULT; \
- return; \
+ report_fault(env); \
} \
} while (0)
@@ -375,7 +372,7 @@ void mips_semihosting(CPUMIPSState *env)
break;
#endif
default:
- fprintf(stderr, "Unknown UHI operation %d\n", op);
+ error_report("Unknown UHI operation %d", op);
abort();
}
return;
--
2.36.1
- [PULL 00/12] MIPS patches for 2022-07-12, Philippe Mathieu-Daudé, 2022/07/12
- [PULL 01/12] target/mips: introduce decodetree structure for Cavium Octeon extension, Philippe Mathieu-Daudé, 2022/07/12
- [PULL 02/12] target/mips: implement Octeon-specific BBIT instructions, Philippe Mathieu-Daudé, 2022/07/12
- [PULL 03/12] target/mips: implement Octeon-specific arithmetic instructions, Philippe Mathieu-Daudé, 2022/07/12
- [PULL 05/12] target/mips: Create report_fault for semihosting,
Philippe Mathieu-Daudé <=
- [PULL 04/12] target/mips: introduce Cavium Octeon CPU model, Philippe Mathieu-Daudé, 2022/07/12
- [PULL 06/12] target/mips: Drop link syscall from semihosting, Philippe Mathieu-Daudé, 2022/07/12
- [PULL 07/12] target/mips: Use semihosting/syscalls.h, Philippe Mathieu-Daudé, 2022/07/12
- [PULL 08/12] target/mips: Avoid qemu_semihosting_log_out for UHI_plog, Philippe Mathieu-Daudé, 2022/07/12
- [PULL 09/12] target/mips: Use error_report for UHI_assert, Philippe Mathieu-Daudé, 2022/07/12
- [PULL 10/12] semihosting: Remove qemu_semihosting_log_out, Philippe Mathieu-Daudé, 2022/07/12
- [PULL 11/12] target/mips: Simplify UHI_argnlen and UHI_argn, Philippe Mathieu-Daudé, 2022/07/12
- [PULL 12/12] target/mips: Remove GET_TARGET_STRING and FREE_TARGET_STRING, Philippe Mathieu-Daudé, 2022/07/12
- Re: [PULL 00/12] MIPS patches for 2022-07-12, Peter Maydell, 2022/07/14