diff options
| author | Anthony Green <green@redhat.com> | 2009-06-11 11:27:58 +0000 |
|---|---|---|
| committer | Anthony Green <green@redhat.com> | 2009-06-11 11:27:58 +0000 |
| commit | 4e62921beaaa83da54c93e4f3e334ded9cd411bc (patch) | |
| tree | 42373cee8dcd948e9ddaf39f4564edf3f1466e76 /opcodes/moxie-dis.c | |
| parent | 081114124e499314f57f6af80efc029ca5496524 (diff) | |
| download | binutils-redhat-4e62921beaaa83da54c93e4f3e334ded9cd411bc.tar.gz | |
Add PC-relative branch instructions to moxie port.
Diffstat (limited to 'opcodes/moxie-dis.c')
| -rw-r--r-- | opcodes/moxie-dis.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/opcodes/moxie-dis.c b/opcodes/moxie-dis.c index d63eb2db45..4e67e2c555 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(); |