diff options
| author | Jiaxun Yang <jiaxun.yang@flygoat.com> | 2021-11-30 21:17:28 +0000 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2021-12-06 11:57:31 +0100 |
| commit | 24ade8c5decd092bde5e863bc542db45d924ae12 (patch) | |
| tree | 6464872b3c202f723400fdd231631130cfe2ab8c | |
| parent | 99fc08366b06282614daeda989d2fde6ab8a707f (diff) | |
| download | focaccia-qemu-24ade8c5decd092bde5e863bc542db45d924ae12.tar.gz focaccia-qemu-24ade8c5decd092bde5e863bc542db45d924ae12.zip | |
hw/mips/bootloader: Fix write_ulong()
bl_gen_write_ulong uses sd for both 32 and 64 bit CPU,
while sd is illegal on 32 bit CPUs.
Replace sd with sw on 32bit CPUs.
Fixes: 3ebbf86128f ("hw/mips: Add a bootloader helper")
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20211130211729.7116-2-jiaxun.yang@flygoat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
| -rw-r--r-- | hw/mips/bootloader.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/hw/mips/bootloader.c b/hw/mips/bootloader.c index 6ec8314490..99991f8b2b 100644 --- a/hw/mips/bootloader.c +++ b/hw/mips/bootloader.c @@ -182,7 +182,11 @@ void bl_gen_write_ulong(uint32_t **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); - bl_gen_sd(p, BL_REG_K0, BL_REG_K1, 0x0); + if (bootcpu_supports_isa(ISA_MIPS3)) { + bl_gen_sd(p, BL_REG_K0, BL_REG_K1, 0x0); + } else { + bl_gen_sw(p, BL_REG_K0, BL_REG_K1, 0x0); + } } void bl_gen_write_u32(uint32_t **p, target_ulong addr, uint32_t val) |