diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2025-07-28 22:06:12 -1000 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2025-08-28 06:39:25 +1000 |
| commit | a56cf00bc06a11627ec7b695618532d0d58cf8de (patch) | |
| tree | 39f16164511926df7543ec6a0ae8f360600acc33 | |
| parent | 592f36d13dd32d0a90f71266931a68f522617026 (diff) | |
| download | qemu-a56cf00bc06a11627ec7b695618532d0d58cf8de.zip qemu-a56cf00bc06a11627ec7b695618532d0d58cf8de.tar.gz qemu-a56cf00bc06a11627ec7b695618532d0d58cf8de.tar.bz2 | |
linux-user/riscv: Create init_main_thread
Merge init_thread and target_cpu_copy_regs.
There's no point going through a target_pt_regs intermediate.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
| -rw-r--r-- | linux-user/elfload.c | 7 | ||||
| -rw-r--r-- | linux-user/riscv/cpu_loop.c | 10 |
2 files changed, 5 insertions, 12 deletions
diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 16aa092..556f11d 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -849,12 +849,7 @@ static void elf_core_copy_regs(target_elf_gregset_t *regs, #define VDSO_HEADER "vdso-64.c.inc" #endif -static inline void init_thread(struct target_pt_regs *regs, - struct image_info *infop) -{ - regs->sepc = infop->entry; - regs->sp = infop->start_stack; -} +#define HAVE_INIT_MAIN_THREAD #define ELF_EXEC_PAGESIZE 4096 diff --git a/linux-user/riscv/cpu_loop.c b/linux-user/riscv/cpu_loop.c index 2dd30c7..b316281 100644 --- a/linux-user/riscv/cpu_loop.c +++ b/linux-user/riscv/cpu_loop.c @@ -94,14 +94,12 @@ void cpu_loop(CPURISCVState *env) } } -void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) +void init_main_thread(CPUState *cs, struct image_info *info) { - CPUState *cpu = env_cpu(env); - TaskState *ts = get_task_state(cpu); - struct image_info *info = ts->info; + CPUArchState *env = cpu_env(cs); - env->pc = regs->sepc; - env->gpr[xSP] = regs->sp; + env->pc = info->entry; + env->gpr[xSP] = info->start_stack; env->elf_flags = info->elf_flags; if ((env->misa_ext & RVE) && !(env->elf_flags & EF_RISCV_RVE)) { |