[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 07/33] linux-user/nios2: Trim target_pc_regs to sp and pc
From: |
Richard Henderson |
Subject: |
[PATCH v4 07/33] linux-user/nios2: Trim target_pc_regs to sp and pc |
Date: |
Mon, 7 Mar 2022 21:19:39 -1000 |
The only thing this struct is used for is passing startup values
from elfload.c to the cpu. We do not need all registers to be
represented, we do not need the kernel internal stack slots.
The userland argc, argv, and envp values are passed on
the stack, so only SP and PC need updating.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/nios2/target_syscall.h | 25 ++-----------------------
linux-user/elfload.c | 3 +--
linux-user/nios2/cpu_loop.c | 24 +-----------------------
3 files changed, 4 insertions(+), 48 deletions(-)
diff --git a/linux-user/nios2/target_syscall.h
b/linux-user/nios2/target_syscall.h
index 561b28d281..0999ce25fd 100644
--- a/linux-user/nios2/target_syscall.h
+++ b/linux-user/nios2/target_syscall.h
@@ -5,29 +5,8 @@
#define UNAME_MINIMUM_RELEASE "3.19.0"
struct target_pt_regs {
- unsigned long r8; /* r8-r15 Caller-saved GP registers */
- unsigned long r9;
- unsigned long r10;
- unsigned long r11;
- unsigned long r12;
- unsigned long r13;
- unsigned long r14;
- unsigned long r15;
- unsigned long r1; /* Assembler temporary */
- unsigned long r2; /* Retval LS 32bits */
- unsigned long r3; /* Retval MS 32bits */
- unsigned long r4; /* r4-r7 Register arguments */
- unsigned long r5;
- unsigned long r6;
- unsigned long r7;
- unsigned long orig_r2; /* Copy of r2 ?? */
- unsigned long ra; /* Return address */
- unsigned long fp; /* Frame pointer */
- unsigned long sp; /* Stack pointer */
- unsigned long gp; /* Global pointer */
- unsigned long estatus;
- unsigned long ea; /* Exception return address (pc) */
- unsigned long orig_r7;
+ target_ulong sp;
+ target_ulong pc;
};
#define TARGET_MCL_CURRENT 1
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 23ff9659a5..cb14c5f786 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -1094,9 +1094,8 @@ static void elf_core_copy_regs(target_elf_gregset_t
*regs, const CPUMBState *env
static void init_thread(struct target_pt_regs *regs, struct image_info *infop)
{
- regs->ea = infop->entry;
+ regs->pc = infop->entry;
regs->sp = infop->start_stack;
- regs->estatus = 0x3;
}
#define LO_COMMPAGE TARGET_PAGE_SIZE
diff --git a/linux-user/nios2/cpu_loop.c b/linux-user/nios2/cpu_loop.c
index 7b20c024db..37e1dfecfd 100644
--- a/linux-user/nios2/cpu_loop.c
+++ b/linux-user/nios2/cpu_loop.c
@@ -132,28 +132,6 @@ void cpu_loop(CPUNios2State *env)
void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs)
{
- env->regs[0] = 0;
- env->regs[1] = regs->r1;
- env->regs[2] = regs->r2;
- env->regs[3] = regs->r3;
- env->regs[4] = regs->r4;
- env->regs[5] = regs->r5;
- env->regs[6] = regs->r6;
- env->regs[7] = regs->r7;
- env->regs[8] = regs->r8;
- env->regs[9] = regs->r9;
- env->regs[10] = regs->r10;
- env->regs[11] = regs->r11;
- env->regs[12] = regs->r12;
- env->regs[13] = regs->r13;
- env->regs[14] = regs->r14;
- env->regs[15] = regs->r15;
- /* TODO: unsigned long orig_r2; */
- env->regs[R_RA] = regs->ra;
- env->regs[R_FP] = regs->fp;
env->regs[R_SP] = regs->sp;
- env->regs[R_GP] = regs->gp;
- env->regs[CR_ESTATUS] = regs->estatus;
- env->pc = regs->ea;
- /* TODO: unsigned long orig_r7; */
+ env->pc = regs->pc;
}
--
2.25.1
- [PATCH v4 00/33] target/nios2: Shadow register set, EIC and VIC, Richard Henderson, 2022/03/08
- [PATCH v4 06/33] target/nios2: Do not create TCGv for control registers, Richard Henderson, 2022/03/08
- [PATCH v4 01/33] target/nios2: Check supervisor on eret, Richard Henderson, 2022/03/08
- [PATCH v4 02/33] target/nios2: Stop generating code if gen_check_supervisor fails, Richard Henderson, 2022/03/08
- [PATCH v4 03/33] target/nios2: Add NUM_GP_REGS and NUM_CP_REGS, Richard Henderson, 2022/03/08
- [PATCH v4 07/33] linux-user/nios2: Trim target_pc_regs to sp and pc,
Richard Henderson <=
- [PATCH v4 08/33] target/nios2: Remove cpu_interrupts_enabled, Richard Henderson, 2022/03/08
- [PATCH v4 09/33] target/nios2: Split control registers away from general registers, Richard Henderson, 2022/03/08
- [PATCH v4 05/33] target/nios2: Split out helper for eret instruction, Richard Henderson, 2022/03/08
- [PATCH v4 04/33] target/nios2: Split PC out of env->regs[], Richard Henderson, 2022/03/08