mirror of
https://gitlab.com/qemu-project/qemu.git
synced 2024-10-12 13:21:55 +03:00
{linux,bsd}-user: Introduce get_task_state()
A CPU's TaskState is stored in the CPUState's void *opaque field, accessing which is somewhat awkward due to having to use a cast. Introduce a wrapper and use it everywhere. Suggested-by: Alex Bennée <alex.bennee@linaro.org> Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> Reviewed-by: Warner Losh <imp@bsdimp.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20240219141628.246823-3-iii@linux.ibm.com> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20240305121005.3528075-4-alex.bennee@linaro.org>
This commit is contained in:
parent
1ea96f1ded
commit
e4e5cb4a54
@ -641,7 +641,7 @@ static abi_long do_bsd_readlink(CPUArchState *env, abi_long arg1,
|
||||
}
|
||||
if (strcmp(p1, "/proc/curproc/file") == 0) {
|
||||
CPUState *cpu = env_cpu(env);
|
||||
TaskState *ts = (TaskState *)cpu->opaque;
|
||||
TaskState *ts = get_task_state(cpu);
|
||||
strncpy(p2, ts->bprm->fullpath, arg3);
|
||||
ret = MIN((abi_long)strlen(ts->bprm->fullpath), arg3);
|
||||
} else {
|
||||
|
@ -117,6 +117,11 @@ typedef struct TaskState {
|
||||
struct target_sigaltstack sigaltstack_used;
|
||||
} __attribute__((aligned(16))) TaskState;
|
||||
|
||||
static inline TaskState *get_task_state(CPUState *cs)
|
||||
{
|
||||
return cs->opaque;
|
||||
}
|
||||
|
||||
void stop_all_tasks(void);
|
||||
extern const char *interp_prefix;
|
||||
extern const char *qemu_uname_release;
|
||||
|
@ -319,7 +319,7 @@ void host_to_target_siginfo(target_siginfo_t *tinfo, const siginfo_t *info)
|
||||
|
||||
int block_signals(void)
|
||||
{
|
||||
TaskState *ts = (TaskState *)thread_cpu->opaque;
|
||||
TaskState *ts = get_task_state(thread_cpu);
|
||||
sigset_t set;
|
||||
|
||||
/*
|
||||
@ -359,7 +359,7 @@ void dump_core_and_abort(int target_sig)
|
||||
{
|
||||
CPUState *cpu = thread_cpu;
|
||||
CPUArchState *env = cpu_env(cpu);
|
||||
TaskState *ts = cpu->opaque;
|
||||
TaskState *ts = get_task_state(cpu);
|
||||
int core_dumped = 0;
|
||||
int host_sig;
|
||||
struct sigaction act;
|
||||
@ -421,7 +421,7 @@ void queue_signal(CPUArchState *env, int sig, int si_type,
|
||||
target_siginfo_t *info)
|
||||
{
|
||||
CPUState *cpu = env_cpu(env);
|
||||
TaskState *ts = cpu->opaque;
|
||||
TaskState *ts = get_task_state(cpu);
|
||||
|
||||
trace_user_queue_signal(env, sig);
|
||||
|
||||
@ -476,7 +476,7 @@ void force_sig_fault(int sig, int code, abi_ulong addr)
|
||||
static void host_signal_handler(int host_sig, siginfo_t *info, void *puc)
|
||||
{
|
||||
CPUState *cpu = thread_cpu;
|
||||
TaskState *ts = cpu->opaque;
|
||||
TaskState *ts = get_task_state(cpu);
|
||||
target_siginfo_t tinfo;
|
||||
ucontext_t *uc = puc;
|
||||
struct emulated_sigtable *k;
|
||||
@ -585,7 +585,7 @@ static void host_signal_handler(int host_sig, siginfo_t *info, void *puc)
|
||||
/* compare to kern/kern_sig.c sys_sigaltstack() and kern_sigaltstack() */
|
||||
abi_long do_sigaltstack(abi_ulong uss_addr, abi_ulong uoss_addr, abi_ulong sp)
|
||||
{
|
||||
TaskState *ts = (TaskState *)thread_cpu->opaque;
|
||||
TaskState *ts = get_task_state(thread_cpu);
|
||||
int ret;
|
||||
target_stack_t oss;
|
||||
|
||||
@ -714,7 +714,7 @@ int do_sigaction(int sig, const struct target_sigaction *act,
|
||||
static inline abi_ulong get_sigframe(struct target_sigaction *ka,
|
||||
CPUArchState *env, size_t frame_size)
|
||||
{
|
||||
TaskState *ts = (TaskState *)thread_cpu->opaque;
|
||||
TaskState *ts = get_task_state(thread_cpu);
|
||||
abi_ulong sp;
|
||||
|
||||
/* Use default user stack */
|
||||
@ -789,7 +789,7 @@ static int reset_signal_mask(target_ucontext_t *ucontext)
|
||||
int i;
|
||||
sigset_t blocked;
|
||||
target_sigset_t target_set;
|
||||
TaskState *ts = (TaskState *)thread_cpu->opaque;
|
||||
TaskState *ts = get_task_state(thread_cpu);
|
||||
|
||||
for (i = 0; i < TARGET_NSIG_WORDS; i++) {
|
||||
__get_user(target_set.__bits[i], &ucontext->uc_sigmask.__bits[i]);
|
||||
@ -839,7 +839,7 @@ badframe:
|
||||
|
||||
void signal_init(void)
|
||||
{
|
||||
TaskState *ts = (TaskState *)thread_cpu->opaque;
|
||||
TaskState *ts = get_task_state(thread_cpu);
|
||||
struct sigaction act;
|
||||
struct sigaction oact;
|
||||
int i;
|
||||
@ -878,7 +878,7 @@ static void handle_pending_signal(CPUArchState *env, int sig,
|
||||
struct emulated_sigtable *k)
|
||||
{
|
||||
CPUState *cpu = env_cpu(env);
|
||||
TaskState *ts = cpu->opaque;
|
||||
TaskState *ts = get_task_state(cpu);
|
||||
struct target_sigaction *sa;
|
||||
int code;
|
||||
sigset_t set;
|
||||
@ -967,7 +967,7 @@ void process_pending_signals(CPUArchState *env)
|
||||
int sig;
|
||||
sigset_t *blocked_set, set;
|
||||
struct emulated_sigtable *k;
|
||||
TaskState *ts = cpu->opaque;
|
||||
TaskState *ts = get_task_state(cpu);
|
||||
|
||||
while (qatomic_read(&ts->signal_pending)) {
|
||||
sigfillset(&set);
|
||||
|
@ -204,7 +204,7 @@ int gdb_target_signal_to_gdb(int sig)
|
||||
|
||||
int gdb_get_cpu_index(CPUState *cpu)
|
||||
{
|
||||
TaskState *ts = (TaskState *) cpu->opaque;
|
||||
TaskState *ts = get_task_state(cpu);
|
||||
return ts ? ts->ts_tid : -1;
|
||||
}
|
||||
|
||||
@ -399,7 +399,7 @@ void gdb_handle_query_xfer_exec_file(GArray *params, void *user_ctx)
|
||||
return;
|
||||
}
|
||||
|
||||
TaskState *ts = cpu->opaque;
|
||||
TaskState *ts = get_task_state(cpu);
|
||||
if (!ts || !ts->bprm || !ts->bprm->filename) {
|
||||
gdb_put_packet("E00");
|
||||
return;
|
||||
|
@ -134,7 +134,7 @@ extern char safe_syscall_start[];
|
||||
extern char safe_syscall_end[];
|
||||
|
||||
#define safe_syscall(...) \
|
||||
safe_syscall_base(&((TaskState *)thread_cpu->opaque)->signal_pending, \
|
||||
safe_syscall_base(&get_task_state(thread_cpu)->signal_pending, \
|
||||
__VA_ARGS__)
|
||||
|
||||
#endif
|
||||
|
@ -189,7 +189,7 @@ void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs)
|
||||
{
|
||||
ARMCPU *cpu = env_archcpu(env);
|
||||
CPUState *cs = env_cpu(env);
|
||||
TaskState *ts = cs->opaque;
|
||||
TaskState *ts = get_task_state(cs);
|
||||
struct image_info *info = ts->info;
|
||||
int i;
|
||||
|
||||
|
@ -263,7 +263,7 @@ static bool insn_is_linux_bkpt(uint32_t opcode, bool is_thumb)
|
||||
|
||||
static bool emulate_arm_fpa11(CPUARMState *env, uint32_t opcode)
|
||||
{
|
||||
TaskState *ts = env_cpu(env)->opaque;
|
||||
TaskState *ts = get_task_state(env_cpu(env));
|
||||
int rc = EmulateAll(opcode, &ts->fpa, env);
|
||||
int raise, enabled;
|
||||
|
||||
@ -514,7 +514,7 @@ void cpu_loop(CPUARMState *env)
|
||||
void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs)
|
||||
{
|
||||
CPUState *cpu = env_cpu(env);
|
||||
TaskState *ts = cpu->opaque;
|
||||
TaskState *ts = get_task_state(cpu);
|
||||
struct image_info *info = ts->info;
|
||||
int i;
|
||||
|
||||
|
@ -177,7 +177,7 @@ setup_return(CPUARMState *env, struct target_sigaction *ka, int usig,
|
||||
abi_ulong handler = 0;
|
||||
abi_ulong handler_fdpic_GOT = 0;
|
||||
abi_ulong retcode;
|
||||
bool is_fdpic = info_is_fdpic(((TaskState *)thread_cpu->opaque)->info);
|
||||
bool is_fdpic = info_is_fdpic(get_task_state(thread_cpu)->info);
|
||||
bool is_rt = ka->sa_flags & TARGET_SA_SIGINFO;
|
||||
bool thumb;
|
||||
|
||||
|
@ -72,7 +72,7 @@ void cpu_loop(CPUCRISState *env)
|
||||
void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs)
|
||||
{
|
||||
CPUState *cpu = env_cpu(env);
|
||||
TaskState *ts = cpu->opaque;
|
||||
TaskState *ts = get_task_state(cpu);
|
||||
struct image_info *info = ts->info;
|
||||
|
||||
env->regs[0] = regs->r0;
|
||||
|
@ -4404,7 +4404,7 @@ static int wmr_write_region(void *opaque, target_ulong start,
|
||||
static int elf_core_dump(int signr, const CPUArchState *env)
|
||||
{
|
||||
const CPUState *cpu = env_cpu((CPUArchState *)env);
|
||||
const TaskState *ts = (const TaskState *)cpu->opaque;
|
||||
const TaskState *ts = (const TaskState *)get_task_state((CPUState *)cpu);
|
||||
struct rlimit dumpsize;
|
||||
CountAndSizeRegions css;
|
||||
off_t offset, note_offset, data_offset;
|
||||
|
@ -112,7 +112,7 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
|
||||
abi_ulong frame_addr, sp, haddr;
|
||||
struct target_rt_sigframe *frame;
|
||||
int i;
|
||||
TaskState *ts = (TaskState *)thread_cpu->opaque;
|
||||
TaskState *ts = get_task_state(thread_cpu);
|
||||
|
||||
sp = get_sp_from_cpustate(env);
|
||||
if ((ka->sa_flags & TARGET_SA_ONSTACK) && !sas_ss_flags(sp)) {
|
||||
|
@ -89,7 +89,7 @@ static int prepare_binprm(struct linux_binprm *bprm)
|
||||
abi_ulong loader_build_argptr(int envc, int argc, abi_ulong sp,
|
||||
abi_ulong stringp, int push_ptr)
|
||||
{
|
||||
TaskState *ts = (TaskState *)thread_cpu->opaque;
|
||||
TaskState *ts = get_task_state(thread_cpu);
|
||||
int n = sizeof(abi_ulong);
|
||||
abi_ulong envp;
|
||||
abi_ulong argv;
|
||||
|
@ -95,7 +95,7 @@ void cpu_loop(CPUM68KState *env)
|
||||
void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs)
|
||||
{
|
||||
CPUState *cpu = env_cpu(env);
|
||||
TaskState *ts = cpu->opaque;
|
||||
TaskState *ts = get_task_state(cpu);
|
||||
struct image_info *info = ts->info;
|
||||
|
||||
env->pc = regs->pc;
|
||||
|
@ -37,7 +37,7 @@ static inline void cpu_clone_regs_parent(CPUM68KState *env, unsigned flags)
|
||||
static inline void cpu_set_tls(CPUM68KState *env, target_ulong newtls)
|
||||
{
|
||||
CPUState *cs = env_cpu(env);
|
||||
TaskState *ts = cs->opaque;
|
||||
TaskState *ts = get_task_state(cs);
|
||||
|
||||
ts->tp_value = newtls;
|
||||
}
|
||||
|
@ -214,7 +214,7 @@ done_syscall:
|
||||
void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs)
|
||||
{
|
||||
CPUState *cpu = env_cpu(env);
|
||||
TaskState *ts = cpu->opaque;
|
||||
TaskState *ts = get_task_state(cpu);
|
||||
struct image_info *info = ts->info;
|
||||
int i;
|
||||
|
||||
|
@ -486,7 +486,7 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
|
||||
int i, err = 0;
|
||||
#if defined(TARGET_PPC64)
|
||||
struct target_sigcontext *sc = 0;
|
||||
struct image_info *image = ((TaskState *)thread_cpu->opaque)->info;
|
||||
struct image_info *image = get_task_state(thread_cpu)->info;
|
||||
#endif
|
||||
|
||||
rt_sf_addr = get_sigframe(ka, env, sizeof(*rt_sf));
|
||||
@ -673,7 +673,7 @@ abi_long do_swapcontext(CPUArchState *env, abi_ulong uold_ctx,
|
||||
}
|
||||
|
||||
if (uold_ctx) {
|
||||
TaskState *ts = (TaskState *)thread_cpu->opaque;
|
||||
TaskState *ts = get_task_state(thread_cpu);
|
||||
|
||||
if (!lock_user_struct(VERIFY_WRITE, uctx, uold_ctx, 1)) {
|
||||
return -TARGET_EFAULT;
|
||||
|
@ -162,6 +162,11 @@ typedef struct TaskState {
|
||||
uint64_t start_boottime;
|
||||
} TaskState;
|
||||
|
||||
static inline TaskState *get_task_state(CPUState *cs)
|
||||
{
|
||||
return cs->opaque;
|
||||
}
|
||||
|
||||
abi_long do_brk(abi_ulong new_brk);
|
||||
int do_guest_openat(CPUArchState *cpu_env, int dirfd, const char *pathname,
|
||||
int flags, mode_t mode, bool safe);
|
||||
|
@ -97,7 +97,7 @@ void cpu_loop(CPURISCVState *env)
|
||||
void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs)
|
||||
{
|
||||
CPUState *cpu = env_cpu(env);
|
||||
TaskState *ts = cpu->opaque;
|
||||
TaskState *ts = get_task_state(cpu);
|
||||
struct image_info *info = ts->info;
|
||||
|
||||
env->pc = regs->sepc;
|
||||
|
@ -113,7 +113,7 @@ int process_sigsuspend_mask(sigset_t **pset, target_ulong sigset,
|
||||
static inline void finish_sigsuspend_mask(int ret)
|
||||
{
|
||||
if (ret != -QEMU_ERESTARTSYS) {
|
||||
TaskState *ts = (TaskState *)thread_cpu->opaque;
|
||||
TaskState *ts = get_task_state(thread_cpu);
|
||||
ts->in_sigsuspend = 1;
|
||||
}
|
||||
}
|
||||
|
@ -172,7 +172,7 @@ void target_to_host_old_sigset(sigset_t *sigset,
|
||||
|
||||
int block_signals(void)
|
||||
{
|
||||
TaskState *ts = (TaskState *)thread_cpu->opaque;
|
||||
TaskState *ts = get_task_state(thread_cpu);
|
||||
sigset_t set;
|
||||
|
||||
/* It's OK to block everything including SIGSEGV, because we won't
|
||||
@ -194,7 +194,7 @@ int block_signals(void)
|
||||
*/
|
||||
int do_sigprocmask(int how, const sigset_t *set, sigset_t *oldset)
|
||||
{
|
||||
TaskState *ts = (TaskState *)thread_cpu->opaque;
|
||||
TaskState *ts = get_task_state(thread_cpu);
|
||||
|
||||
if (oldset) {
|
||||
*oldset = ts->signal_mask;
|
||||
@ -237,7 +237,7 @@ int do_sigprocmask(int how, const sigset_t *set, sigset_t *oldset)
|
||||
*/
|
||||
void set_sigmask(const sigset_t *set)
|
||||
{
|
||||
TaskState *ts = (TaskState *)thread_cpu->opaque;
|
||||
TaskState *ts = get_task_state(thread_cpu);
|
||||
|
||||
ts->signal_mask = *set;
|
||||
}
|
||||
@ -246,7 +246,7 @@ void set_sigmask(const sigset_t *set)
|
||||
|
||||
int on_sig_stack(unsigned long sp)
|
||||
{
|
||||
TaskState *ts = (TaskState *)thread_cpu->opaque;
|
||||
TaskState *ts = get_task_state(thread_cpu);
|
||||
|
||||
return (sp - ts->sigaltstack_used.ss_sp
|
||||
< ts->sigaltstack_used.ss_size);
|
||||
@ -254,7 +254,7 @@ int on_sig_stack(unsigned long sp)
|
||||
|
||||
int sas_ss_flags(unsigned long sp)
|
||||
{
|
||||
TaskState *ts = (TaskState *)thread_cpu->opaque;
|
||||
TaskState *ts = get_task_state(thread_cpu);
|
||||
|
||||
return (ts->sigaltstack_used.ss_size == 0 ? SS_DISABLE
|
||||
: on_sig_stack(sp) ? SS_ONSTACK : 0);
|
||||
@ -265,7 +265,7 @@ abi_ulong target_sigsp(abi_ulong sp, struct target_sigaction *ka)
|
||||
/*
|
||||
* This is the X/Open sanctioned signal stack switching.
|
||||
*/
|
||||
TaskState *ts = (TaskState *)thread_cpu->opaque;
|
||||
TaskState *ts = get_task_state(thread_cpu);
|
||||
|
||||
if ((ka->sa_flags & TARGET_SA_ONSTACK) && !sas_ss_flags(sp)) {
|
||||
return ts->sigaltstack_used.ss_sp + ts->sigaltstack_used.ss_size;
|
||||
@ -275,7 +275,7 @@ abi_ulong target_sigsp(abi_ulong sp, struct target_sigaction *ka)
|
||||
|
||||
void target_save_altstack(target_stack_t *uss, CPUArchState *env)
|
||||
{
|
||||
TaskState *ts = (TaskState *)thread_cpu->opaque;
|
||||
TaskState *ts = get_task_state(thread_cpu);
|
||||
|
||||
__put_user(ts->sigaltstack_used.ss_sp, &uss->ss_sp);
|
||||
__put_user(sas_ss_flags(get_sp_from_cpustate(env)), &uss->ss_flags);
|
||||
@ -284,7 +284,7 @@ void target_save_altstack(target_stack_t *uss, CPUArchState *env)
|
||||
|
||||
abi_long target_restore_altstack(target_stack_t *uss, CPUArchState *env)
|
||||
{
|
||||
TaskState *ts = (TaskState *)thread_cpu->opaque;
|
||||
TaskState *ts = get_task_state(thread_cpu);
|
||||
size_t minstacksize = TARGET_MINSIGSTKSZ;
|
||||
target_stack_t ss;
|
||||
|
||||
@ -571,7 +571,7 @@ static void signal_table_init(void)
|
||||
|
||||
void signal_init(void)
|
||||
{
|
||||
TaskState *ts = (TaskState *)thread_cpu->opaque;
|
||||
TaskState *ts = get_task_state(thread_cpu);
|
||||
struct sigaction act, oact;
|
||||
|
||||
/* initialize signal conversion tables */
|
||||
@ -730,7 +730,7 @@ static G_NORETURN
|
||||
void dump_core_and_abort(CPUArchState *env, int target_sig)
|
||||
{
|
||||
CPUState *cpu = env_cpu(env);
|
||||
TaskState *ts = (TaskState *)cpu->opaque;
|
||||
TaskState *ts = get_task_state(cpu);
|
||||
int host_sig, core_dumped = 0;
|
||||
|
||||
/* On exit, undo the remapping of SIGABRT. */
|
||||
@ -769,7 +769,7 @@ void queue_signal(CPUArchState *env, int sig, int si_type,
|
||||
target_siginfo_t *info)
|
||||
{
|
||||
CPUState *cpu = env_cpu(env);
|
||||
TaskState *ts = cpu->opaque;
|
||||
TaskState *ts = get_task_state(cpu);
|
||||
|
||||
trace_user_queue_signal(env, sig);
|
||||
|
||||
@ -954,7 +954,7 @@ static void host_signal_handler(int host_sig, siginfo_t *info, void *puc)
|
||||
{
|
||||
CPUState *cpu = thread_cpu;
|
||||
CPUArchState *env = cpu_env(cpu);
|
||||
TaskState *ts = cpu->opaque;
|
||||
TaskState *ts = get_task_state(cpu);
|
||||
target_siginfo_t tinfo;
|
||||
host_sigcontext *uc = puc;
|
||||
struct emulated_sigtable *k;
|
||||
@ -1174,7 +1174,7 @@ static void handle_pending_signal(CPUArchState *cpu_env, int sig,
|
||||
sigset_t set;
|
||||
target_sigset_t target_old_set;
|
||||
struct target_sigaction *sa;
|
||||
TaskState *ts = cpu->opaque;
|
||||
TaskState *ts = get_task_state(cpu);
|
||||
|
||||
trace_user_handle_signal(cpu_env, sig);
|
||||
/* dequeue signal */
|
||||
@ -1256,7 +1256,7 @@ void process_pending_signals(CPUArchState *cpu_env)
|
||||
{
|
||||
CPUState *cpu = env_cpu(cpu_env);
|
||||
int sig;
|
||||
TaskState *ts = cpu->opaque;
|
||||
TaskState *ts = get_task_state(cpu);
|
||||
sigset_t set;
|
||||
sigset_t *blocked_set;
|
||||
|
||||
@ -1316,7 +1316,7 @@ void process_pending_signals(CPUArchState *cpu_env)
|
||||
int process_sigsuspend_mask(sigset_t **pset, target_ulong sigset,
|
||||
target_ulong sigsize)
|
||||
{
|
||||
TaskState *ts = (TaskState *)thread_cpu->opaque;
|
||||
TaskState *ts = get_task_state(thread_cpu);
|
||||
sigset_t *host_set = &ts->sigsuspend_mask;
|
||||
target_sigset_t *target_sigset;
|
||||
|
||||
|
@ -6515,7 +6515,7 @@ static void *clone_func(void *arg)
|
||||
env = info->env;
|
||||
cpu = env_cpu(env);
|
||||
thread_cpu = cpu;
|
||||
ts = (TaskState *)cpu->opaque;
|
||||
ts = get_task_state(cpu);
|
||||
info->tid = sys_gettid();
|
||||
task_settid(ts);
|
||||
if (info->child_tidptr)
|
||||
@ -6557,7 +6557,7 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp,
|
||||
flags &= ~(CLONE_VFORK | CLONE_VM);
|
||||
|
||||
if (flags & CLONE_VM) {
|
||||
TaskState *parent_ts = (TaskState *)cpu->opaque;
|
||||
TaskState *parent_ts = get_task_state(cpu);
|
||||
new_thread_info info;
|
||||
pthread_attr_t attr;
|
||||
|
||||
@ -6680,7 +6680,7 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp,
|
||||
put_user_u32(sys_gettid(), child_tidptr);
|
||||
if (flags & CLONE_PARENT_SETTID)
|
||||
put_user_u32(sys_gettid(), parent_tidptr);
|
||||
ts = (TaskState *)cpu->opaque;
|
||||
ts = get_task_state(cpu);
|
||||
if (flags & CLONE_SETTLS)
|
||||
cpu_set_tls (env, newtls);
|
||||
if (flags & CLONE_CHILD_CLEARTID)
|
||||
@ -7946,7 +7946,7 @@ int host_to_target_waitstatus(int status)
|
||||
static int open_self_cmdline(CPUArchState *cpu_env, int fd)
|
||||
{
|
||||
CPUState *cpu = env_cpu(cpu_env);
|
||||
struct linux_binprm *bprm = ((TaskState *)cpu->opaque)->bprm;
|
||||
struct linux_binprm *bprm = get_task_state(cpu)->bprm;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < bprm->argc; i++) {
|
||||
@ -8146,7 +8146,7 @@ static int open_self_smaps(CPUArchState *cpu_env, int fd)
|
||||
static int open_self_stat(CPUArchState *cpu_env, int fd)
|
||||
{
|
||||
CPUState *cpu = env_cpu(cpu_env);
|
||||
TaskState *ts = cpu->opaque;
|
||||
TaskState *ts = get_task_state(cpu);
|
||||
g_autoptr(GString) buf = g_string_new(NULL);
|
||||
int i;
|
||||
|
||||
@ -8187,7 +8187,7 @@ static int open_self_stat(CPUArchState *cpu_env, int fd)
|
||||
static int open_self_auxv(CPUArchState *cpu_env, int fd)
|
||||
{
|
||||
CPUState *cpu = env_cpu(cpu_env);
|
||||
TaskState *ts = cpu->opaque;
|
||||
TaskState *ts = get_task_state(cpu);
|
||||
abi_ulong auxv = ts->info->saved_auxv;
|
||||
abi_ulong len = ts->info->auxv_len;
|
||||
char *ptr;
|
||||
@ -9012,7 +9012,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
|
||||
pthread_mutex_lock(&clone_lock);
|
||||
|
||||
if (CPU_NEXT(first_cpu)) {
|
||||
TaskState *ts = cpu->opaque;
|
||||
TaskState *ts = get_task_state(cpu);
|
||||
|
||||
if (ts->child_tidptr) {
|
||||
put_user_u32(0, ts->child_tidptr);
|
||||
@ -9439,7 +9439,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
|
||||
#ifdef TARGET_NR_pause /* not on alpha */
|
||||
case TARGET_NR_pause:
|
||||
if (!block_signals()) {
|
||||
sigsuspend(&((TaskState *)cpu->opaque)->signal_mask);
|
||||
sigsuspend(&get_task_state(cpu)->signal_mask);
|
||||
}
|
||||
return -TARGET_EINTR;
|
||||
#endif
|
||||
@ -10005,7 +10005,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
|
||||
sigset_t *set;
|
||||
|
||||
#if defined(TARGET_ALPHA)
|
||||
TaskState *ts = cpu->opaque;
|
||||
TaskState *ts = get_task_state(cpu);
|
||||
/* target_to_host_old_sigset will bswap back */
|
||||
abi_ulong mask = tswapal(arg1);
|
||||
set = &ts->sigsuspend_mask;
|
||||
@ -10406,7 +10406,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
|
||||
case TARGET_NR_mprotect:
|
||||
arg1 = cpu_untagged_addr(cpu, arg1);
|
||||
{
|
||||
TaskState *ts = cpu->opaque;
|
||||
TaskState *ts = get_task_state(cpu);
|
||||
/* Special hack to detect libc making the stack executable. */
|
||||
if ((arg3 & PROT_GROWSDOWN)
|
||||
&& arg1 >= ts->info->stack_limit
|
||||
@ -12537,7 +12537,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
|
||||
return do_set_thread_area(cpu_env, arg1);
|
||||
#elif defined(TARGET_M68K)
|
||||
{
|
||||
TaskState *ts = cpu->opaque;
|
||||
TaskState *ts = get_task_state(cpu);
|
||||
ts->tp_value = arg1;
|
||||
return 0;
|
||||
}
|
||||
@ -12551,7 +12551,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
|
||||
return do_get_thread_area(cpu_env, arg1);
|
||||
#elif defined(TARGET_M68K)
|
||||
{
|
||||
TaskState *ts = cpu->opaque;
|
||||
TaskState *ts = get_task_state(cpu);
|
||||
return ts->tp_value;
|
||||
}
|
||||
#else
|
||||
@ -12676,7 +12676,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
|
||||
#if defined(TARGET_NR_set_tid_address)
|
||||
case TARGET_NR_set_tid_address:
|
||||
{
|
||||
TaskState *ts = cpu->opaque;
|
||||
TaskState *ts = get_task_state(cpu);
|
||||
ts->child_tidptr = arg1;
|
||||
/* do not call host set_tid_address() syscall, instead return tid() */
|
||||
return get_errno(sys_gettid());
|
||||
|
@ -74,7 +74,7 @@ static inline unsigned int vm_getl(CPUX86State *env,
|
||||
void save_v86_state(CPUX86State *env)
|
||||
{
|
||||
CPUState *cs = env_cpu(env);
|
||||
TaskState *ts = cs->opaque;
|
||||
TaskState *ts = get_task_state(cs);
|
||||
struct target_vm86plus_struct * target_v86;
|
||||
|
||||
if (!lock_user_struct(VERIFY_WRITE, target_v86, ts->target_v86, 0))
|
||||
@ -134,7 +134,7 @@ static inline void return_to_32bit(CPUX86State *env, int retval)
|
||||
static inline int set_IF(CPUX86State *env)
|
||||
{
|
||||
CPUState *cs = env_cpu(env);
|
||||
TaskState *ts = cs->opaque;
|
||||
TaskState *ts = get_task_state(cs);
|
||||
|
||||
ts->v86flags |= VIF_MASK;
|
||||
if (ts->v86flags & VIP_MASK) {
|
||||
@ -147,7 +147,7 @@ static inline int set_IF(CPUX86State *env)
|
||||
static inline void clear_IF(CPUX86State *env)
|
||||
{
|
||||
CPUState *cs = env_cpu(env);
|
||||
TaskState *ts = cs->opaque;
|
||||
TaskState *ts = get_task_state(cs);
|
||||
|
||||
ts->v86flags &= ~VIF_MASK;
|
||||
}
|
||||
@ -165,7 +165,7 @@ static inline void clear_AC(CPUX86State *env)
|
||||
static inline int set_vflags_long(unsigned long eflags, CPUX86State *env)
|
||||
{
|
||||
CPUState *cs = env_cpu(env);
|
||||
TaskState *ts = cs->opaque;
|
||||
TaskState *ts = get_task_state(cs);
|
||||
|
||||
set_flags(ts->v86flags, eflags, ts->v86mask);
|
||||
set_flags(env->eflags, eflags, SAFE_MASK);
|
||||
@ -179,7 +179,7 @@ static inline int set_vflags_long(unsigned long eflags, CPUX86State *env)
|
||||
static inline int set_vflags_short(unsigned short flags, CPUX86State *env)
|
||||
{
|
||||
CPUState *cs = env_cpu(env);
|
||||
TaskState *ts = cs->opaque;
|
||||
TaskState *ts = get_task_state(cs);
|
||||
|
||||
set_flags(ts->v86flags, flags, ts->v86mask & 0xffff);
|
||||
set_flags(env->eflags, flags, SAFE_MASK);
|
||||
@ -193,7 +193,7 @@ static inline int set_vflags_short(unsigned short flags, CPUX86State *env)
|
||||
static inline unsigned int get_vflags(CPUX86State *env)
|
||||
{
|
||||
CPUState *cs = env_cpu(env);
|
||||
TaskState *ts = cs->opaque;
|
||||
TaskState *ts = get_task_state(cs);
|
||||
unsigned int flags;
|
||||
|
||||
flags = env->eflags & RETURN_MASK;
|
||||
@ -210,7 +210,7 @@ static inline unsigned int get_vflags(CPUX86State *env)
|
||||
static void do_int(CPUX86State *env, int intno)
|
||||
{
|
||||
CPUState *cs = env_cpu(env);
|
||||
TaskState *ts = cs->opaque;
|
||||
TaskState *ts = get_task_state(cs);
|
||||
uint32_t int_addr, segoffs, ssp;
|
||||
unsigned int sp;
|
||||
|
||||
@ -269,7 +269,7 @@ void handle_vm86_trap(CPUX86State *env, int trapno)
|
||||
void handle_vm86_fault(CPUX86State *env)
|
||||
{
|
||||
CPUState *cs = env_cpu(env);
|
||||
TaskState *ts = cs->opaque;
|
||||
TaskState *ts = get_task_state(cs);
|
||||
uint32_t csp, ssp;
|
||||
unsigned int ip, sp, newflags, newip, newcs, opcode, intno;
|
||||
int data32, pref_done;
|
||||
@ -394,7 +394,7 @@ void handle_vm86_fault(CPUX86State *env)
|
||||
int do_vm86(CPUX86State *env, long subfunction, abi_ulong vm86_addr)
|
||||
{
|
||||
CPUState *cs = env_cpu(env);
|
||||
TaskState *ts = cs->opaque;
|
||||
TaskState *ts = get_task_state(cs);
|
||||
struct target_vm86plus_struct * target_v86;
|
||||
int ret;
|
||||
|
||||
|
@ -157,7 +157,7 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
|
||||
{
|
||||
abi_ulong frame_addr;
|
||||
struct target_rt_sigframe *frame;
|
||||
int is_fdpic = info_is_fdpic(((TaskState *)thread_cpu->opaque)->info);
|
||||
int is_fdpic = info_is_fdpic(get_task_state(thread_cpu)->info);
|
||||
abi_ulong handler = 0;
|
||||
abi_ulong handler_fdpic_GOT = 0;
|
||||
uint32_t ra;
|
||||
|
@ -378,7 +378,7 @@ const char *qemu_plugin_path_to_binary(void)
|
||||
{
|
||||
char *path = NULL;
|
||||
#ifdef CONFIG_USER_ONLY
|
||||
TaskState *ts = (TaskState *) current_cpu->opaque;
|
||||
TaskState *ts = get_task_state(current_cpu);
|
||||
path = g_strdup(ts->bprm->filename);
|
||||
#endif
|
||||
return path;
|
||||
@ -388,7 +388,7 @@ uint64_t qemu_plugin_start_code(void)
|
||||
{
|
||||
uint64_t start = 0;
|
||||
#ifdef CONFIG_USER_ONLY
|
||||
TaskState *ts = (TaskState *) current_cpu->opaque;
|
||||
TaskState *ts = get_task_state(current_cpu);
|
||||
start = ts->info->start_code;
|
||||
#endif
|
||||
return start;
|
||||
@ -398,7 +398,7 @@ uint64_t qemu_plugin_end_code(void)
|
||||
{
|
||||
uint64_t end = 0;
|
||||
#ifdef CONFIG_USER_ONLY
|
||||
TaskState *ts = (TaskState *) current_cpu->opaque;
|
||||
TaskState *ts = get_task_state(current_cpu);
|
||||
end = ts->info->end_code;
|
||||
#endif
|
||||
return end;
|
||||
@ -408,7 +408,7 @@ uint64_t qemu_plugin_entry_code(void)
|
||||
{
|
||||
uint64_t entry = 0;
|
||||
#ifdef CONFIG_USER_ONLY
|
||||
TaskState *ts = (TaskState *) current_cpu->opaque;
|
||||
TaskState *ts = get_task_state(current_cpu);
|
||||
entry = ts->info->entry;
|
||||
#endif
|
||||
return entry;
|
||||
|
@ -214,7 +214,7 @@ static target_ulong syscall_err;
|
||||
static inline uint32_t get_swi_errno(CPUState *cs)
|
||||
{
|
||||
#ifdef CONFIG_USER_ONLY
|
||||
TaskState *ts = cs->opaque;
|
||||
TaskState *ts = get_task_state(cs);
|
||||
|
||||
return ts->swi_errno;
|
||||
#else
|
||||
@ -226,7 +226,7 @@ static void common_semi_cb(CPUState *cs, uint64_t ret, int err)
|
||||
{
|
||||
if (err) {
|
||||
#ifdef CONFIG_USER_ONLY
|
||||
TaskState *ts = cs->opaque;
|
||||
TaskState *ts = get_task_state(cs);
|
||||
ts->swi_errno = err;
|
||||
#else
|
||||
syscall_err = err;
|
||||
@ -586,7 +586,7 @@ void do_common_semihosting(CPUState *cs)
|
||||
#if !defined(CONFIG_USER_ONLY)
|
||||
const char *cmdline;
|
||||
#else
|
||||
TaskState *ts = cs->opaque;
|
||||
TaskState *ts = get_task_state(cs);
|
||||
#endif
|
||||
GET_ARG(0);
|
||||
GET_ARG(1);
|
||||
@ -664,7 +664,7 @@ void do_common_semihosting(CPUState *cs)
|
||||
target_ulong retvals[4];
|
||||
int i;
|
||||
#ifdef CONFIG_USER_ONLY
|
||||
TaskState *ts = cs->opaque;
|
||||
TaskState *ts = get_task_state(cs);
|
||||
target_ulong limit;
|
||||
#else
|
||||
LayoutInfo info = common_semi_find_bases(cs);
|
||||
|
Loading…
Reference in New Issue
Block a user