Merge init_thread and target_cpu_copy_regs.
There's no point going through a target_pt_regs intermediate.
Note that init_thread had set crmd in target_pt_regs, but
target_cpu_copy_regs did not copy to env. This turns out to be
ok because loongarch_cpu_reset_hold initializes CRMD properly.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/elfload.c | 9 +--------
linux-user/loongarch64/cpu_loop.c | 11 ++++-------
2 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index a30431c7a2..0feccfbe91 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -533,14 +533,7 @@ static void elf_core_copy_regs(target_elf_gregset_t *regs, const CPUPPCState *en
#define VDSO_HEADER "vdso.c.inc"
-static inline void init_thread(struct target_pt_regs *regs,
- struct image_info *infop)
-{
- /*Set crmd PG,DA = 1,0 */
- regs->csr.crmd = 2 << 3;
- regs->csr.era = infop->entry;
- regs->regs[3] = infop->start_stack;
-}
+#define HAVE_INIT_MAIN_THREAD
/* See linux kernel: arch/loongarch/include/asm/elf.h */
#define ELF_NREG 45
diff --git a/linux-user/loongarch64/cpu_loop.c b/linux-user/loongarch64/cpu_loop.c
index ec8a06c88c..a0a4cbb7cc 100644
--- a/linux-user/loongarch64/cpu_loop.c
+++ b/linux-user/loongarch64/cpu_loop.c
@@ -120,13 +120,10 @@ void cpu_loop(CPULoongArchState *env)
}
}
-void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs)
+void init_main_thread(CPUState *cs, struct image_info *info)
{
- int i;
-
- for (i = 0; i < 32; i++) {
- env->gpr[i] = regs->regs[i];
- }
- env->pc = regs->csr.era;
+ CPUArchState *env = cpu_env(cs);
+ env->pc = info->entry;
+ env->gpr[3] = info->start_stack;
}
--
2.43.0