From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59016) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zp1As-00014Y-57 for qemu-devel@nongnu.org; Wed, 21 Oct 2015 17:44:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zp1Ar-0001PQ-83 for qemu-devel@nongnu.org; Wed, 21 Oct 2015 17:43:58 -0400 Received: from mail-qk0-x232.google.com ([2607:f8b0:400d:c09::232]:33161) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zp1Ar-0001PL-4F for qemu-devel@nongnu.org; Wed, 21 Oct 2015 17:43:57 -0400 Received: by qkcy65 with SMTP id y65so45492870qkc.0 for ; Wed, 21 Oct 2015 14:43:56 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Wed, 21 Oct 2015 11:42:56 -1000 Message-Id: <1445463779-5823-8-git-send-email-rth@twiddle.net> In-Reply-To: <1445463779-5823-1-git-send-email-rth@twiddle.net> References: <1445463779-5823-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PULL 07/10] tcg/mips: Support r6 JR encoding List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, James Hogan From: James Hogan 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 Signed-off-by: James Hogan Signed-off-by: Richard Henderson Message-Id: <1443788657-14537-5-git-send-email-james.hogan@imgtec.com> --- 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