From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58632) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZhbZo-0001E0-H1 for qemu-devel@nongnu.org; Thu, 01 Oct 2015 06:59:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZhbZm-0005My-T7 for qemu-devel@nongnu.org; Thu, 01 Oct 2015 06:59:04 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:18864) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZhbZm-0005Mm-OQ for qemu-devel@nongnu.org; Thu, 01 Oct 2015 06:59:02 -0400 From: James Hogan Date: Thu, 1 Oct 2015 11:58:48 +0100 Message-ID: <1443697130-21431-5-git-send-email-james.hogan@imgtec.com> In-Reply-To: <1443697130-21431-1-git-send-email-james.hogan@imgtec.com> References: <1443697130-21431-1-git-send-email-james.hogan@imgtec.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v2 4/6] tcg/mips: Support r6 JR encoding List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: James Hogan , Leon Alrae , Aurelien Jarno , Richard Henderson 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. Signed-off-by: James Hogan Reviewed-by: Richard Henderson Cc: Aurelien Jarno --- Changes in v2: - Turn #define into enum (Richard). --- 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 4305af967326..c08418c413d7 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.9