From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Paul Burton" <paulburton@kernel.org>,
"Aurelien Jarno" <aurelien@aurel32.net>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Jiaxun Yang" <jiaxun.yang@flygoat.com>,
"Aleksandar Rikalo" <arikalo@gmail.com>,
"Huacai Chen" <chenhuacai@kernel.org>
Subject: [PATCH v2 12/19] hw/mips/bootloader: Propagate CPU env to bl_gen_load_ulong()
Date: Mon, 13 Jan 2025 20:55:18 +0100 [thread overview]
Message-ID: <20250113195525.57150-13-philmd@linaro.org> (raw)
In-Reply-To: <20250113195525.57150-1-philmd@linaro.org>
Propagate the target specific CPU env to the locally
declared bl_gen_load_ulong() function.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/mips/bootloader.c | 33 ++++++++++++++++++++++-----------
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/hw/mips/bootloader.c b/hw/mips/bootloader.c
index 9b074d9903b..198506431c5 100644
--- a/hw/mips/bootloader.c
+++ b/hw/mips/bootloader.c
@@ -233,7 +233,8 @@ static void bl_gen_dli(void **p, bl_reg rt, uint64_t imm)
bl_gen_ori(p, rt, rt, extract64(imm, 0, 16));
}
-static void bl_gen_load_ulong(void **p, bl_reg rt, target_ulong imm)
+static void bl_gen_load_ulong(const CPUMIPSState *env, void **p,
+ bl_reg rt, target_ulong imm)
{
if (bootcpu_supports_isa(ISA_MIPS3)) {
bl_gen_dli(p, rt, imm); /* 64bit */
@@ -245,7 +246,9 @@ static void bl_gen_load_ulong(void **p, bl_reg rt, target_ulong imm)
/* Helpers */
void bl_gen_jump_to(const MIPSCPU *cpu, void **p, target_ulong jump_addr)
{
- bl_gen_load_ulong(p, BL_REG_T9, jump_addr);
+ const CPUMIPSState *env = &cpu->env;
+
+ bl_gen_load_ulong(env, p, BL_REG_T9, jump_addr);
bl_gen_jalr(p, BL_REG_T9);
bl_gen_nop(p); /* delay slot */
}
@@ -258,20 +261,22 @@ void bl_gen_jump_kernel(const MIPSCPU *cpu, void **p,
bool set_a3, target_ulong a3,
target_ulong kernel_addr)
{
+ const CPUMIPSState *env = &cpu->env;
+
if (set_sp) {
- bl_gen_load_ulong(p, BL_REG_SP, sp);
+ bl_gen_load_ulong(env, p, BL_REG_SP, sp);
}
if (set_a0) {
- bl_gen_load_ulong(p, BL_REG_A0, a0);
+ bl_gen_load_ulong(env, p, BL_REG_A0, a0);
}
if (set_a1) {
- bl_gen_load_ulong(p, BL_REG_A1, a1);
+ bl_gen_load_ulong(env, p, BL_REG_A1, a1);
}
if (set_a2) {
- bl_gen_load_ulong(p, BL_REG_A2, a2);
+ bl_gen_load_ulong(env, p, BL_REG_A2, a2);
}
if (set_a3) {
- bl_gen_load_ulong(p, BL_REG_A3, a3);
+ bl_gen_load_ulong(env, p, BL_REG_A3, a3);
}
bl_gen_jump_to(cpu, p, kernel_addr);
@@ -280,8 +285,10 @@ void bl_gen_jump_kernel(const MIPSCPU *cpu, void **p,
void bl_gen_write_ulong(const MIPSCPU *cpu, void **p,
target_ulong addr, target_ulong val)
{
- bl_gen_load_ulong(p, BL_REG_K0, val);
- bl_gen_load_ulong(p, BL_REG_K1, addr);
+ const CPUMIPSState *env = &cpu->env;
+
+ bl_gen_load_ulong(env, p, BL_REG_K0, val);
+ bl_gen_load_ulong(env, p, BL_REG_K1, addr);
if (bootcpu_supports_isa(ISA_MIPS3)) {
bl_gen_sd(p, BL_REG_K0, BL_REG_K1, 0x0);
} else {
@@ -292,15 +299,19 @@ void bl_gen_write_ulong(const MIPSCPU *cpu, void **p,
void bl_gen_write_u32(const MIPSCPU *cpu, void **p,
target_ulong addr, uint32_t val)
{
+ const CPUMIPSState *env = &cpu->env;
+
bl_gen_li(p, BL_REG_K0, val);
- bl_gen_load_ulong(p, BL_REG_K1, addr);
+ bl_gen_load_ulong(env, p, BL_REG_K1, addr);
bl_gen_sw(p, BL_REG_K0, BL_REG_K1, 0x0);
}
void bl_gen_write_u64(const MIPSCPU *cpu, void **p,
target_ulong addr, uint64_t val)
{
+ const CPUMIPSState *env = &cpu->env;
+
bl_gen_dli(p, BL_REG_K0, val);
- bl_gen_load_ulong(p, BL_REG_K1, addr);
+ bl_gen_load_ulong(env, p, BL_REG_K1, addr);
bl_gen_sd(p, BL_REG_K0, BL_REG_K1, 0x0);
}
--
2.47.1
next prev parent reply other threads:[~2025-01-13 19:58 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-13 19:55 [PATCH v2 00/19] hw/mips: Remove all uses of &first_cpu Philippe Mathieu-Daudé
2025-01-13 19:55 ` [PATCH v2 01/19] hw/mips/cps: Keep reference of vCPUs in MIPSCPSState Philippe Mathieu-Daudé
2025-01-13 19:55 ` [PATCH v2 02/19] hw/mips/malta: Check CPU index instead of using &first_cpu Philippe Mathieu-Daudé
2025-01-13 19:55 ` [PATCH v2 03/19] hw/mips/malta: Keep reference of vCPUs in MaltaState Philippe Mathieu-Daudé
2025-01-13 19:55 ` [PATCH v2 04/19] hw/mips/malta: Propagate MaltaState to write_bootloader() Philippe Mathieu-Daudé
2025-01-13 19:55 ` [PATCH v2 05/19] hw/mips/malta: Propagate MaltaState to bl_setup_gt64120_jump_kernel() Philippe Mathieu-Daudé
2025-01-13 19:55 ` [PATCH v2 06/19] hw/mips/boston: Replace bl_gen_write_ulong() -> bl_gen_write_u64() Philippe Mathieu-Daudé
2025-01-13 19:55 ` [PATCH v2 07/19] hw/mips/boston: Propagate CPU to gen_firmware() Philippe Mathieu-Daudé
2025-01-13 19:55 ` [PATCH v2 08/19] hw/mips/fuloong: Propagate CPU to write_bootloader() Philippe Mathieu-Daudé
2025-01-13 19:55 ` [PATCH v2 09/19] hw/mips/bootloader: Document public API Philippe Mathieu-Daudé
2025-01-13 19:55 ` [PATCH v2 10/19] hw/mips/bootloader: Propagate CPU to bl_gen_write_u[32, 64, long]() Philippe Mathieu-Daudé
2025-01-13 19:55 ` [PATCH v2 11/19] hw/mips/bootloader: Propagate CPU to bl_gen_jump_[to, kernel]() Philippe Mathieu-Daudé
2025-01-13 19:55 ` Philippe Mathieu-Daudé [this message]
2025-01-13 19:55 ` [PATCH v2 13/19] hw/mips/bootloader: Propagate CPU env to bl_gen_[d]li() Philippe Mathieu-Daudé
2025-01-13 19:55 ` [PATCH v2 14/19] hw/mips/bootloader: Propagate CPU env to bl_gen_s[w, d]() Philippe Mathieu-Daudé
2025-01-13 19:55 ` [PATCH v2 15/19] hw/mips/bootloader: Propagate CPU env to bl_gen_jalr() Philippe Mathieu-Daudé
2025-01-13 19:55 ` [PATCH v2 16/19] hw/mips/bootloader: Propagate CPU env to bl_gen_dsll() Philippe Mathieu-Daudé
2025-01-13 19:55 ` [PATCH v2 17/19] hw/mips/bootloader: Propagate CPU env to bl_gen_nop() Philippe Mathieu-Daudé
2025-01-13 19:55 ` [PATCH v2 18/19] hw/mips/bootloader: Propagate CPU env to bootcpu_supports_isa() Philippe Mathieu-Daudé
2025-01-13 19:55 ` [PATCH v2 19/19] hw/mips/bootloader: Remove use of &first_cpu in bootcpu_supports_isa() Philippe Mathieu-Daudé
2025-01-13 23:40 ` [PATCH v2 00/19] hw/mips: Remove all uses of &first_cpu Jiaxun Yang
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=20250113195525.57150-13-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=arikalo@gmail.com \
--cc=aurelien@aurel32.net \
--cc=chenhuacai@kernel.org \
--cc=jiaxun.yang@flygoat.com \
--cc=paulburton@kernel.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.