From patchwork Fri Oct 2 12:24:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hogan X-Patchwork-Id: 525490 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A90BE1402B6 for ; Fri, 2 Oct 2015 23:16:37 +1000 (AEST) Received: from localhost ([::1]:59505 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zi0CR-0003qI-Np for incoming@patchwork.ozlabs.org; Fri, 02 Oct 2015 09:16:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54519) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZhzO4-0003QL-5Q for qemu-devel@nongnu.org; Fri, 02 Oct 2015 08:24:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZhzO0-00079C-9K for qemu-devel@nongnu.org; Fri, 02 Oct 2015 08:24:32 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:56647) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZhzO0-000794-3k for qemu-devel@nongnu.org; Fri, 02 Oct 2015 08:24:28 -0400 Received: from KLMAIL01.kl.imgtec.org (unknown [192.168.5.35]) by Websense Email Security Gateway with ESMTPS id BF025FF20BD03; Fri, 2 Oct 2015 13:24:24 +0100 (IST) Received: from LEMAIL01.le.imgtec.org (192.168.152.62) by KLMAIL01.kl.imgtec.org (192.168.5.35) with Microsoft SMTP Server (TLS) id 14.3.195.1; Fri, 2 Oct 2015 13:24:27 +0100 Received: from jhogan-linux.le.imgtec.org (192.168.154.110) by LEMAIL01.le.imgtec.org (192.168.152.62) with Microsoft SMTP Server (TLS) id 14.3.210.2; Fri, 2 Oct 2015 13:24:26 +0100 From: James Hogan To: Date: Fri, 2 Oct 2015 13:24:13 +0100 Message-ID: <1443788657-14537-3-git-send-email-james.hogan@imgtec.com> X-Mailer: git-send-email 2.4.9 In-Reply-To: <1443788657-14537-1-git-send-email-james.hogan@imgtec.com> References: <1443788657-14537-1-git-send-email-james.hogan@imgtec.com> MIME-Version: 1.0 X-Originating-IP: [192.168.154.110] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.59.15.196 Cc: James Hogan , Leon Alrae , Aurelien Jarno , Richard Henderson Subject: [Qemu-devel] [PATCH v3 2/6] disas/mips: Add R6 jr/jr.hb to disassembler X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org MIPS r6 encodes jr as jalr zero, and jr.hb as jalr.hb zero, so add these encodings to the MIPS disassembly table. Signed-off-by: James Hogan Reviewed-by: Leon Alrae Reviewed-by: Richard Henderson Cc: Aurelien Jarno Reviewed-by: Aurelien Jarno --- Changes in v3: - Whoops. Fix jr.hb r6 encoding (Leon) --- disas/mips.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/disas/mips.c b/disas/mips.c index 01336a83852d..bf0bbaf86a3c 100644 --- a/disas/mips.c +++ b/disas/mips.c @@ -2420,9 +2420,11 @@ const struct mips_opcode mips_builtin_opcodes[] = {"hibernate","", 0x42000023, 0xffffffff, 0, 0, V1 }, {"ins", "t,r,+A,+B", 0x7c000004, 0xfc00003f, WR_t|RD_s, 0, I33 }, {"jr", "s", 0x00000008, 0xfc1fffff, UBD|RD_s, 0, I1 }, +{"jr", "s", 0x00000009, 0xfc1fffff, UBD|RD_s, 0, I32R6 }, /* jalr */ /* jr.hb is officially MIPS{32,64}R2, but it works on R1 as jr with the same hazard barrier effect. */ {"jr.hb", "s", 0x00000408, 0xfc1fffff, UBD|RD_s, 0, I32 }, +{"jr.hb", "s", 0x00000409, 0xfc1fffff, UBD|RD_s, 0, I32R6 }, /* jalr.hb */ {"j", "s", 0x00000008, 0xfc1fffff, UBD|RD_s, 0, I1 }, /* jr */ /* SVR4 PIC code requires special handling for j, so it must be a macro. */