[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/10] tcg/mips: Support r6 JR encoding
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 07/10] tcg/mips: Support r6 JR encoding |
Date: |
Wed, 21 Oct 2015 11:42:56 -1000 |
From: James Hogan <address@hidden>
MIPSr6 encodes JR as JALR with zero as the link register, and the pre-r6
JR encoding is removed. Update TCG to use the new encoding when built
for r6.
We still use the old encoding for pre-r6, so as not to confuse return
prediction stack hardware which may detect only particular encodings of
the return instruction.
Reviewed-by: Aurelien Jarno <address@hidden>
Signed-off-by: James Hogan <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>
---
tcg/mips/tcg-target.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tcg/mips/tcg-target.c b/tcg/mips/tcg-target.c
index 4305af9..c08418c 100644
--- a/tcg/mips/tcg-target.c
+++ b/tcg/mips/tcg-target.c
@@ -288,7 +288,7 @@ typedef enum {
OPC_SRLV = OPC_SPECIAL | 0x06,
OPC_ROTRV = OPC_SPECIAL | (0x01 << 6) | 0x06,
OPC_SRAV = OPC_SPECIAL | 0x07,
- OPC_JR = OPC_SPECIAL | 0x08,
+ OPC_JR_R5 = OPC_SPECIAL | 0x08,
OPC_JALR = OPC_SPECIAL | 0x09,
OPC_MOVZ = OPC_SPECIAL | 0x0A,
OPC_MOVN = OPC_SPECIAL | 0x0B,
@@ -320,6 +320,9 @@ typedef enum {
OPC_WSBH = OPC_SPECIAL3 | 0x0a0,
OPC_SEB = OPC_SPECIAL3 | 0x420,
OPC_SEH = OPC_SPECIAL3 | 0x620,
+
+ /* MIPS r6 doesn't have JR, JALR should be used instead */
+ OPC_JR = use_mips32r6_instructions ? OPC_JALR : OPC_JR_R5,
} MIPSInsn;
/*
--
2.4.3
- [Qemu-devel] [PULL 00/10] collected tcg patches, Richard Henderson, 2015/10/21
- [Qemu-devel] [PULL 01/10] tcg/ppc: Adjust exit_tb for change in prologue placement, Richard Henderson, 2015/10/21
- [Qemu-devel] [PULL 02/10] tcg/ppc: Revise goto_tb implementation, Richard Henderson, 2015/10/21
- [Qemu-devel] [PULL 03/10] tcg/ppc: Prefer mask over andi., Richard Henderson, 2015/10/21
- [Qemu-devel] [PULL 04/10] tcg-opc.h: Simplify insn_start def, Richard Henderson, 2015/10/21
- [Qemu-devel] [PULL 05/10] disas/mips: Add R6 jr/jr.hb to disassembler, Richard Henderson, 2015/10/21
- [Qemu-devel] [PULL 06/10] tcg/mips: Add use_mips32r6_instructions definition, Richard Henderson, 2015/10/21
- [Qemu-devel] [PULL 07/10] tcg/mips: Support r6 JR encoding,
Richard Henderson <=
- [Qemu-devel] [PULL 09/10] tcg/mips: Support r6 SEL{NE, EQ}Z instead of MOVN/MOVZ, Richard Henderson, 2015/10/21
- [Qemu-devel] [PULL 08/10] tcg/mips: Support r6 multiply/divide encodings, Richard Henderson, 2015/10/21
- [Qemu-devel] [PULL 10/10] cpu-exec: Add "nochain" debug flag, Richard Henderson, 2015/10/21
- Re: [Qemu-devel] [PULL 00/10] collected tcg patches, Peter Maydell, 2015/10/22