fridtjof/qemu-cr16
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

semihosting/syscalls: replace uint64_t with vaddr where appropriate

Browse source 
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-ID: <20250822150058.18692-3-pierrick.bouvier@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-ID: <20250922093711.2768983-6-alex.bennee@linaro.org>
This commit is contained in:
Pierrick Bouvier 2025-09-22 10:36:50 +01:00 • committed by Alex Bennée
parent abc4522d01
commit 664172404a
1 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

78
semihosting/syscalls.c
View file

@ -22,7 +22,7 @@
/* /*
* Validate or compute the length of the string (including terminator). * Validate or compute the length of the string (including terminator).
*/ */
static int validate_strlen(CPUState *cs, uint64_t str, uint64_t tlen) static int validate_strlen(CPUState *cs, vaddr str, uint64_t tlen)
{ {
CPUArchState *env G_GNUC_UNUSED = cpu_env(cs); CPUArchState *env G_GNUC_UNUSED = cpu_env(cs);
char c; char c;
@ -51,7 +51,7 @@ static int validate_strlen(CPUState *cs, uint64_t str, uint64_t tlen)
} }
static int validate_lock_user_string(char **pstr, CPUState *cs, static int validate_lock_user_string(char **pstr, CPUState *cs,
uint64_t tstr, uint64_t tlen) vaddr tstr, uint64_t tlen)
{ {
int ret = validate_strlen(cs, tstr, tlen); int ret = validate_strlen(cs, tstr, tlen);
CPUArchState *env G_GNUC_UNUSED = cpu_env(cs); CPUArchState *env G_GNUC_UNUSED = cpu_env(cs);
@ -71,7 +71,7 @@ static int validate_lock_user_string(char **pstr, CPUState *cs,
* big-endian. Until we do something with gdb, also produce the * big-endian. Until we do something with gdb, also produce the
* same big-endian result from the host. * same big-endian result from the host.
*/ */
static int copy_stat_to_user(CPUState *cs, uint64_t addr, static int copy_stat_to_user(CPUState *cs, vaddr addr,
const struct stat *s) const struct stat *s)
{ {
CPUArchState *env G_GNUC_UNUSED = cpu_env(cs); CPUArchState *env G_GNUC_UNUSED = cpu_env(cs);
@ -128,7 +128,7 @@ static void gdb_open_cb(CPUState *cs, uint64_t ret, int err)
} }
static void gdb_open(CPUState *cs, gdb_syscall_complete_cb complete, static void gdb_open(CPUState *cs, gdb_syscall_complete_cb complete,
uint64_t fname, uint64_t fname_len, vaddr fname, uint64_t fname_len,
int gdb_flags, int mode) int gdb_flags, int mode)
{ {
int len = validate_strlen(cs, fname, fname_len); int len = validate_strlen(cs, fname, fname_len);
@ -139,7 +139,7 @@ static void gdb_open(CPUState *cs, gdb_syscall_complete_cb complete,
gdb_open_complete = complete; gdb_open_complete = complete;
gdb_do_syscall(gdb_open_cb, "open,%s,%x,%x", gdb_do_syscall(gdb_open_cb, "open,%s,%x,%x",
(uint64_t)fname, (uint32_t)len, (vaddr)fname, (uint32_t)len,
(uint32_t)gdb_flags, (uint32_t)mode); (uint32_t)gdb_flags, (uint32_t)mode);
} }
@ -150,17 +150,17 @@ static void gdb_close(CPUState *cs, gdb_syscall_complete_cb complete,
} }
static void gdb_read(CPUState *cs, gdb_syscall_complete_cb complete, static void gdb_read(CPUState *cs, gdb_syscall_complete_cb complete,
GuestFD *gf, uint64_t buf, uint64_t len) GuestFD *gf, vaddr buf, uint64_t len)
{ {
gdb_do_syscall(complete, "read,%x,%lx,%lx", gdb_do_syscall(complete, "read,%x,%lx,%lx",
(uint32_t)gf->hostfd, (uint64_t)buf, (uint64_t)len); (uint32_t)gf->hostfd, (vaddr)buf, (uint64_t)len);
} }
static void gdb_write(CPUState *cs, gdb_syscall_complete_cb complete, static void gdb_write(CPUState *cs, gdb_syscall_complete_cb complete,
GuestFD *gf, uint64_t buf, uint64_t len) GuestFD *gf, vaddr buf, uint64_t len)
{ {
gdb_do_syscall(complete, "write,%x,%lx,%lx", gdb_do_syscall(complete, "write,%x,%lx,%lx",
(uint32_t)gf->hostfd, (uint64_t)buf, (uint64_t)len); (uint32_t)gf->hostfd, (vaddr)buf, (uint64_t)len);
} }
static void gdb_lseek(CPUState *cs, gdb_syscall_complete_cb complete, static void gdb_lseek(CPUState *cs, gdb_syscall_complete_cb complete,
@ -177,15 +177,15 @@ static void gdb_isatty(CPUState *cs, gdb_syscall_complete_cb complete,
} }
static void gdb_fstat(CPUState *cs, gdb_syscall_complete_cb complete, static void gdb_fstat(CPUState *cs, gdb_syscall_complete_cb complete,
GuestFD *gf, uint64_t addr) GuestFD *gf, vaddr addr)
{ {
gdb_do_syscall(complete, "fstat,%x,%lx", gdb_do_syscall(complete, "fstat,%x,%lx",
(uint32_t)gf->hostfd, (uint64_t)addr); (uint32_t)gf->hostfd, (vaddr)addr);
} }
static void gdb_stat(CPUState *cs, gdb_syscall_complete_cb complete, static void gdb_stat(CPUState *cs, gdb_syscall_complete_cb complete,
uint64_t fname, uint64_t fname_len, vaddr fname, uint64_t fname_len,
uint64_t addr) vaddr addr)
{ {
int len = validate_strlen(cs, fname, fname_len); int len = validate_strlen(cs, fname, fname_len);
if (len < 0) { if (len < 0) {
@ -194,11 +194,11 @@ static void gdb_stat(CPUState *cs, gdb_syscall_complete_cb complete,
} }
gdb_do_syscall(complete, "stat,%s,%lx", gdb_do_syscall(complete, "stat,%s,%lx",
(uint64_t)fname, (uint32_t)len, (uint64_t)addr); (vaddr)fname, (uint32_t)len, (vaddr)addr);
} }
static void gdb_remove(CPUState *cs, gdb_syscall_complete_cb complete, static void gdb_remove(CPUState *cs, gdb_syscall_complete_cb complete,
uint64_t fname, uint64_t fname_len) vaddr fname, uint64_t fname_len)
{ {
int len = validate_strlen(cs, fname, fname_len); int len = validate_strlen(cs, fname, fname_len);
if (len < 0) { if (len < 0) {
@ -206,12 +206,12 @@ static void gdb_remove(CPUState *cs, gdb_syscall_complete_cb complete,
return; return;
} }
gdb_do_syscall(complete, "unlink,%s", (uint64_t)fname, (uint32_t)len); gdb_do_syscall(complete, "unlink,%s", (vaddr)fname, (uint32_t)len);
} }
static void gdb_rename(CPUState *cs, gdb_syscall_complete_cb complete, static void gdb_rename(CPUState *cs, gdb_syscall_complete_cb complete,
uint64_t oname, uint64_t oname_len, vaddr oname, uint64_t oname_len,
uint64_t nname, uint64_t nname_len) vaddr nname, uint64_t nname_len)
{ {
int olen, nlen; int olen, nlen;
@ -227,12 +227,12 @@ static void gdb_rename(CPUState *cs, gdb_syscall_complete_cb complete,
} }
gdb_do_syscall(complete, "rename,%s,%s", gdb_do_syscall(complete, "rename,%s,%s",
(uint64_t)oname, (uint32_t)olen, (vaddr)oname, (uint32_t)olen,
(uint64_t)nname, (uint32_t)nlen); (vaddr)nname, (uint32_t)nlen);
} }
static void gdb_system(CPUState *cs, gdb_syscall_complete_cb complete, static void gdb_system(CPUState *cs, gdb_syscall_complete_cb complete,
uint64_t cmd, uint64_t cmd_len) vaddr cmd, uint64_t cmd_len)
{ {
int len = validate_strlen(cs, cmd, cmd_len); int len = validate_strlen(cs, cmd, cmd_len);
if (len < 0) { if (len < 0) {
@ -240,14 +240,14 @@ static void gdb_system(CPUState *cs, gdb_syscall_complete_cb complete,
return; return;
} }
gdb_do_syscall(complete, "system,%s", (uint64_t)cmd, (uint32_t)len); gdb_do_syscall(complete, "system,%s", (vaddr)cmd, (uint32_t)len);
} }
static void gdb_gettimeofday(CPUState *cs, gdb_syscall_complete_cb complete, static void gdb_gettimeofday(CPUState *cs, gdb_syscall_complete_cb complete,
uint64_t tv_addr, uint64_t tz_addr) vaddr tv_addr, vaddr tz_addr)
{ {
gdb_do_syscall(complete, "gettimeofday,%lx,%lx", gdb_do_syscall(complete, "gettimeofday,%lx,%lx",
(uint64_t)tv_addr, (uint64_t)tz_addr); (vaddr)tv_addr, (vaddr)tz_addr);
} }
/* /*
@ -255,7 +255,7 @@ static void gdb_gettimeofday(CPUState *cs, gdb_syscall_complete_cb complete,
*/ */
static void host_open(CPUState *cs, gdb_syscall_complete_cb complete, static void host_open(CPUState *cs, gdb_syscall_complete_cb complete,
uint64_t fname, uint64_t fname_len, vaddr fname, uint64_t fname_len,
int gdb_flags, int mode) int gdb_flags, int mode)
{ {
CPUArchState *env G_GNUC_UNUSED = cpu_env(cs); CPUArchState *env G_GNUC_UNUSED = cpu_env(cs);
@ -315,7 +315,7 @@ static void host_close(CPUState *cs, gdb_syscall_complete_cb complete,
} }
static void host_read(CPUState *cs, gdb_syscall_complete_cb complete, static void host_read(CPUState *cs, gdb_syscall_complete_cb complete,
GuestFD *gf, uint64_t buf, uint64_t len) GuestFD *gf, vaddr buf, uint64_t len)
{ {
CPUArchState *env G_GNUC_UNUSED = cpu_env(cs); CPUArchState *env G_GNUC_UNUSED = cpu_env(cs);
void *ptr = lock_user(VERIFY_WRITE, buf, len, 0); void *ptr = lock_user(VERIFY_WRITE, buf, len, 0);
@ -336,7 +336,7 @@ static void host_read(CPUState *cs, gdb_syscall_complete_cb complete,
} }
static void host_write(CPUState *cs, gdb_syscall_complete_cb complete, static void host_write(CPUState *cs, gdb_syscall_complete_cb complete,
GuestFD *gf, uint64_t buf, uint64_t len) GuestFD *gf, vaddr buf, uint64_t len)
{ {
CPUArchState *env G_GNUC_UNUSED = cpu_env(cs); CPUArchState *env G_GNUC_UNUSED = cpu_env(cs);
void *ptr = lock_user(VERIFY_READ, buf, len, 1); void *ptr = lock_user(VERIFY_READ, buf, len, 1);
@ -394,7 +394,7 @@ static void host_flen(CPUState *cs, gdb_syscall_complete_cb complete,
} }
static void host_fstat(CPUState *cs, gdb_syscall_complete_cb complete, static void host_fstat(CPUState *cs, gdb_syscall_complete_cb complete,
GuestFD *gf, uint64_t addr) GuestFD *gf, vaddr addr)
{ {
struct stat buf; struct stat buf;
int ret; int ret;
@ -409,8 +409,8 @@ static void host_fstat(CPUState *cs, gdb_syscall_complete_cb complete,
} }
static void host_stat(CPUState *cs, gdb_syscall_complete_cb complete, static void host_stat(CPUState *cs, gdb_syscall_complete_cb complete,
uint64_t fname, uint64_t fname_len, vaddr fname, uint64_t fname_len,
uint64_t addr) vaddr addr)
{ {
CPUArchState *env G_GNUC_UNUSED = cpu_env(cs); CPUArchState *env G_GNUC_UNUSED = cpu_env(cs);
struct stat buf; struct stat buf;
@ -439,7 +439,7 @@ static void host_stat(CPUState *cs, gdb_syscall_complete_cb complete,
} }
static void host_remove(CPUState *cs, gdb_syscall_complete_cb complete, static void host_remove(CPUState *cs, gdb_syscall_complete_cb complete,
uint64_t fname, uint64_t fname_len) vaddr fname, uint64_t fname_len)
{ {
CPUArchState *env G_GNUC_UNUSED = cpu_env(cs); CPUArchState *env G_GNUC_UNUSED = cpu_env(cs);
char *p; char *p;
@ -457,8 +457,8 @@ static void host_remove(CPUState *cs, gdb_syscall_complete_cb complete,
} }
static void host_rename(CPUState *cs, gdb_syscall_complete_cb complete, static void host_rename(CPUState *cs, gdb_syscall_complete_cb complete,
uint64_t oname, uint64_t oname_len, vaddr oname, uint64_t oname_len,
uint64_t nname, uint64_t nname_len) vaddr nname, uint64_t nname_len)
{ {
CPUArchState *env G_GNUC_UNUSED = cpu_env(cs); CPUArchState *env G_GNUC_UNUSED = cpu_env(cs);
char *ostr, *nstr; char *ostr, *nstr;
@ -483,7 +483,7 @@ static void host_rename(CPUState *cs, gdb_syscall_complete_cb complete,
} }
static void host_system(CPUState *cs, gdb_syscall_complete_cb complete, static void host_system(CPUState *cs, gdb_syscall_complete_cb complete,
uint64_t cmd, uint64_t cmd_len) vaddr cmd, uint64_t cmd_len)
{ {
CPUArchState *env G_GNUC_UNUSED = cpu_env(cs); CPUArchState *env G_GNUC_UNUSED = cpu_env(cs);
char *p; char *p;
@ -501,7 +501,7 @@ static void host_system(CPUState *cs, gdb_syscall_complete_cb complete,
} }
static void host_gettimeofday(CPUState *cs, gdb_syscall_complete_cb complete, static void host_gettimeofday(CPUState *cs, gdb_syscall_complete_cb complete,
uint64_t tv_addr, uint64_t tz_addr) vaddr tv_addr, vaddr tz_addr)
{ {
CPUArchState *env G_GNUC_UNUSED = cpu_env(cs); CPUArchState *env G_GNUC_UNUSED = cpu_env(cs);
struct gdb_timeval *p; struct gdb_timeval *p;
@ -546,7 +546,7 @@ static void host_poll_one(CPUState *cs, gdb_syscall_complete_cb complete,
*/ */
static void staticfile_read(CPUState *cs, gdb_syscall_complete_cb complete, static void staticfile_read(CPUState *cs, gdb_syscall_complete_cb complete,
GuestFD *gf, uint64_t buf, uint64_t len) GuestFD *gf, vaddr buf, uint64_t len)
{ {
CPUArchState *env G_GNUC_UNUSED = cpu_env(cs); CPUArchState *env G_GNUC_UNUSED = cpu_env(cs);
uint64_t rest = gf->staticfile.len - gf->staticfile.off; uint64_t rest = gf->staticfile.len - gf->staticfile.off;
@ -604,7 +604,7 @@ static void staticfile_flen(CPUState *cs, gdb_syscall_complete_cb complete,
*/ */
static void console_read(CPUState *cs, gdb_syscall_complete_cb complete, static void console_read(CPUState *cs, gdb_syscall_complete_cb complete,
GuestFD *gf, uint64_t buf, uint64_t len) GuestFD *gf, vaddr buf, uint64_t len)
{ {
CPUArchState *env G_GNUC_UNUSED = cpu_env(cs); CPUArchState *env G_GNUC_UNUSED = cpu_env(cs);
char *ptr; char *ptr;
@ -621,7 +621,7 @@ static void console_read(CPUState *cs, gdb_syscall_complete_cb complete,
} }
static void console_write(CPUState *cs, gdb_syscall_complete_cb complete, static void console_write(CPUState *cs, gdb_syscall_complete_cb complete,
GuestFD *gf, uint64_t buf, uint64_t len) GuestFD *gf, vaddr buf, uint64_t len)
{ {
CPUArchState *env G_GNUC_UNUSED = cpu_env(cs); CPUArchState *env G_GNUC_UNUSED = cpu_env(cs);
char *ptr = lock_user(VERIFY_READ, buf, len, 1); char *ptr = lock_user(VERIFY_READ, buf, len, 1);
@ -637,7 +637,7 @@ static void console_write(CPUState *cs, gdb_syscall_complete_cb complete,
} }
static void console_fstat(CPUState *cs, gdb_syscall_complete_cb complete, static void console_fstat(CPUState *cs, gdb_syscall_complete_cb complete,
GuestFD *gf, uint64_t addr) GuestFD *gf, vaddr addr)
{ {
static const struct stat tty_buf = { static const struct stat tty_buf = {
.st_mode = 020666, /* S_IFCHR, ugo+rw */ .st_mode = 020666, /* S_IFCHR, ugo+rw */