[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 20/21] mips_malta: update malta's pseudo-bootloader
From: |
Leon Alrae |
Subject: |
[Qemu-devel] [PATCH 20/21] mips_malta: update malta's pseudo-bootloader - replace JR with JALR |
Date: |
Fri, 30 May 2014 15:47:58 +0100 |
JR has been removed in R6 and now this instruction will cause Reserved
Instruction Exception. Therefore use JALR with rd=0 which is equivalent to JR.
Signed-off-by: Leon Alrae <address@hidden>
---
hw/mips/mips_malta.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index ac5ec44..8debfc1 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -694,12 +694,12 @@ static void write_bootloader (CPUMIPSState *env, uint8_t
*base,
/* Jump to kernel code */
stl_raw(p++, 0x3c1f0000 | ((kernel_entry >> 16) & 0xffff)); /* lui ra,
high(kernel_entry) */
stl_raw(p++, 0x37ff0000 | (kernel_entry & 0xffff)); /* ori ra,
ra, low(kernel_entry) */
- stl_raw(p++, 0x03e00008); /* jr ra */
+ stl_raw(p++, 0x03e00009); /* jalr ra
*/
stl_raw(p++, 0x00000000); /* nop */
/* YAMON subroutines */
p = (uint32_t *) (base + 0x800);
- stl_raw(p++, 0x03e00008); /* jr ra */
+ stl_raw(p++, 0x03e00009); /* jalr ra */
stl_raw(p++, 0x24020000); /* li v0,0 */
/* 808 YAMON print */
stl_raw(p++, 0x03e06821); /* move
t5,ra */
@@ -713,7 +713,7 @@ static void write_bootloader (CPUMIPSState *env, uint8_t
*base,
stl_raw(p++, 0x00000000); /* nop */
stl_raw(p++, 0x08000205); /* j 814 */
stl_raw(p++, 0x00000000); /* nop */
- stl_raw(p++, 0x01a00008); /* jr t5 */
+ stl_raw(p++, 0x01a00009); /* jalr t5 */
stl_raw(p++, 0x01602021); /* move
a0,t3 */
/* 0x83c YAMON print_count */
stl_raw(p++, 0x03e06821); /* move
t5,ra */
@@ -727,7 +727,7 @@ static void write_bootloader (CPUMIPSState *env, uint8_t
*base,
stl_raw(p++, 0x258cffff); /* addiu
t4,t4,-1 */
stl_raw(p++, 0x1580fffa); /* bnez
t4,84c */
stl_raw(p++, 0x00000000); /* nop */
- stl_raw(p++, 0x01a00008); /* jr t5 */
+ stl_raw(p++, 0x01a00009); /* jalr t5 */
stl_raw(p++, 0x01602021); /* move
a0,t3 */
/* 0x870 */
stl_raw(p++, 0x3c08b800); /* lui
t0,0xb400 */
@@ -737,7 +737,7 @@ static void write_bootloader (CPUMIPSState *env, uint8_t
*base,
stl_raw(p++, 0x31290040); /* andi
t1,t1,0x40 */
stl_raw(p++, 0x1120fffc); /* beqz
t1,878 <outch+0x8> */
stl_raw(p++, 0x00000000); /* nop */
- stl_raw(p++, 0x03e00008); /* jr ra */
+ stl_raw(p++, 0x03e00009); /* jalr ra */
stl_raw(p++, 0xa1040000); /* sb
a0,0(t0) */
}
--
1.7.5.4
- [Qemu-devel] [PATCH 09/21] target-mips: redefine Integer Multiply and Divide instructions, (continued)
- [Qemu-devel] [PATCH 09/21] target-mips: redefine Integer Multiply and Divide instructions, Leon Alrae, 2014/05/30
- [Qemu-devel] [PATCH 12/21] target-mips: add ALIGN, DALIGN, BITSWAP and DBITSWAP instructions, Leon Alrae, 2014/05/30
- [Qemu-devel] [PATCH 18/21] target-mips: do not allow Status.FR=0 mode in 64-bit FPU, Leon Alrae, 2014/05/30
- [Qemu-devel] [PATCH 13/21] target-mips: add Compact Branches, Leon Alrae, 2014/05/30
- [Qemu-devel] [PATCH 14/21] target-mips: add Addressing and PC-relative instructions, Leon Alrae, 2014/05/30
- [Qemu-devel] [PATCH 16/21] target-mips: add new Floating Point instructions, Leon Alrae, 2014/05/30
- [Qemu-devel] [PATCH 15/21] softfloat: add functions corresponding to IEEE-2008 min/maxNumMag, Leon Alrae, 2014/05/30
- [Qemu-devel] [PATCH 19/21] target-mips: remove JR, BLTZAL, BGEZAL and add NAL, BAL instructions, Leon Alrae, 2014/05/30
- [Qemu-devel] [PATCH 17/21] target-mips: add new Floating Point Comparison instructions, Leon Alrae, 2014/05/30
- [Qemu-devel] [PATCH 21/21] target-mips: use pointers referring to appropriate decoding function, Leon Alrae, 2014/05/30
- [Qemu-devel] [PATCH 20/21] mips_malta: update malta's pseudo-bootloader - replace JR with JALR,
Leon Alrae <=