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

target/mips: Remove tswap() calls in semihosting uhi_fstat_cb()

Browse Source 
In preparation of heterogeneous emulation where cores with
different endianness can run concurrently, we need to remove
the tswap() calls -- which use a fixed per-binary endianness.

Get the endianness of the UHI CPU accessed using
mips_env_is_bigendian() and replace the tswap() calls
by bswap() ones when necessary.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20241211230357.97036-3-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-12-06 00:09:24 +01:00
parent b82f70bb9d
commit 6277e181a7
1 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
target/mips/tcg/system/mips-semi.c
View File

@ -168,6 +168,7 @@ static void uhi_fstat_cb(CPUState *cs, uint64_t ret, int err)
if (!err) { if (!err) {
CPUMIPSState *env = cpu_env(cs); CPUMIPSState *env = cpu_env(cs);
bool swap_needed = HOST_BIG_ENDIAN != mips_env_is_bigendian(env);
target_ulong addr = env->active_tc.gpr[5]; target_ulong addr = env->active_tc.gpr[5];
UHIStat *dst = lock_user(VERIFY_WRITE, addr, sizeof(UHIStat), 1); UHIStat *dst = lock_user(VERIFY_WRITE, addr, sizeof(UHIStat), 1);
struct gdb_stat s; struct gdb_stat s;
@ -179,19 +180,35 @@ static void uhi_fstat_cb(CPUState *cs, uint64_t ret, int err)
memcpy(&s, dst, sizeof(struct gdb_stat)); memcpy(&s, dst, sizeof(struct gdb_stat));
memset(dst, 0, sizeof(UHIStat)); memset(dst, 0, sizeof(UHIStat));
dst->uhi_st_dev = tswap16(be32_to_cpu(s.gdb_st_dev)); dst->uhi_st_dev = be32_to_cpu(s.gdb_st_dev);
dst->uhi_st_ino = tswap16(be32_to_cpu(s.gdb_st_ino)); dst->uhi_st_ino = be32_to_cpu(s.gdb_st_ino);
dst->uhi_st_mode = tswap32(be32_to_cpu(s.gdb_st_mode)); dst->uhi_st_mode = be32_to_cpu(s.gdb_st_mode);
dst->uhi_st_nlink = tswap16(be32_to_cpu(s.gdb_st_nlink)); dst->uhi_st_nlink = be32_to_cpu(s.gdb_st_nlink);
dst->uhi_st_uid = tswap16(be32_to_cpu(s.gdb_st_uid)); dst->uhi_st_uid = be32_to_cpu(s.gdb_st_uid);
dst->uhi_st_gid = tswap16(be32_to_cpu(s.gdb_st_gid)); dst->uhi_st_gid = be32_to_cpu(s.gdb_st_gid);
dst->uhi_st_rdev = tswap16(be32_to_cpu(s.gdb_st_rdev)); dst->uhi_st_rdev = be32_to_cpu(s.gdb_st_rdev);
dst->uhi_st_size = tswap64(be64_to_cpu(s.gdb_st_size)); dst->uhi_st_size = be64_to_cpu(s.gdb_st_size);
dst->uhi_st_atime = tswap64(be32_to_cpu(s.gdb_st_atime)); dst->uhi_st_atime = be32_to_cpu(s.gdb_st_atime);
dst->uhi_st_mtime = tswap64(be32_to_cpu(s.gdb_st_mtime)); dst->uhi_st_mtime = be32_to_cpu(s.gdb_st_mtime);
dst->uhi_st_ctime = tswap64(be32_to_cpu(s.gdb_st_ctime)); dst->uhi_st_ctime = be32_to_cpu(s.gdb_st_ctime);
dst->uhi_st_blksize = tswap64(be64_to_cpu(s.gdb_st_blksize)); dst->uhi_st_blksize = be64_to_cpu(s.gdb_st_blksize);
dst->uhi_st_blocks = tswap64(be64_to_cpu(s.gdb_st_blocks)); dst->uhi_st_blocks = be64_to_cpu(s.gdb_st_blocks);
if (swap_needed) {
dst->uhi_st_dev = bswap16(dst->uhi_st_dev);
dst->uhi_st_ino = bswap16(dst->uhi_st_ino);
dst->uhi_st_mode = bswap32(dst->uhi_st_mode);
dst->uhi_st_nlink = bswap16(dst->uhi_st_nlink);
dst->uhi_st_uid = bswap16(dst->uhi_st_uid);
dst->uhi_st_gid = bswap16(dst->uhi_st_gid);
dst->uhi_st_rdev = bswap16(dst->uhi_st_rdev);
dst->uhi_st_size = bswap64(dst->uhi_st_size);
dst->uhi_st_atime = bswap64(dst->uhi_st_atime);
dst->uhi_st_mtime = bswap64(dst->uhi_st_mtime);
dst->uhi_st_ctime = bswap64(dst->uhi_st_ctime);
dst->uhi_st_blksize = bswap64(dst->uhi_st_blksize);
dst->uhi_st_blocks = bswap64(dst->uhi_st_blocks);
}
unlock_user(dst, addr, sizeof(UHIStat)); unlock_user(dst, addr, sizeof(UHIStat));
} }