From cf386ca8ab20ecad5efa535f3d48750df740da39 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Wed, 2 Nov 2022 16:25:46 +0100 Subject: [PATCH] hw/mips/bootloader: Implement nanoMIPS NOP opcode generator MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20221211204533.85359-3-philmd@linaro.org> --- hw/mips/bootloader.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/hw/mips/bootloader.c b/hw/mips/bootloader.c index 21ffd4d772..0035f37335 100644 --- a/hw/mips/bootloader.c +++ b/hw/mips/bootloader.c @@ -54,16 +54,32 @@ static bool bootcpu_supports_isa(uint64_t isa_mask) return cpu_supports_isa(&MIPS_CPU(first_cpu)->env, isa_mask); } -/* Base types */ -static void bl_gen_nop(void **ptr) +static void st_nm32_p(void **ptr, uint32_t insn) { - uint32_t *p = *ptr; + uint16_t *p = *ptr; - stl_p(p, 0); + stw_p(p, insn >> 16); + p++; + stw_p(p, insn >> 0); p++; + *ptr = p; } +/* Base types */ +static void bl_gen_nop(void **ptr) +{ + if (bootcpu_supports_isa(ISA_NANOMIPS32)) { + st_nm32_p(ptr, 0x8000c000); + } else { + uint32_t *p = *ptr; + + stl_p(p, 0); + p++; + *ptr = p; + } +} + static void bl_gen_r_type(void **ptr, uint8_t opcode, bl_reg rs, bl_reg rt, bl_reg rd, uint8_t shift, uint8_t funct) -- 2.11.0