ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

semihosting: Return failure from softmmu-uaccess.h functions 

We were reporting unconditional success for these functions;
pass on any failure from cpu_memory_rw_debug.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2022-04-27 20:01:24 -07:00
parent c89a14ad2c
commit 8ce5c64499
1 changed files with 39 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
include/semihosting/softmmu-uaccess.h
View File

@ -12,82 +12,69 @@
#include "cpu.h" #include "cpu.h"
static inline uint64_t softmmu_tget64(CPUArchState *env, target_ulong addr) #define get_user_u64(val, addr) \
{ ({ uint64_t val_ = 0; \
uint64_t val; int ret_ = cpu_memory_rw_debug(env_cpu(env), (addr), \
&val_, sizeof(val_), 0); \
(val) = tswap64(val_); ret_; })
cpu_memory_rw_debug(env_cpu(env), addr, (uint8_t *)&val, 8, 0); #define get_user_u32(val, addr) \
return tswap64(val); ({ uint32_t val_ = 0; \
} int ret_ = cpu_memory_rw_debug(env_cpu(env), (addr), \
&val_, sizeof(val_), 0); \
(val) = tswap32(val_); ret_; })
static inline uint32_t softmmu_tget32(CPUArchState *env, target_ulong addr) #define get_user_u8(val, addr) \
{ ({ uint8_t val_ = 0; \
uint32_t val; int ret_ = cpu_memory_rw_debug(env_cpu(env), (addr), \
&val_, sizeof(val_), 0); \
(val) = val_; ret_; })
cpu_memory_rw_debug(env_cpu(env), addr, (uint8_t *)&val, 4, 0);
return tswap32(val);
}
static inline uint32_t softmmu_tget8(CPUArchState *env, target_ulong addr)
{
uint8_t val;
cpu_memory_rw_debug(env_cpu(env), addr, &val, 1, 0);
return val;
}
#define get_user_u64(arg, p) ({ arg = softmmu_tget64(env, p); 0; })
#define get_user_u32(arg, p) ({ arg = softmmu_tget32(env, p) ; 0; })
#define get_user_u8(arg, p) ({ arg = softmmu_tget8(env, p) ; 0; })
#define get_user_ual(arg, p) get_user_u32(arg, p) #define get_user_ual(arg, p) get_user_u32(arg, p)
static inline void softmmu_tput64(CPUArchState *env, #define put_user_u64(val, addr) \
target_ulong addr, uint64_t val) ({ uint64_t val_ = tswap64(val); \
{ cpu_memory_rw_debug(env_cpu(env), (addr), &val_, sizeof(val_), 1); })
val = tswap64(val);
cpu_memory_rw_debug(env_cpu(env), addr, (uint8_t *)&val, 8, 1); #define put_user_u32(val, addr) \
} ({ uint32_t val_ = tswap32(val); \
cpu_memory_rw_debug(env_cpu(env), (addr), &val_, sizeof(val_), 1); })
static inline void softmmu_tput32(CPUArchState *env,
target_ulong addr, uint32_t val)
{
val = tswap32(val);
cpu_memory_rw_debug(env_cpu(env), addr, (uint8_t *)&val, 4, 1);
}
#define put_user_u64(arg, p) ({ softmmu_tput64(env, p, arg) ; 0; })
#define put_user_u32(arg, p) ({ softmmu_tput32(env, p, arg) ; 0; })
#define put_user_ual(arg, p) put_user_u32(arg, p) #define put_user_ual(arg, p) put_user_u32(arg, p)
static void *softmmu_lock_user(CPUArchState *env, static void *softmmu_lock_user(CPUArchState *env, target_ulong addr,
target_ulong addr, target_ulong len, int copy) target_ulong len, bool copy)
{ {
uint8_t *p; void *p = malloc(len);
/* TODO: Make this something that isn't fixed size. */
p = malloc(len);
if (p && copy) { if (p && copy) {
cpu_memory_rw_debug(env_cpu(env), addr, p, len, 0); if (cpu_memory_rw_debug(env_cpu(env), addr, p, len, 0)) {
free(p);
p = NULL;
}
} }
return p; return p;
} }
#define lock_user(type, p, len, copy) softmmu_lock_user(env, p, len, copy) #define lock_user(type, p, len, copy) softmmu_lock_user(env, p, len, copy)
static char *softmmu_lock_user_string(CPUArchState *env, target_ulong addr) static char *softmmu_lock_user_string(CPUArchState *env, target_ulong addr)
{ {
char *p;
char *s;
uint8_t c;
/* TODO: Make this something that isn't fixed size. */ /* TODO: Make this something that isn't fixed size. */
s = p = malloc(1024); char *s = malloc(1024);
size_t len = 0;
if (!s) { if (!s) {
return NULL; return NULL;
} }
do { do {
cpu_memory_rw_debug(env_cpu(env), addr, &c, 1, 0); if (cpu_memory_rw_debug(env_cpu(env), addr++, s + len, 1, 0)) {
addr++; free(s);
*(p++) = c; return NULL;
} while (c); }
} while (s[len++]);
return s; return s;
} }
#define lock_user_string(p) softmmu_lock_user_string(env, p) #define lock_user_string(p) softmmu_lock_user_string(env, p)
static void softmmu_unlock_user(CPUArchState *env, void *p, target_ulong addr, static void softmmu_unlock_user(CPUArchState *env, void *p, target_ulong addr,
target_ulong len) target_ulong len)
{ {