From f865a31d1ed571ccb8d17653b150e3a30f22b30d Mon Sep 17 00:00:00 2001
From: Anthony Green <green@redhat.com>
Date: Thu, 11 Jun 2009 11:27:58 +0000
Subject: Add PC-relative branch instructions to moxie port.

---
 opcodes/moxie-dis.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'opcodes/moxie-dis.c')

diff --git a/opcodes/moxie-dis.c b/opcodes/moxie-dis.c
index d63eb2d..4e67e2c 100644
--- a/opcodes/moxie-dis.c
+++ b/opcodes/moxie-dis.c
@@ -33,6 +33,7 @@ static void *stream;
 /* Macros to extract operands from the instruction word.  */
 #define OP_A(i) ((i >> 4) & 0xf)
 #define OP_B(i) (i & 0xf)
+#define INST2OFFSET(o) ((((signed short)((o & ((1<<10)-1))<<6))>>6)<<1)
 
 static const char * reg_names[16] =
   { "$fp", "$sp", "$r0", "$r1", "$r2", "$r3", "$r4", "$r5",
@@ -176,11 +177,13 @@ print_insn_moxie (bfd_vma addr, struct disassemble_info * info)
   else
     {
       /* Extract the Form 3 opcode.  */
-      opcode = &moxie_form2_opc_info[(iword >> 12) & 3];
+      opcode = &moxie_form3_opc_info[(iword >> 10) & 15];
       switch (opcode->itype)
 	{
-	case MOXIE_F3_NARG:
-	  fpr (stream, "%s", opcode->name);
+	case MOXIE_F3_PCREL:
+	  fpr (stream, "%s\t", opcode->name);
+	  info->print_address_func ((bfd_vma) (addr + INST2OFFSET(iword)), 
+				    info);
 	  break;
 	default:
 	  abort();
-- 
cgit v1.1