From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: marex@denx.de, peter.maydell@linaro.org, amir.gonnen@neuroblade.ai
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 [thread overview]
Message-ID: <20220308072005.307955-8-richard.henderson@linaro.org> (raw)
In-Reply-To: <20220308072005.307955-1-richard.henderson@linaro.org>
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
next prev parent reply other threads:[~2022-03-08 7:35 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-08 7:19 [PATCH v4 00/33] target/nios2: Shadow register set, EIC and VIC Richard Henderson
2022-03-08 7:19 ` [PATCH v4 01/33] target/nios2: Check supervisor on eret Richard Henderson
2022-03-08 7:19 ` [PATCH v4 02/33] target/nios2: Stop generating code if gen_check_supervisor fails Richard Henderson
2022-03-08 9:48 ` Peter Maydell
2022-03-08 7:19 ` [PATCH v4 03/33] target/nios2: Add NUM_GP_REGS and NUM_CP_REGS Richard Henderson
2022-03-08 9:49 ` Peter Maydell
2022-03-08 7:19 ` [PATCH v4 04/33] target/nios2: Split PC out of env->regs[] Richard Henderson
2022-03-08 9:51 ` Peter Maydell
2022-03-08 7:19 ` [PATCH v4 05/33] target/nios2: Split out helper for eret instruction Richard Henderson
2022-03-08 9:52 ` Peter Maydell
2022-03-08 7:19 ` [PATCH v4 06/33] target/nios2: Do not create TCGv for control registers Richard Henderson
2022-03-08 9:54 ` Peter Maydell
2022-03-08 7:19 ` Richard Henderson [this message]
2022-03-08 10:00 ` [PATCH v4 07/33] linux-user/nios2: Trim target_pc_regs to sp and pc Peter Maydell
2022-03-08 19:34 ` Richard Henderson
2022-03-08 7:19 ` [PATCH v4 08/33] target/nios2: Remove cpu_interrupts_enabled Richard Henderson
2022-03-08 10:00 ` Peter Maydell
2022-03-08 7:19 ` [PATCH v4 09/33] target/nios2: Split control registers away from general registers Richard Henderson
2022-03-08 10:04 ` Peter Maydell
2022-03-08 7:19 ` [PATCH v4 10/33] target/nios2: Clean up nios2_cpu_dump_state Richard Henderson
2022-03-08 10:06 ` Peter Maydell
2022-03-08 7:19 ` [PATCH v4 11/33] target/nios2: Use hw/registerfields.h for CR_STATUS fields Richard Henderson
2022-03-08 10:08 ` Peter Maydell
2022-03-08 19:34 ` Richard Henderson
2022-03-08 7:19 ` [PATCH v4 12/33] target/nios2: Use hw/registerfields.h for CR_EXCEPTION fields Richard Henderson
2022-03-08 10:12 ` Peter Maydell
2022-03-08 19:36 ` Richard Henderson
2022-03-08 7:19 ` [PATCH v4 13/33] target/nios2: Use hw/registerfields.h for CR_TLBADDR fields Richard Henderson
2022-03-08 10:14 ` Peter Maydell
2022-03-08 7:19 ` [PATCH v4 14/33] target/nios2: Use hw/registerfields.h for CR_TLBACC fields Richard Henderson
2022-03-08 10:19 ` Peter Maydell
2022-03-08 7:19 ` [PATCH v4 15/33] target/nios2: Use hw/registerfields.h for CR_TLBMISC fields Richard Henderson
2022-03-08 10:46 ` Peter Maydell
2022-03-08 19:37 ` Richard Henderson
2022-03-08 7:19 ` [PATCH v4 16/33] target/nios2: Move R_FOO and CR_BAR into enumerations Richard Henderson
2022-03-08 10:47 ` Peter Maydell
2022-03-08 7:19 ` [PATCH v4 17/33] target/nios2: Prevent writes to read-only or reserved control fields Richard Henderson
2022-03-08 10:57 ` Peter Maydell
2022-03-08 19:49 ` Richard Henderson
2022-03-08 20:24 ` Peter Maydell
2022-03-08 20:45 ` Richard Henderson
2022-03-08 7:19 ` [PATCH v4 18/33] target/nios2: Implement cpuid Richard Henderson
2022-03-08 10:52 ` Peter Maydell
2022-03-08 19:50 ` Richard Henderson
2022-03-08 7:19 ` [PATCH v4 19/33] target/nios2: Implement CR_STATUS.RSIE Richard Henderson
2022-03-08 10:55 ` Peter Maydell
2022-03-08 7:19 ` [PATCH v4 20/33] target/nios2: Remove CPU_INTERRUPT_NMI Richard Henderson
2022-03-08 10:56 ` Peter Maydell
2022-03-08 7:19 ` [PATCH v4 21/33] target/nios2: Use tcg_constant_tl Richard Henderson
2022-03-08 11:00 ` Peter Maydell
2022-03-08 19:51 ` Richard Henderson
2022-03-08 7:19 ` [PATCH v4 22/33] target/nios2: Introduce dest_gpr Richard Henderson
2022-03-08 11:07 ` Peter Maydell
2022-03-08 20:53 ` Richard Henderson
2022-03-08 7:19 ` [PATCH v4 23/33] target/nios2: Drop CR_STATUS_EH from tb->flags Richard Henderson
2022-03-08 11:08 ` Peter Maydell
2022-03-08 7:19 ` [PATCH v4 24/33] target/nios2: Introduce shadow register sets Richard Henderson
2022-03-09 14:02 ` Amir Gonnen
2022-03-09 18:01 ` Richard Henderson
2022-03-08 7:19 ` [PATCH v4 25/33] target/nios2: Implement rdprs, wrprs Richard Henderson
2022-03-08 7:19 ` [PATCH v4 26/33] target/nios2: Update helper_eret for shadow registers Richard Henderson
2022-03-08 7:19 ` [PATCH v4 27/33] target/nios2: Create EXCP_SEMIHOST for semi-hosting Richard Henderson
2022-03-08 11:24 ` Peter Maydell
2022-03-08 7:20 ` [PATCH v4 28/33] target/nios2: Clean up nios2_cpu_do_interrupt Richard Henderson
2022-03-08 7:20 ` [PATCH v4 29/33] target/nios2: Implement EIC interrupt processing Richard Henderson
2022-03-08 7:20 ` [PATCH v4 30/33] hw/intc: Vectored Interrupt Controller (VIC) Richard Henderson
2022-03-08 8:32 ` Mark Cave-Ayland
2022-03-08 11:27 ` Peter Maydell
2022-03-08 19:53 ` Richard Henderson
2022-03-08 7:20 ` [PATCH v4 31/33] hw/nios2: Introduce Nios2MachineState Richard Henderson
2022-03-08 8:39 ` Mark Cave-Ayland
2022-03-08 19:55 ` Richard Henderson
2022-03-08 7:20 ` [PATCH v4 32/33] hw/nios2: Move memory regions into Nios2Machine Richard Henderson
2022-03-08 8:39 ` Mark Cave-Ayland
2022-03-08 7:20 ` [PATCH v4 33/33] hw/nios2: Machine with a Vectored Interrupt Controller Richard Henderson
2022-03-08 8:43 ` Mark Cave-Ayland
2022-03-08 19:57 ` Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220308072005.307955-8-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=amir.gonnen@neuroblade.ai \
--cc=marex@denx.de \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.